Fix namespace naming consistency

10 files changed, 91 insertions, 92 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
 /*
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index dab0e5fdf..50f3b02f5 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -340,9 +340,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
 
     /* Swatches panel */
     {
-        using Inkscape::UI::Dialogs::SwatchesPanel;
-
-        dtw->_panels = new SwatchesPanel("/embedded/swatches");
+        dtw->_panels = new Inkscape::UI::Dialog::SwatchesPanel("/embedded/swatches");
         dtw->_panels->set_vexpand(false);
         dtw->_vbox->pack_end(*dtw->_panels, false, true);
     }
@@ -563,7 +561,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
 		                false, false);
 
     // Layer Selector
-    dtw->layer_selector = new Inkscape::Widgets::LayerSelector(nullptr);
+    dtw->layer_selector = new Inkscape::UI::Widget::LayerSelector(nullptr);
     // FIXME: need to unreference on container destruction to avoid leak
     dtw->layer_selector->reference();
     dtw->_statusbar->pack_start(*dtw->layer_selector, false, false, 1);
diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h
index 078508fa5..fb59e173e 100644
--- a/src/widgets/desktop-widget.h
+++ b/src/widgets/desktop-widget.h
@@ -33,22 +33,28 @@ struct SPDesktopWidget;
 class SPObject;
 
 namespace Gtk {
-class Box;
-class EventBox;
-class Grid;
-class MenuBar;
-class Scrollbar;
-class SpinButton;
-class ToggleButton;
+    class Box;
+    class EventBox;
+    class Grid;
+    class MenuBar;
+    class Scrollbar;
+    class SpinButton;
+    class ToggleButton;
 }
 
 namespace Inkscape {
 namespace UI {
+namespace Dialog {
+class SwatchesPanel;
+} // namespace Dialog
+
 namespace Widget {
 class Button;
-}
-}
-}
+class LayerSelector;
+class SelectedStyle;
+} // namespace Widget
+} // namespace UI
+} // namespace Inkscape
 
 #define SP_TYPE_DESKTOP_WIDGET SPDesktopWidget::getType()
 #define SP_DESKTOP_WIDGET(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_DESKTOP_WIDGET, SPDesktopWidget))
@@ -71,12 +77,6 @@ void sp_desktop_widget_update_scrollbars (SPDesktopWidget *dtw, double scale);
 void sp_dtw_desktop_activate (SPDesktopWidget *dtw);
 void sp_dtw_desktop_deactivate (SPDesktopWidget *dtw);
 
-namespace Inkscape { namespace Widgets { class LayerSelector; } }
-
-namespace Inkscape { namespace UI { namespace Widget { class SelectedStyle; } } }
-
-namespace Inkscape { namespace UI { namespace Dialogs { class SwatchesPanel; } } }
-
 /// A GtkEventBox on an SPDesktop.
 struct SPDesktopWidget {
     SPViewWidget viewwidget;
@@ -109,7 +109,7 @@ private:
     Gtk::MenuBar *_menubar;
     Gtk::Box     *_statusbar;
 
-    Inkscape::UI::Dialogs::SwatchesPanel *_panels;
+    Inkscape::UI::Dialog::SwatchesPanel *_panels;
 
     Glib::RefPtr<Gtk::Adjustment> _hadj;
     Glib::RefPtr<Gtk::Adjustment> _vadj;
@@ -162,8 +162,7 @@ private:
     SPCanvas *_canvas;
 
 public:
-
-    Inkscape::Widgets::LayerSelector *layer_selector;
+    Inkscape::UI::Widget::LayerSelector *layer_selector;
 
     EgeColorProfTracker* _tracker;
 
@@ -172,78 +171,78 @@ public:
         WidgetStub (SPDesktopWidget* dtw) : _dtw(dtw) {}
 
         void setTitle (gchar const *uri) override
-            { _dtw->updateTitle (uri); }
+        { _dtw->updateTitle (uri); }
         Gtk::Window* getWindow() override
-            { return _dtw->window; }
+        { return _dtw->window; }
 
         void layout() override {
             _dtw->layoutWidgets();
         }
 
         void present() override
-            { _dtw->presentWindow(); }
+        { _dtw->presentWindow(); }
         void getGeometry (gint &x, gint &y, gint &w, gint &h) override
-            { _dtw->getWindowGeometry (x, y, w, h); }
+        { _dtw->getWindowGeometry (x, y, w, h); }
         void setSize (gint w, gint h) override
-            { _dtw->setWindowSize (w, h); }
+        { _dtw->setWindowSize (w, h); }
         void setPosition (Geom::Point p) override
-            { _dtw->setWindowPosition (p); }
+        { _dtw->setWindowPosition (p); }
         void setTransient (void* p, int transient_policy) override
-            { _dtw->setWindowTransient (p, transient_policy); }
+        { _dtw->setWindowTransient (p, transient_policy); }
         Geom::Point getPointer() override
-            { return _dtw->window_get_pointer(); }
+        { return _dtw->window_get_pointer(); }
         void setIconified() override
-            { _dtw->iconify(); }
+        { _dtw->iconify(); }
         void setMaximized() override
-            { _dtw->maximize(); }
+        { _dtw->maximize(); }
         void setFullscreen() override
-            { _dtw->fullscreen(); }
+        { _dtw->fullscreen(); }
         bool shutdown() override
-            { return _dtw->shutdown(); }
+        { return _dtw->shutdown(); }
         void destroy() override
-            {
-                if(_dtw->window != nullptr)
-                    delete _dtw->window;
-                _dtw->window = nullptr;
-            }
-
-            void storeDesktopPosition() override { _dtw->storeDesktopPosition(); }
-            void requestCanvasUpdate() override { _dtw->requestCanvasUpdate(); }
-            void requestCanvasUpdateAndWait() override { _dtw->requestCanvasUpdateAndWait(); }
-            void enableInteraction() override { _dtw->enableInteraction(); }
-            void disableInteraction() override { _dtw->disableInteraction(); }
-            void activateDesktop() override { sp_dtw_desktop_activate(_dtw); }
-            void deactivateDesktop() override { sp_dtw_desktop_deactivate(_dtw); }
-            void updateRulers() override { _dtw->update_rulers(); }
-            void updateScrollbars(double scale) override { _dtw->update_scrollbars(scale); }
-            void toggleRulers() override { _dtw->toggle_rulers(); }
-            void toggleScrollbars() override { _dtw->toggle_scrollbars(); }
-            void toggleColorProfAdjust() override { _dtw->toggle_color_prof_adj(); }
-            bool colorProfAdjustEnabled() override { return _dtw->get_color_prof_adj_enabled(); }
-            void updateZoom() override { _dtw->update_zoom(); }
-            void letZoomGrabFocus() override { _dtw->letZoomGrabFocus(); }
-            void updateRotation() override { _dtw->update_rotation(); }
-            void setToolboxFocusTo(const gchar *id) override { _dtw->setToolboxFocusTo(id); }
-            void setToolboxAdjustmentValue(const gchar *id, double val) override
-            { _dtw->setToolboxAdjustmentValue (id, val); }
+        {
+            if(_dtw->window != nullptr)
+                delete _dtw->window;
+            _dtw->window = nullptr;
+        }
+
+        void storeDesktopPosition() override { _dtw->storeDesktopPosition(); }
+        void requestCanvasUpdate() override { _dtw->requestCanvasUpdate(); }
+        void requestCanvasUpdateAndWait() override { _dtw->requestCanvasUpdateAndWait(); }
+        void enableInteraction() override { _dtw->enableInteraction(); }
+        void disableInteraction() override { _dtw->disableInteraction(); }
+        void activateDesktop() override { sp_dtw_desktop_activate(_dtw); }
+        void deactivateDesktop() override { sp_dtw_desktop_deactivate(_dtw); }
+        void updateRulers() override { _dtw->update_rulers(); }
+        void updateScrollbars(double scale) override { _dtw->update_scrollbars(scale); }
+        void toggleRulers() override { _dtw->toggle_rulers(); }
+        void toggleScrollbars() override { _dtw->toggle_scrollbars(); }
+        void toggleColorProfAdjust() override { _dtw->toggle_color_prof_adj(); }
+        bool colorProfAdjustEnabled() override { return _dtw->get_color_prof_adj_enabled(); }
+        void updateZoom() override { _dtw->update_zoom(); }
+        void letZoomGrabFocus() override { _dtw->letZoomGrabFocus(); }
+        void updateRotation() override { _dtw->update_rotation(); }
+        void setToolboxFocusTo(const gchar *id) override { _dtw->setToolboxFocusTo(id); }
+        void setToolboxAdjustmentValue(const gchar *id, double val) override
+        { _dtw->setToolboxAdjustmentValue (id, val); }
         void setToolboxSelectOneValue (gchar const *id, int val) override
-            { _dtw->setToolboxSelectOneValue (id, val); }
+        { _dtw->setToolboxSelectOneValue (id, val); }
         bool isToolboxButtonActive (gchar const* id) override
-            { return _dtw->isToolboxButtonActive (id); }
+        { return _dtw->isToolboxButtonActive (id); }
         void setCoordinateStatus (Geom::Point p) override
-            { _dtw->setCoordinateStatus (p); }
+        { _dtw->setCoordinateStatus (p); }
         void setMessage (Inkscape::MessageType type, gchar const* msg) override
-            { _dtw->setMessage (type, msg); }
+        { _dtw->setMessage (type, msg); }
 
         bool showInfoDialog( Glib::ustring const &message ) override {
             return _dtw->showInfoDialog( message );
         }
 
         bool warnDialog (Glib::ustring const &text) override
-            { return _dtw->warnDialog (text); }
+        { return _dtw->warnDialog (text); }
 
         Inkscape::UI::Widget::Dock* getDock () override
-            { return _dtw->getDock(); }
+        { return _dtw->getDock(); }
     };
 
     WidgetStub *stub;
@@ -300,7 +299,7 @@ public:
     void fullscreen();
     static gint ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw, bool horiz);
 
-private:
+    private:
     GtkWidget *tool_toolbox;
     GtkWidget *aux_toolbox;
     GtkWidget *commands_toolbox;
@@ -345,12 +344,12 @@ struct SPDesktopWidgetClass {
 #endif /* !SEEN_SP_DESKTOP_WIDGET_H */
 
 /*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
+   Local Variables:
+mode:c++
+c-file-style:"stroustrup"
+c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+indent-tabs-mode:nil
+fill-column:99
+End:
 */
 // vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :