Fix namespace naming consistency

8 files changed, 20 insertions, 18 deletions

diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp
index 494869524..8c55747f0 100644
--- a/src/ui/dialog/color-item.cpp
+++ b/src/ui/dialog/color-item.cpp
@@ -36,7 +36,7 @@
 
 namespace Inkscape {
 namespace UI {
-namespace Dialogs {
+namespace Dialog {
 
 static std::vector<std::string> mimeStrings;
 static std::map<std::string, guint> mimeToInt;
@@ -788,7 +788,7 @@ void ColorItem::_linkTone( ColorItem& other, int percent, int grayLevel )
     }
 }
 
-} // namespace Dialogs
+} // namespace Dialog
 } // namespace UI
 } // namespace Inkscape
 
diff --git a/src/ui/dialog/color-item.h b/src/ui/dialog/color-item.h
index fd2206270..eb83552d5 100644
--- a/src/ui/dialog/color-item.h
+++ b/src/ui/dialog/color-item.h
@@ -22,7 +22,7 @@ class SPGradient;
 
 namespace Inkscape {
 namespace UI {
-namespace Dialogs {
+namespace Dialog {
 
 class ColorItem;
 
@@ -109,7 +109,7 @@ private:
     std::vector<ColorItem*> _listeners;
 };
 
-} // namespace Dialogs
+} // namespace Dialog
 } // namespace UI
 } // namespace Inkscape
 
diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index 7ff0968d0..5e313565e 100644
--- a/src/ui/dialog/dialog-manager.cpp
+++ b/src/ui/dialog/dialog-manager.cpp
@@ -95,7 +95,6 @@ inline Dialog *create() { return PanelDialog<B>::template create<T>(); }
 DialogManager::DialogManager() {
 
     using namespace Behavior;
-    using namespace Inkscape::UI::Dialogs; // temporary
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     int dialogs_type = prefs->getIntLimited("/options/dialogtype/value", DOCK, 0, 1);
diff --git a/src/ui/dialog/input.h b/src/ui/dialog/input.h
index 08ad19cb7..a756cc560 100644
--- a/src/ui/dialog/input.h
+++ b/src/ui/dialog/input.h
@@ -20,7 +20,6 @@ namespace Inkscape {
 namespace UI {
 namespace Dialog {
 
-
 class InputDialog : public UI::Widget::Panel
 {
 public:
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index 141f11ae0..82c797f47 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -58,7 +58,7 @@
 
 namespace Inkscape {
 namespace UI {
-namespace Dialogs {
+namespace Dialog {
 
 
 enum {
@@ -871,7 +871,7 @@ void SwatchesPanel::setDesktop( SPDesktop* desktop )
             _currentDesktop->connectToolSubselectionChanged(
                 sigc::hide(sigc::mem_fun(*this, &SwatchesPanel::_updateFromSelection)));
 
-            sigc::bound_mem_functor1<void, Inkscape::UI::Dialogs::SwatchesPanel, SPDocument*> first = sigc::mem_fun(*this, &SwatchesPanel::_setDocument);
+            sigc::bound_mem_functor1<void, SwatchesPanel, SPDocument*> first = sigc::mem_fun(*this, &SwatchesPanel::_setDocument);
             sigc::slot<void, SPDocument*> base2 = first;
             sigc::slot<void,SPDesktop*, SPDocument*> slot2 = sigc::hide<0>( base2 );
             _documentConnection = desktop->connectDocumentReplaced( slot2 );
@@ -1414,7 +1414,7 @@ void SwatchesPanel::_rebuild()
     _holder->thawUpdates();
 }
 
-} //namespace Dialogs
+} //namespace Dialog
 } //namespace UI
 } //namespace Inkscape
 
diff --git a/src/ui/dialog/swatches.h b/src/ui/dialog/swatches.h
index a6e26256b..da10911a3 100644
--- a/src/ui/dialog/swatches.h
+++ b/src/ui/dialog/swatches.h
@@ -24,7 +24,7 @@ namespace UI {
 
 class PreviewHolder;
 
-namespace Dialogs {
+namespace Dialog {
 
 class ColorItem;
 class SwatchPage;
@@ -90,7 +90,7 @@ private:
     friend class DocTrack;
 };
 
-} //namespace Dialogs
+} //namespace Dialog
 } //namespace UI
 } //namespace Inkscape
 
diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp
index 7ad6b483b..779542c92 100644
--- a/src/ui/widget/layer-selector.cpp
+++ b/src/ui/widget/layer-selector.cpp
@@ -32,7 +32,8 @@
 #include "xml/node-event-vector.h"
 
 namespace Inkscape {
-namespace Widgets {
+namespace UI {
+namespace Widget {
 
 namespace {
 
@@ -599,8 +600,9 @@ void LayerSelector::_hideLayer(bool hide) {
     }
 }
 
-}
-}
+} // namespace Widget
+} // namespace UI
+} // namespace Inkscape
 
 /*
   Local Variables:
diff --git a/src/ui/widget/layer-selector.h b/src/ui/widget/layer-selector.h
index 13f381121..eadfce206 100644
--- a/src/ui/widget/layer-selector.h
+++ b/src/ui/widget/layer-selector.h
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
- * Inkscape::Widgets::LayerSelector - layer selector widget
+ * Inkscape::UI::Widget::LayerSelector - layer selector widget
  *
  * Authors:
  *   MenTaLguY <mental@rydia.net>
@@ -33,7 +33,8 @@ class Node;
 
 
 namespace Inkscape {
-namespace Widgets {
+namespace UI {
+namespace Widget {
 
 class DocumentTreeModel;
 
@@ -96,8 +97,9 @@ private:
     void _prepareLabelRenderer(Gtk::TreeModel::const_iterator const &row);
 };
 
-}
-}
+} // namespace Widget
+} // namespace UI
+} // namespace Inkscape
 
 #endif
 /*