From ba62004002998b41f07dce72d03ada4feb0596e5 Mon Sep 17 00:00:00 2001
From: AdenKoperczak <awkoperczak@gmail.com>
Date: Wed, 29 Jan 2025 09:55:30 -0500
Subject: [PATCH] Combine namespaces in settings files into single line

---
 .../source/scwx/qt/settings/alert_palette_settings.cpp | 10 ++--------
 .../source/scwx/qt/settings/alert_palette_settings.hpp | 10 ++--------
 scwx-qt/source/scwx/qt/settings/audio_settings.cpp     | 10 ++--------
 scwx-qt/source/scwx/qt/settings/audio_settings.hpp     | 10 ++--------
 scwx-qt/source/scwx/qt/settings/general_settings.cpp   | 10 ++--------
 scwx-qt/source/scwx/qt/settings/general_settings.hpp   | 10 ++--------
 scwx-qt/source/scwx/qt/settings/hotkey_settings.cpp    | 10 ++--------
 scwx-qt/source/scwx/qt/settings/hotkey_settings.hpp    | 10 ++--------
 scwx-qt/source/scwx/qt/settings/line_settings.cpp      | 10 ++--------
 scwx-qt/source/scwx/qt/settings/line_settings.hpp      | 10 ++--------
 scwx-qt/source/scwx/qt/settings/map_settings.cpp       | 10 ++--------
 scwx-qt/source/scwx/qt/settings/map_settings.hpp       | 10 ++--------
 scwx-qt/source/scwx/qt/settings/palette_settings.cpp   | 10 ++--------
 scwx-qt/source/scwx/qt/settings/palette_settings.hpp   | 10 ++--------
 scwx-qt/source/scwx/qt/settings/product_settings.cpp   | 10 ++--------
 scwx-qt/source/scwx/qt/settings/product_settings.hpp   | 10 ++--------
 scwx-qt/source/scwx/qt/settings/settings_category.cpp  | 10 ++--------
 scwx-qt/source/scwx/qt/settings/settings_category.hpp  | 10 ++--------
 scwx-qt/source/scwx/qt/settings/settings_container.cpp | 10 ++--------
 scwx-qt/source/scwx/qt/settings/settings_container.hpp | 10 ++--------
 scwx-qt/source/scwx/qt/settings/settings_interface.cpp | 10 ++--------
 scwx-qt/source/scwx/qt/settings/settings_interface.hpp | 10 ++--------
 .../scwx/qt/settings/settings_interface_base.cpp       | 10 ++--------
 .../scwx/qt/settings/settings_interface_base.hpp       | 10 ++--------
 scwx-qt/source/scwx/qt/settings/settings_variable.cpp  | 10 ++--------
 scwx-qt/source/scwx/qt/settings/settings_variable.hpp  | 10 ++--------
 .../source/scwx/qt/settings/settings_variable_base.cpp | 10 ++--------
 .../source/scwx/qt/settings/settings_variable_base.hpp | 10 ++--------
 scwx-qt/source/scwx/qt/settings/text_settings.cpp      | 10 ++--------
 scwx-qt/source/scwx/qt/settings/text_settings.hpp      | 10 ++--------
 scwx-qt/source/scwx/qt/settings/ui_settings.cpp        | 10 ++--------
 scwx-qt/source/scwx/qt/settings/ui_settings.hpp        | 10 ++--------
 scwx-qt/source/scwx/qt/settings/unit_settings.cpp      | 10 ++--------
 scwx-qt/source/scwx/qt/settings/unit_settings.hpp      | 10 ++--------
 34 files changed, 68 insertions(+), 272 deletions(-)

diff --git a/scwx-qt/source/scwx/qt/settings/alert_palette_settings.cpp b/scwx-qt/source/scwx/qt/settings/alert_palette_settings.cpp
index c684e1ed..b15b184e 100644
--- a/scwx-qt/source/scwx/qt/settings/alert_palette_settings.cpp
+++ b/scwx-qt/source/scwx/qt/settings/alert_palette_settings.cpp
@@ -7,11 +7,7 @@
 #include <boost/gil.hpp>
 #include <boost/unordered/unordered_flat_map.hpp>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 static const std::string logPrefix_ =
@@ -236,6 +232,4 @@ bool operator==(const AlertPaletteSettings& lhs,
            lhs.p->tornadoPossible_ == rhs.p->tornadoPossible_);
 }
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/alert_palette_settings.hpp b/scwx-qt/source/scwx/qt/settings/alert_palette_settings.hpp
index 152a6351..0741654a 100644
--- a/scwx-qt/source/scwx/qt/settings/alert_palette_settings.hpp
+++ b/scwx-qt/source/scwx/qt/settings/alert_palette_settings.hpp
@@ -8,11 +8,7 @@
 #include <memory>
 #include <string>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 class AlertPaletteSettings : public SettingsCategory
@@ -41,6 +37,4 @@ private:
    std::unique_ptr<Impl> p;
 };
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/audio_settings.cpp b/scwx-qt/source/scwx/qt/settings/audio_settings.cpp
index e620a6f4..f954cf72 100644
--- a/scwx-qt/source/scwx/qt/settings/audio_settings.cpp
+++ b/scwx-qt/source/scwx/qt/settings/audio_settings.cpp
@@ -9,11 +9,7 @@
 #include <boost/algorithm/string.hpp>
 #include <fmt/format.h>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 static const std::string logPrefix_ = "scwx::qt::settings::audio_settings";
@@ -210,6 +206,4 @@ bool operator==(const AudioSettings& lhs, const AudioSettings& rhs)
            lhs.p->alertEnabled_ == rhs.p->alertEnabled_);
 }
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/audio_settings.hpp b/scwx-qt/source/scwx/qt/settings/audio_settings.hpp
index 579d3599..539fde8a 100644
--- a/scwx-qt/source/scwx/qt/settings/audio_settings.hpp
+++ b/scwx-qt/source/scwx/qt/settings/audio_settings.hpp
@@ -7,11 +7,7 @@
 #include <memory>
 #include <string>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 class AudioSettings : public SettingsCategory
@@ -46,6 +42,4 @@ private:
    std::unique_ptr<Impl> p;
 };
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/general_settings.cpp b/scwx-qt/source/scwx/qt/settings/general_settings.cpp
index a103a393..9df9f227 100644
--- a/scwx-qt/source/scwx/qt/settings/general_settings.cpp
+++ b/scwx-qt/source/scwx/qt/settings/general_settings.cpp
@@ -13,11 +13,7 @@
 #include <boost/algorithm/string.hpp>
 #include <QUrl>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 static const std::string logPrefix_ = "scwx::qt::settings::general_settings";
@@ -447,6 +443,4 @@ bool operator==(const GeneralSettings& lhs, const GeneralSettings& rhs)
               rhs.p->highPrivilegeWarningEnabled_);
 }
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/general_settings.hpp b/scwx-qt/source/scwx/qt/settings/general_settings.hpp
index 074b956e..19938adf 100644
--- a/scwx-qt/source/scwx/qt/settings/general_settings.hpp
+++ b/scwx-qt/source/scwx/qt/settings/general_settings.hpp
@@ -6,11 +6,7 @@
 #include <memory>
 #include <string>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 class GeneralSettings : public SettingsCategory
@@ -70,6 +66,4 @@ private:
    std::unique_ptr<Impl> p;
 };
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/hotkey_settings.cpp b/scwx-qt/source/scwx/qt/settings/hotkey_settings.cpp
index e9c6b007..d9261970 100644
--- a/scwx-qt/source/scwx/qt/settings/hotkey_settings.cpp
+++ b/scwx-qt/source/scwx/qt/settings/hotkey_settings.cpp
@@ -2,11 +2,7 @@
 
 #include <QKeySequence>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 static const std::string logPrefix_ = "scwx::qt::settings::hotkey_settings";
@@ -142,6 +138,4 @@ static bool IsHotkeyValid(const std::string& value)
              .toStdString() == value;
 }
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/hotkey_settings.hpp b/scwx-qt/source/scwx/qt/settings/hotkey_settings.hpp
index 9fa56cc4..f7b8a3cd 100644
--- a/scwx-qt/source/scwx/qt/settings/hotkey_settings.hpp
+++ b/scwx-qt/source/scwx/qt/settings/hotkey_settings.hpp
@@ -7,11 +7,7 @@
 #include <memory>
 #include <string>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 class HotkeySettings : public SettingsCategory
@@ -37,6 +33,4 @@ private:
    std::unique_ptr<Impl> p;
 };
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/line_settings.cpp b/scwx-qt/source/scwx/qt/settings/line_settings.cpp
index 70a82761..9910ce6b 100644
--- a/scwx-qt/source/scwx/qt/settings/line_settings.cpp
+++ b/scwx-qt/source/scwx/qt/settings/line_settings.cpp
@@ -1,11 +1,7 @@
 #include <scwx/qt/settings/line_settings.hpp>
 #include <scwx/qt/util/color.hpp>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 static const std::string logPrefix_ = "scwx::qt::settings::line_settings";
@@ -153,6 +149,4 @@ bool operator==(const LineSettings& lhs, const LineSettings& rhs)
            lhs.p->lineWidth_ == rhs.p->lineWidth_);
 }
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/line_settings.hpp b/scwx-qt/source/scwx/qt/settings/line_settings.hpp
index 6f6988a2..28f82ccb 100644
--- a/scwx-qt/source/scwx/qt/settings/line_settings.hpp
+++ b/scwx-qt/source/scwx/qt/settings/line_settings.hpp
@@ -8,11 +8,7 @@
 
 #include <boost/gil/typedefs.hpp>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 class LineSettings : public SettingsCategory
@@ -53,6 +49,4 @@ private:
    std::unique_ptr<Impl> p;
 };
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/map_settings.cpp b/scwx-qt/source/scwx/qt/settings/map_settings.cpp
index e1c8276e..6cd91815 100644
--- a/scwx-qt/source/scwx/qt/settings/map_settings.cpp
+++ b/scwx-qt/source/scwx/qt/settings/map_settings.cpp
@@ -9,11 +9,7 @@
 
 #include <boost/json.hpp>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 static const std::string logPrefix_ = "scwx::qt::settings::map_settings";
@@ -276,6 +272,4 @@ bool operator==(const MapSettings& lhs, const MapSettings& rhs)
    return (lhs.p->map_ == rhs.p->map_);
 }
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/map_settings.hpp b/scwx-qt/source/scwx/qt/settings/map_settings.hpp
index 36ce6464..31956326 100644
--- a/scwx-qt/source/scwx/qt/settings/map_settings.hpp
+++ b/scwx-qt/source/scwx/qt/settings/map_settings.hpp
@@ -6,11 +6,7 @@
 #include <memory>
 #include <string>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 class MapSettings : public SettingsCategory
@@ -60,6 +56,4 @@ private:
    std::unique_ptr<Impl> p;
 };
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/palette_settings.cpp b/scwx-qt/source/scwx/qt/settings/palette_settings.cpp
index c5902fb3..6046f79b 100644
--- a/scwx-qt/source/scwx/qt/settings/palette_settings.cpp
+++ b/scwx-qt/source/scwx/qt/settings/palette_settings.cpp
@@ -6,11 +6,7 @@
 #include <boost/gil.hpp>
 #include <fmt/format.h>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 static const std::string logPrefix_ = "scwx::qt::settings::palette_settings";
@@ -252,6 +248,4 @@ bool operator==(const PaletteSettings& lhs, const PaletteSettings& rhs)
            lhs.p->inactiveAlertColor_ == rhs.p->inactiveAlertColor_);
 }
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/palette_settings.hpp b/scwx-qt/source/scwx/qt/settings/palette_settings.hpp
index eb52e600..961b17d5 100644
--- a/scwx-qt/source/scwx/qt/settings/palette_settings.hpp
+++ b/scwx-qt/source/scwx/qt/settings/palette_settings.hpp
@@ -9,11 +9,7 @@
 #include <memory>
 #include <string>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 class PaletteSettings : public SettingsCategory
@@ -45,6 +41,4 @@ private:
    std::unique_ptr<Impl> p;
 };
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/product_settings.cpp b/scwx-qt/source/scwx/qt/settings/product_settings.cpp
index be54fbd4..9bcc3a1a 100644
--- a/scwx-qt/source/scwx/qt/settings/product_settings.cpp
+++ b/scwx-qt/source/scwx/qt/settings/product_settings.cpp
@@ -1,11 +1,7 @@
 #include <scwx/qt/settings/product_settings.hpp>
 #include <scwx/qt/settings/settings_container.hpp>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 static const std::string logPrefix_ = "scwx::qt::settings::product_settings";
@@ -85,6 +81,4 @@ bool operator==(const ProductSettings& lhs, const ProductSettings& rhs)
            lhs.p->stiPastEnabled_ == rhs.p->stiPastEnabled_);
 }
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/product_settings.hpp b/scwx-qt/source/scwx/qt/settings/product_settings.hpp
index 570c6b15..2ebf5ca9 100644
--- a/scwx-qt/source/scwx/qt/settings/product_settings.hpp
+++ b/scwx-qt/source/scwx/qt/settings/product_settings.hpp
@@ -6,11 +6,7 @@
 #include <memory>
 #include <string>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 class ProductSettings : public SettingsCategory
@@ -41,6 +37,4 @@ private:
    std::unique_ptr<Impl> p;
 };
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/settings_category.cpp b/scwx-qt/source/scwx/qt/settings/settings_category.cpp
index 75a46bf8..184d530d 100644
--- a/scwx-qt/source/scwx/qt/settings/settings_category.cpp
+++ b/scwx-qt/source/scwx/qt/settings/settings_category.cpp
@@ -4,11 +4,7 @@
 
 #include <algorithm>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 static const std::string logPrefix_ = "scwx::qt::settings::settings_category";
@@ -479,6 +475,4 @@ void SettingsCategory::Impl::ConnectVariable(SettingsVariableBase* variable)
       }));
 }
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/settings_category.hpp b/scwx-qt/source/scwx/qt/settings/settings_category.hpp
index 167af06a..e5935636 100644
--- a/scwx-qt/source/scwx/qt/settings/settings_category.hpp
+++ b/scwx-qt/source/scwx/qt/settings/settings_category.hpp
@@ -8,11 +8,7 @@
 #include <boost/json/object.hpp>
 #include <boost/signals2/signal.hpp>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 class SettingsCategory
@@ -118,6 +114,4 @@ private:
    std::unique_ptr<Impl> p;
 };
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/settings_container.cpp b/scwx-qt/source/scwx/qt/settings/settings_container.cpp
index cf8f9c18..ab6ac1e5 100644
--- a/scwx-qt/source/scwx/qt/settings/settings_container.cpp
+++ b/scwx-qt/source/scwx/qt/settings/settings_container.cpp
@@ -1,11 +1,7 @@
 #include <scwx/qt/settings/settings_container.hpp>
 #include <scwx/util/logger.hpp>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 static const std::string logPrefix_ = "scwx::qt::settings::settings_container";
@@ -172,6 +168,4 @@ bool SettingsContainer<Container>::Equals(const SettingsVariableBase& o) const
 
 template class SettingsContainer<std::vector<std::int64_t>>;
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/settings_container.hpp b/scwx-qt/source/scwx/qt/settings/settings_container.hpp
index 9c2ea487..1f57e0b3 100644
--- a/scwx-qt/source/scwx/qt/settings/settings_container.hpp
+++ b/scwx-qt/source/scwx/qt/settings/settings_container.hpp
@@ -2,11 +2,7 @@
 
 #include <scwx/qt/settings/settings_variable.hpp>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 template<class Container>
@@ -99,6 +95,4 @@ private:
    std::unique_ptr<Impl> p;
 };
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/settings_interface.cpp b/scwx-qt/source/scwx/qt/settings/settings_interface.cpp
index 4d491563..9aa58ac3 100644
--- a/scwx-qt/source/scwx/qt/settings/settings_interface.cpp
+++ b/scwx-qt/source/scwx/qt/settings/settings_interface.cpp
@@ -13,11 +13,7 @@
 #include <QSpinBox>
 #include <QWidget>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 static const std::string logPrefix_ = "scwx::qt::settings::settings_interface";
@@ -633,6 +629,4 @@ template class SettingsInterface<std::string>;
 // Containers are not to be used directly
 template class SettingsInterface<std::vector<std::int64_t>>;
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/settings_interface.hpp b/scwx-qt/source/scwx/qt/settings/settings_interface.hpp
index a0005098..0561cf12 100644
--- a/scwx-qt/source/scwx/qt/settings/settings_interface.hpp
+++ b/scwx-qt/source/scwx/qt/settings/settings_interface.hpp
@@ -9,11 +9,7 @@
 
 class QLabel;
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 template<class T>
@@ -140,6 +136,4 @@ private:
    std::unique_ptr<Impl> p;
 };
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/settings_interface_base.cpp b/scwx-qt/source/scwx/qt/settings/settings_interface_base.cpp
index 37e1ec25..9bbf9402 100644
--- a/scwx-qt/source/scwx/qt/settings/settings_interface_base.cpp
+++ b/scwx-qt/source/scwx/qt/settings/settings_interface_base.cpp
@@ -2,11 +2,7 @@
 
 #include <string>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 static const std::string logPrefix_ =
@@ -29,6 +25,4 @@ SettingsInterfaceBase::SettingsInterfaceBase(SettingsInterfaceBase&&) noexcept =
 SettingsInterfaceBase&
 SettingsInterfaceBase::operator=(SettingsInterfaceBase&&) noexcept = default;
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/settings_interface_base.hpp b/scwx-qt/source/scwx/qt/settings/settings_interface_base.hpp
index d0dc2ff2..16e89469 100644
--- a/scwx-qt/source/scwx/qt/settings/settings_interface_base.hpp
+++ b/scwx-qt/source/scwx/qt/settings/settings_interface_base.hpp
@@ -5,11 +5,7 @@
 class QAbstractButton;
 class QWidget;
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 class SettingsInterfaceBase
@@ -70,6 +66,4 @@ private:
    std::unique_ptr<Impl> p;
 };
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/settings_variable.cpp b/scwx-qt/source/scwx/qt/settings/settings_variable.cpp
index 6eda8437..1e6ae3e4 100644
--- a/scwx-qt/source/scwx/qt/settings/settings_variable.cpp
+++ b/scwx-qt/source/scwx/qt/settings/settings_variable.cpp
@@ -7,11 +7,7 @@
 #include <fmt/ostream.h>
 #include <fmt/ranges.h>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 static const std::string logPrefix_ = "scwx::qt::settings::settings_variable";
@@ -439,6 +435,4 @@ template class SettingsVariable<std::string>;
 // Containers are not to be used directly
 template class SettingsVariable<std::vector<std::int64_t>>;
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/settings_variable.hpp b/scwx-qt/source/scwx/qt/settings/settings_variable.hpp
index 2c3b2a07..612f57e7 100644
--- a/scwx-qt/source/scwx/qt/settings/settings_variable.hpp
+++ b/scwx-qt/source/scwx/qt/settings/settings_variable.hpp
@@ -10,11 +10,7 @@
 class QAbstractButton;
 class QWidget;
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 template<class T>
@@ -257,6 +253,4 @@ private:
    std::unique_ptr<Impl> p;
 };
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/settings_variable_base.cpp b/scwx-qt/source/scwx/qt/settings/settings_variable_base.cpp
index 7e31fb5f..6d4e54f6 100644
--- a/scwx-qt/source/scwx/qt/settings/settings_variable_base.cpp
+++ b/scwx-qt/source/scwx/qt/settings/settings_variable_base.cpp
@@ -1,10 +1,6 @@
 #include <scwx/qt/settings/settings_variable_base.hpp>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 static const std::string logPrefix_ =
@@ -62,6 +58,4 @@ bool operator==(const SettingsVariableBase& lhs,
    return typeid(lhs) == typeid(rhs) && lhs.Equals(rhs);
 }
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/settings_variable_base.hpp b/scwx-qt/source/scwx/qt/settings/settings_variable_base.hpp
index f4e48934..870a0c9d 100644
--- a/scwx-qt/source/scwx/qt/settings/settings_variable_base.hpp
+++ b/scwx-qt/source/scwx/qt/settings/settings_variable_base.hpp
@@ -6,11 +6,7 @@
 #include <boost/json/object.hpp>
 #include <boost/signals2/signal.hpp>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 /**
@@ -117,6 +113,4 @@ private:
 bool operator==(const SettingsVariableBase& lhs,
                 const SettingsVariableBase& rhs);
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/text_settings.cpp b/scwx-qt/source/scwx/qt/settings/text_settings.cpp
index 2d0dc197..63fcb2cd 100644
--- a/scwx-qt/source/scwx/qt/settings/text_settings.cpp
+++ b/scwx-qt/source/scwx/qt/settings/text_settings.cpp
@@ -3,11 +3,7 @@
 
 #include <boost/algorithm/string.hpp>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 static const std::string logPrefix_ = "scwx::qt::settings::text_settings";
@@ -216,6 +212,4 @@ bool operator==(const TextSettings& lhs, const TextSettings& rhs)
            lhs.p->tooltipMethod_ == rhs.p->tooltipMethod_);
 }
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/text_settings.hpp b/scwx-qt/source/scwx/qt/settings/text_settings.hpp
index 2be5ab13..c4cc64af 100644
--- a/scwx-qt/source/scwx/qt/settings/text_settings.hpp
+++ b/scwx-qt/source/scwx/qt/settings/text_settings.hpp
@@ -7,11 +7,7 @@
 #include <memory>
 #include <string>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 class TextSettings : public SettingsCategory
@@ -48,6 +44,4 @@ private:
    std::unique_ptr<Impl> p;
 };
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/ui_settings.cpp b/scwx-qt/source/scwx/qt/settings/ui_settings.cpp
index 81fec044..5a3175e9 100644
--- a/scwx-qt/source/scwx/qt/settings/ui_settings.cpp
+++ b/scwx-qt/source/scwx/qt/settings/ui_settings.cpp
@@ -1,10 +1,6 @@
 #include <scwx/qt/settings/ui_settings.hpp>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 static const std::string logPrefix_ = "scwx::qt::settings::ui_settings";
@@ -122,6 +118,4 @@ bool operator==(const UiSettings& lhs, const UiSettings& rhs)
            lhs.p->mainUIGeometry_ == rhs.p->mainUIGeometry_);
 }
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/ui_settings.hpp b/scwx-qt/source/scwx/qt/settings/ui_settings.hpp
index 0a9f95ef..e052eb90 100644
--- a/scwx-qt/source/scwx/qt/settings/ui_settings.hpp
+++ b/scwx-qt/source/scwx/qt/settings/ui_settings.hpp
@@ -6,11 +6,7 @@
 #include <memory>
 #include <string>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 class UiSettingsImpl;
@@ -45,6 +41,4 @@ private:
    std::unique_ptr<UiSettingsImpl> p;
 };
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/unit_settings.cpp b/scwx-qt/source/scwx/qt/settings/unit_settings.cpp
index 79390301..37ec8a0c 100644
--- a/scwx-qt/source/scwx/qt/settings/unit_settings.cpp
+++ b/scwx-qt/source/scwx/qt/settings/unit_settings.cpp
@@ -4,11 +4,7 @@
 
 #include <boost/algorithm/string.hpp>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 static const std::string logPrefix_ = "scwx::qt::settings::unit_settings";
@@ -130,6 +126,4 @@ bool operator==(const UnitSettings& lhs, const UnitSettings& rhs)
            lhs.p->distanceUnits_ == rhs.p->distanceUnits_);
 }
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings
diff --git a/scwx-qt/source/scwx/qt/settings/unit_settings.hpp b/scwx-qt/source/scwx/qt/settings/unit_settings.hpp
index 15518492..403e2b9c 100644
--- a/scwx-qt/source/scwx/qt/settings/unit_settings.hpp
+++ b/scwx-qt/source/scwx/qt/settings/unit_settings.hpp
@@ -6,11 +6,7 @@
 #include <memory>
 #include <string>
 
-namespace scwx
-{
-namespace qt
-{
-namespace settings
+namespace scwx::qt::settings
 {
 
 class UnitSettings : public SettingsCategory
@@ -40,6 +36,4 @@ private:
    std::unique_ptr<Impl> p;
 };
 
-} // namespace settings
-} // namespace qt
-} // namespace scwx
+} // namespace scwx::qt::settings