Corrected "using namespace" contamination from ui/dialog header files.

diff --git a/src/ui/dialog/align-and-distribute.h b/src/ui/dialog/align-and-distribute.h
index 0d41bb221406dcf34964b331697895138021d065..297b3d2a152d67d72c4b04f31a0966854ac1d415 100644 (file)
--- a/src/ui/dialog/align-and-distribute.h
+++ b/src/ui/dialog/align-and-distribute.h
@@ -32,8 +32,6 @@
 #include "ui/widget/panel.h"
 #include "ui/widget/notebook-page.h"
 
-using namespace Inkscape::UI::Widget;
-
 
 class SPItem;
 

diff --git a/src/ui/dialog/document-metadata.cpp b/src/ui/dialog/document-metadata.cpp
index 96cad1fbe6074596d9edfde15ba8a1b44c4f8cae..55eb94f9223b0e09232181f8dfc8accbaaa07d01 100644 (file)
--- a/src/ui/dialog/document-metadata.cpp
+++ b/src/ui/dialog/document-metadata.cpp
@@ -148,6 +148,8 @@ attach_all (Gtk::Table &table, const Gtk::Widget *arr[], unsigned size, int star
 void
 DocumentMetadata::build_metadata()
 {
+    using Inkscape::UI::Widget::EntityEntry;
+
     _page_metadata1.show();
 
     Gtk::Label *label = manage (new Gtk::Label);

diff --git a/src/ui/dialog/document-metadata.h b/src/ui/dialog/document-metadata.h
index 7f718e9f7faaa2ece578dfb346ea5e415c740fda..f21bb0d83f82e608af0e98135f10a770237b9e12 100644 (file)
--- a/src/ui/dialog/document-metadata.h
+++ b/src/ui/dialog/document-metadata.h
@@ -23,8 +23,6 @@
 #include "ui/widget/notebook-page.h"
 #include "ui/widget/registry.h"
 
-using namespace Inkscape::UI::Widget;
-
 namespace Inkscape {
     namespace XML {
         class Node;
@@ -35,7 +33,7 @@ namespace Inkscape {
         }
         namespace Dialog {
 
-typedef std::list<EntityEntry*> RDElist;
+typedef std::list<UI::Widget::EntityEntry*> RDElist;
 
 class DocumentMetadata : public Inkscape::UI::Widget::Panel {
 public:
@@ -56,13 +54,14 @@ protected:
     Gtk::Tooltips _tt;
     Gtk::Notebook  _notebook;
 
-    NotebookPage   _page_metadata1, _page_metadata2;
+    UI::Widget::NotebookPage _page_metadata1;
+    UI::Widget::NotebookPage _page_metadata2;
 
     //---------------------------------------------------------------
     RDElist _rdflist;
-    Licensor _licensor;
+    UI::Widget::Licensor _licensor;
 
-    Registry _wr;
+    UI::Widget::Registry _wr;
 
 private:
     virtual ~DocumentMetadata();

diff --git a/src/ui/dialog/document-properties.h b/src/ui/dialog/document-properties.h
index 136ae2c899746956911c0097993a9e9332ddb659..c67dc970627cbf38de2bf235577795f9062624c1 100644 (file)
--- a/src/ui/dialog/document-properties.h
+++ b/src/ui/dialog/document-properties.h
@@ -28,8 +28,6 @@
 
 #include "xml/helper-observer.h"
 
-using namespace Inkscape::UI::Widget;
-
 namespace Inkscape {
     namespace UI {
         namespace Dialog {
@@ -78,21 +76,31 @@ protected:
     Gtk::Tooltips _tt;
     Gtk::Notebook  _notebook;
 
-    NotebookPage   _page_page, _page_guides;
-    NotebookPage   _page_snap, _page_cms, _page_scripting;
+    UI::Widget::NotebookPage   _page_page;
+    UI::Widget::NotebookPage   _page_guides;
+    UI::Widget::NotebookPage   _page_snap;
+    UI::Widget::NotebookPage   _page_cms;
+    UI::Widget::NotebookPage   _page_scripting;
     Gtk::VBox      _grids_vbox;
 
-    Registry _wr;
+    UI::Widget::Registry _wr;
     //---------------------------------------------------------------
-    RegisteredCheckButton _rcb_canb, _rcb_bord, _rcb_shad;
-    RegisteredColorPicker _rcp_bg, _rcp_bord;
-    RegisteredUnitMenu    _rum_deflt;
-    PageSizer             _page_sizer;
+    UI::Widget::RegisteredCheckButton _rcb_canb;
+    UI::Widget::RegisteredCheckButton _rcb_bord;
+    UI::Widget::RegisteredCheckButton _rcb_shad;
+    UI::Widget::RegisteredColorPicker _rcp_bg;
+    UI::Widget::RegisteredColorPicker _rcp_bord;
+    UI::Widget::RegisteredUnitMenu    _rum_deflt;
+    UI::Widget::PageSizer             _page_sizer;
     //---------------------------------------------------------------
-    RegisteredCheckButton _rcb_sgui, _rcbsng;
-    RegisteredColorPicker _rcp_gui, _rcp_hgui;
+    UI::Widget::RegisteredCheckButton _rcb_sgui;
+    UI::Widget::RegisteredCheckButton _rcbsng;
+    UI::Widget::RegisteredColorPicker _rcp_gui;
+    UI::Widget::RegisteredColorPicker _rcp_hgui;
     //---------------------------------------------------------------
-    ToleranceSlider       _rsu_sno, _rsu_sn, _rsu_gusn;
+    UI::Widget::ToleranceSlider       _rsu_sno;
+    UI::Widget::ToleranceSlider       _rsu_sn;
+    UI::Widget::ToleranceSlider       _rsu_gusn;
     //---------------------------------------------------------------
     Gtk::Menu   _menu;
     Gtk::OptionMenu   _combo_avail;

diff --git a/src/ui/dialog/fill-and-stroke.cpp b/src/ui/dialog/fill-and-stroke.cpp
index fae2e873ca947356c89b46290432fb20feb47af8..6ee076a940a8710fc181fff3d26481c02b84511a 100644 (file)
--- a/src/ui/dialog/fill-and-stroke.cpp
+++ b/src/ui/dialog/fill-and-stroke.cpp
@@ -42,7 +42,7 @@ FillAndStroke::FillAndStroke()
       _page_fill(1, 1, true, true),
       _page_stroke_paint(1, 1, true, true),
       _page_stroke_style(1, 1, true, true),
-      _composite_settings(SP_VERB_DIALOG_FILL_STROKE, "fillstroke", SimpleFilterModifier::BLUR),
+      _composite_settings(SP_VERB_DIALOG_FILL_STROKE, "fillstroke", UI::Widget::SimpleFilterModifier::BLUR),
       hierID(0),
       trackActive(false),
       targetDesktop(0),

diff --git a/src/ui/dialog/fill-and-stroke.h b/src/ui/dialog/fill-and-stroke.h
index f0d68ced8cbe84e459f98e8027492ea4cd04d812..a5fe4906a7d7135748b08bc06147bdb99afa7894 100644 (file)
--- a/src/ui/dialog/fill-and-stroke.h
+++ b/src/ui/dialog/fill-and-stroke.h
@@ -26,8 +26,6 @@
 #include "ui/widget/notebook-page.h"
 #include "ui/widget/object-composite-settings.h"
 
-using namespace Inkscape::UI::Widget;
-
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
@@ -55,12 +53,12 @@ public:
 protected:
     Gtk::Notebook   _notebook;
 
-    NotebookPage    _page_fill;
-    NotebookPage    _page_stroke_paint;
-    NotebookPage    _page_stroke_style;
+    UI::Widget::NotebookPage    _page_fill;
+    UI::Widget::NotebookPage    _page_stroke_paint;
+    UI::Widget::NotebookPage    _page_stroke_style;
 
-    StyleSubject::Selection _subject;
-    ObjectCompositeSettings _composite_settings;
+    UI::Widget::StyleSubject::Selection _subject;
+    UI::Widget::ObjectCompositeSettings _composite_settings;
 
     Gtk::HBox &_createPageTabLabel(const Glib::ustring &label,
                                    const char *label_image);
@@ -87,6 +85,7 @@ private:
 } // namespace UI
 } // namespace Inkscape
 
+
 #endif // INKSCAPE_UI_DIALOG_FILL_AND_STROKE_H
 
 /*

diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 132e5fd4e4ddc8494171f2bff3ef457fda579f89..1672c4b696f4ddebad1fd88b8844e1df2a478c03 100644 (file)
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -74,6 +74,12 @@ namespace Inkscape {
 namespace UI {
 namespace Dialog {
 
+using Inkscape::UI::Widget::AttrWidget;
+using Inkscape::UI::Widget::ComboBoxEnum;
+using Inkscape::UI::Widget::DualSpinSlider;
+using Inkscape::UI::Widget::SpinSlider;
+
+
 // Returns the number of inputs available for the filter primitive type
 int input_count(const SPFilterPrimitive* prim)
 {

diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h
index 3fb9a46fb89568d19c140269cd5ae6a3a8b0f2c8..a14c85a91ae9ebbd9acaafd46d9c19fbde41d7a2 100644 (file)
--- a/src/ui/dialog/filter-effects-dialog.h
+++ b/src/ui/dialog/filter-effects-dialog.h
@@ -35,8 +35,6 @@
 #include "ui/widget/spin-slider.h"
 #include "xml/helper-observer.h"
 
-using namespace Inkscape::UI::Widget;
-
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
@@ -214,9 +212,9 @@ private:
     void duplicate_primitive();
     void convolve_order_changed();
 
-    void set_attr_direct(const AttrWidget*);
-    void set_child_attr_direct(const AttrWidget*);
-    void set_filternode_attr(const AttrWidget*);
+    void set_attr_direct(const UI::Widget::AttrWidget*);
+    void set_child_attr_direct(const UI::Widget::AttrWidget*);
+    void set_filternode_attr(const UI::Widget::AttrWidget*);
     void set_attr(SPObject*, const SPAttributeEnum, const gchar* val);
     void update_settings_view();
     void update_filter_general_settings_view();

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 40efc82827befebeead7b5cc58cca8da85c9afb3..00e72bd4fb98a4be6555579b99ce28b781ab4a5e 100644 (file)
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -56,6 +56,13 @@ namespace Inkscape {
 namespace UI {
 namespace Dialog {
 
+using Inkscape::UI::Widget::DialogPage;
+using Inkscape::UI::Widget::PrefCheckButton;
+using Inkscape::UI::Widget::PrefRadioButton;
+using Inkscape::UI::Widget::PrefSpinButton;
+using Inkscape::UI::Widget::StyleSwatch;
+
+
 InkscapePreferences::InkscapePreferences()
     : UI::Widget::Panel ("", "/dialogs/preferences", SP_VERB_DIALOG_DISPLAY),
       _max_dialog_width(0),

diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index 0ba8c965d4ebfa26bed947cbc3d431c2d393944f..5ee916e4ce5ecc904cf95643540a0014a29c0e18 100644 (file)
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -82,8 +82,6 @@ enum {
     PREFS_PAGE_MISC
 };
 
-using namespace Inkscape::UI::Widget;
-
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
@@ -108,188 +106,272 @@ protected:
         { Gtk::TreeModelColumnRecord::add(_col_name); Gtk::TreeModelColumnRecord::add(_col_page); Gtk::TreeModelColumnRecord::add(_col_id); }
         Gtk::TreeModelColumn<Glib::ustring> _col_name;
         Gtk::TreeModelColumn<int> _col_id;
-        Gtk::TreeModelColumn<DialogPage*> _col_page;
+        Gtk::TreeModelColumn<UI::Widget::DialogPage*> _col_page;
     };
     PageListModelColumns _page_list_columns;
 
     Gtk::TreeModel::Path _path_tools;
     Gtk::TreeModel::Path _path_shapes;
 
-    DialogPage _page_mouse, _page_scrolling, _page_snapping, _page_steps, _page_tools, _page_windows,
-        _page_clones, _page_mask, _page_transforms, _page_filters, _page_select,
-        _page_importexport, _page_cms, _page_grids, _page_svgoutput, _page_misc,
-        _page_ui, _page_save, _page_bitmaps, _page_spellcheck;
-    DialogPage _page_selector, _page_node, _page_tweak, _page_spray, _page_zoom, _page_shapes, _page_pencil, _page_pen,
-               _page_calligraphy, _page_text, _page_gradient, _page_connector, _page_dropper, _page_lpetool;
-    DialogPage _page_rectangle, _page_3dbox, _page_ellipse, _page_star, _page_spiral, _page_paintbucket, _page_eraser;
-
-    PrefSpinButton _mouse_sens, _mouse_thres;
-    PrefCheckButton _mouse_use_ext_input;
-    PrefCheckButton _mouse_switch_on_ext_input;
-
-    PrefSpinButton _scroll_wheel, _scroll_arrow_px, _scroll_arrow_acc, _scroll_auto_speed, _scroll_auto_thres;
-    PrefCheckButton _scroll_space;
-    PrefCheckButton _wheel_zoom;
+    UI::Widget::DialogPage _page_mouse;
+    UI::Widget::DialogPage _page_scrolling;
+    UI::Widget::DialogPage _page_snapping;
+    UI::Widget::DialogPage _page_steps;
+    UI::Widget::DialogPage _page_tools;
+    UI::Widget::DialogPage _page_windows;
+    UI::Widget::DialogPage _page_clones;
+    UI::Widget::DialogPage _page_mask;
+    UI::Widget::DialogPage _page_transforms;
+    UI::Widget::DialogPage _page_filters;
+    UI::Widget::DialogPage _page_select;
+    UI::Widget::DialogPage _page_importexport;
+    UI::Widget::DialogPage _page_cms;
+    UI::Widget::DialogPage _page_grids;
+    UI::Widget::DialogPage _page_svgoutput;
+    UI::Widget::DialogPage _page_misc;
+    UI::Widget::DialogPage _page_ui;
+    UI::Widget::DialogPage _page_save;
+    UI::Widget::DialogPage _page_bitmaps;
+    UI::Widget::DialogPage _page_spellcheck;
+
+    UI::Widget::DialogPage _page_selector;
+    UI::Widget::DialogPage _page_node;
+    UI::Widget::DialogPage _page_tweak;
+    UI::Widget::DialogPage _page_spray;
+    UI::Widget::DialogPage _page_zoom;
+    UI::Widget::DialogPage _page_shapes;
+    UI::Widget::DialogPage _page_pencil;
+    UI::Widget::DialogPage _page_pen;
+    UI::Widget::DialogPage _page_calligraphy;
+    UI::Widget::DialogPage _page_text;
+    UI::Widget::DialogPage _page_gradient;
+    UI::Widget::DialogPage _page_connector;
+    UI::Widget::DialogPage _page_dropper;
+    UI::Widget::DialogPage _page_lpetool;
+
+    UI::Widget::DialogPage _page_rectangle;
+    UI::Widget::DialogPage _page_3dbox;
+    UI::Widget::DialogPage _page_ellipse;
+    UI::Widget::DialogPage _page_star;
+    UI::Widget::DialogPage _page_spiral;
+    UI::Widget::DialogPage _page_paintbucket;
+    UI::Widget::DialogPage _page_eraser;
+
+    UI::Widget::PrefSpinButton _mouse_sens;
+    UI::Widget::PrefSpinButton _mouse_thres;
+    UI::Widget::PrefCheckButton _mouse_use_ext_input;
+    UI::Widget::PrefCheckButton _mouse_switch_on_ext_input;
+
+    UI::Widget::PrefSpinButton _scroll_wheel;
+    UI::Widget::PrefSpinButton _scroll_arrow_px;
+    UI::Widget::PrefSpinButton _scroll_arrow_acc;
+    UI::Widget::PrefSpinButton _scroll_auto_speed;
+    UI::Widget::PrefSpinButton _scroll_auto_thres;
+    UI::Widget::PrefCheckButton _scroll_space;
+    UI::Widget::PrefCheckButton _wheel_zoom;
 
     Gtk::HScale     *_slider_snapping_delay;
-    PrefCheckButton _snap_indicator, _snap_closest_only, _snap_mouse_pointer;
-
-    PrefCombo       _steps_rot_snap;
-    PrefCheckButton _steps_compass;
-    PrefSpinButton  _steps_arrow, _steps_scale, _steps_inset, _steps_zoom;
-
-    PrefRadioButton _t_sel_trans_obj, _t_sel_trans_outl, _t_sel_cue_none, _t_sel_cue_mark,
-                    _t_sel_cue_box, _t_bbox_visual, _t_bbox_geometric;
-    PrefCheckButton _t_cvg_keep_objects, _t_cvg_convert_whole_groups;
-    PrefCheckButton _t_node_show_outline;
-    PrefCheckButton _t_node_live_outline;
-    PrefCheckButton _t_node_live_objects;
-    PrefCheckButton _t_node_pathflash_enabled;
-    PrefCheckButton _t_node_pathflash_selected;
-    PrefSpinButton  _t_node_pathflash_timeout;
-    PrefCheckButton _t_node_show_path_direction;
-    PrefCheckButton _t_node_single_node_transform_handles;
-    PrefCheckButton _t_node_delete_preserves_shape;
-    PrefColorPicker _t_node_pathoutline_color;
-
-    PrefRadioButton _win_dockable, _win_floating;
-    PrefRadioButton _win_ontop_none, _win_ontop_normal, _win_ontop_agressive;
-    PrefRadioButton _win_save_geom_off, _win_save_geom, _win_save_geom_prefs;
-    PrefCheckButton _win_hide_task, _win_zoom_resize , _win_show_close;
-    PrefSpinButton _win_trans_focus; /**< The dialog transparency setting for when the dialog is focused. */
-    PrefSpinButton _win_trans_blur;  /**< The dialog transparency setting for when the dialog is out of focus. */
-    PrefSpinButton _win_trans_time;  /**< How much time to go from one transparency setting to another */
-
-    PrefCheckButton _pencil_average_all_sketches;
-
-    PrefCheckButton _calligrapy_use_abs_size;
-    PrefCheckButton _calligrapy_keep_selected;
-
-    PrefCheckButton _connector_ignore_text;
-
-    PrefRadioButton _clone_option_parallel, _clone_option_stay, _clone_option_transform,
-                    _clone_option_unlink, _clone_option_delete;
-    PrefCheckButton _clone_relink_on_duplicate;
-
-    PrefCheckButton _mask_mask_on_top;
-    PrefCheckButton _mask_mask_remove;
-    PrefRadioButton _mask_grouping_none, _mask_grouping_separate, _mask_grouping_all;
-    PrefCheckButton _mask_ungrouping;
-
-    PrefRadioButton _blur_quality_best, _blur_quality_better, _blur_quality_normal, _blur_quality_worse, _blur_quality_worst;
-    PrefRadioButton _filter_quality_best, _filter_quality_better, _filter_quality_normal, _filter_quality_worse, _filter_quality_worst;
-    PrefCheckButton _show_filters_info_box;
-    PrefSpinButton  _filter_multi_threaded;
-
-    PrefCheckButton _trans_scale_stroke, _trans_scale_corner, _trans_gradient,_trans_pattern;
-    PrefRadioButton _trans_optimized, _trans_preserved;
-
-    PrefRadioButton _sel_all;
-    PrefRadioButton _sel_current;
-    PrefRadioButton _sel_recursive;
-    PrefCheckButton _sel_hidden, _sel_locked;
-    PrefCheckButton _sel_layer_deselects;
-
-    PrefSpinButton  _importexport_export, _misc_simpl;
-    PrefSlider      _snap_delay, _snap_weight;
-    PrefSpinButton  _misc_latency_skew;
-    PrefCheckButton _misc_comment, _misc_forkvectors, _misc_scripts, _misc_namedicon_delay;
+    UI::Widget::PrefCheckButton _snap_indicator;
+    UI::Widget::PrefCheckButton _snap_closest_only;
+    UI::Widget::PrefCheckButton _snap_mouse_pointer;
+
+    UI::Widget::PrefCombo       _steps_rot_snap;
+    UI::Widget::PrefCheckButton _steps_compass;
+    UI::Widget::PrefSpinButton _steps_arrow;
+    UI::Widget::PrefSpinButton _steps_scale;
+    UI::Widget::PrefSpinButton _steps_inset;
+    UI::Widget::PrefSpinButton _steps_zoom;
+
+    UI::Widget::PrefRadioButton _t_sel_trans_obj;
+    UI::Widget::PrefRadioButton _t_sel_trans_outl;
+    UI::Widget::PrefRadioButton _t_sel_cue_none;
+    UI::Widget::PrefRadioButton _t_sel_cue_mark;
+    UI::Widget::PrefRadioButton _t_sel_cue_box;
+    UI::Widget::PrefRadioButton _t_bbox_visual;
+    UI::Widget::PrefRadioButton _t_bbox_geometric;
+
+    UI::Widget::PrefCheckButton _t_cvg_keep_objects;
+    UI::Widget::PrefCheckButton _t_cvg_convert_whole_groups;
+    UI::Widget::PrefCheckButton _t_node_show_outline;
+    UI::Widget::PrefCheckButton _t_node_live_outline;
+    UI::Widget::PrefCheckButton _t_node_live_objects;
+    UI::Widget::PrefCheckButton _t_node_pathflash_enabled;
+    UI::Widget::PrefCheckButton _t_node_pathflash_selected;
+    UI::Widget::PrefSpinButton  _t_node_pathflash_timeout;
+    UI::Widget::PrefCheckButton _t_node_show_path_direction;
+    UI::Widget::PrefCheckButton _t_node_single_node_transform_handles;
+    UI::Widget::PrefCheckButton _t_node_delete_preserves_shape;
+    UI::Widget::PrefColorPicker _t_node_pathoutline_color;
+
+    UI::Widget::PrefRadioButton _win_dockable;
+    UI::Widget::PrefRadioButton _win_floating;
+    UI::Widget::PrefRadioButton _win_ontop_none;
+    UI::Widget::PrefRadioButton _win_ontop_normal;
+    UI::Widget::PrefRadioButton _win_ontop_agressive;
+    UI::Widget::PrefRadioButton _win_save_geom_off;
+    UI::Widget::PrefRadioButton _win_save_geom;
+    UI::Widget::PrefRadioButton _win_save_geom_prefs;
+    UI::Widget::PrefCheckButton _win_hide_task;
+    UI::Widget::PrefCheckButton _win_zoom_resize;
+    UI::Widget::PrefCheckButton _win_show_close;
+    UI::Widget::PrefSpinButton _win_trans_focus; /**< The dialog transparency setting for when the dialog is focused. */
+    UI::Widget::PrefSpinButton _win_trans_blur;  /**< The dialog transparency setting for when the dialog is out of focus. */
+    UI::Widget::PrefSpinButton _win_trans_time;  /**< How much time to go from one transparency setting to another */
+
+    UI::Widget::PrefCheckButton _pencil_average_all_sketches;
+
+    UI::Widget::PrefCheckButton _calligrapy_use_abs_size;
+    UI::Widget::PrefCheckButton _calligrapy_keep_selected;
+
+    UI::Widget::PrefCheckButton _connector_ignore_text;
+
+    UI::Widget::PrefRadioButton _clone_option_parallel;
+    UI::Widget::PrefRadioButton _clone_option_stay;
+    UI::Widget::PrefRadioButton _clone_option_transform;
+    UI::Widget::PrefRadioButton _clone_option_unlink;
+    UI::Widget::PrefRadioButton _clone_option_delete;
+    UI::Widget::PrefCheckButton _clone_relink_on_duplicate;
+
+    UI::Widget::PrefCheckButton _mask_mask_on_top;
+    UI::Widget::PrefCheckButton _mask_mask_remove;
+    UI::Widget::PrefRadioButton _mask_grouping_none;
+    UI::Widget::PrefRadioButton _mask_grouping_separate;
+    UI::Widget::PrefRadioButton _mask_grouping_all;
+    UI::Widget::PrefCheckButton _mask_ungrouping;
+
+    UI::Widget::PrefRadioButton _blur_quality_best;
+    UI::Widget::PrefRadioButton _blur_quality_better;
+    UI::Widget::PrefRadioButton _blur_quality_normal;
+    UI::Widget::PrefRadioButton _blur_quality_worse;
+    UI::Widget::PrefRadioButton _blur_quality_worst;
+    UI::Widget::PrefRadioButton _filter_quality_best;
+    UI::Widget::PrefRadioButton _filter_quality_better;
+    UI::Widget::PrefRadioButton _filter_quality_normal;
+    UI::Widget::PrefRadioButton _filter_quality_worse;
+    UI::Widget::PrefRadioButton _filter_quality_worst;
+    UI::Widget::PrefCheckButton _show_filters_info_box;
+    UI::Widget::PrefSpinButton  _filter_multi_threaded;
+
+    UI::Widget::PrefCheckButton _trans_scale_stroke;
+    UI::Widget::PrefCheckButton _trans_scale_corner;
+    UI::Widget::PrefCheckButton _trans_gradient;
+    UI::Widget::PrefCheckButton _trans_pattern;
+    UI::Widget::PrefRadioButton _trans_optimized;
+    UI::Widget::PrefRadioButton _trans_preserved;
+
+    UI::Widget::PrefRadioButton _sel_all;
+    UI::Widget::PrefRadioButton _sel_current;
+    UI::Widget::PrefRadioButton _sel_recursive;
+    UI::Widget::PrefCheckButton _sel_hidden;
+    UI::Widget::PrefCheckButton _sel_locked;
+    UI::Widget::PrefCheckButton _sel_layer_deselects;
+
+    UI::Widget::PrefSpinButton  _importexport_export;
+    UI::Widget::PrefSpinButton  _misc_simpl;
+    UI::Widget::PrefSlider      _snap_delay;
+    UI::Widget::PrefSlider      _snap_weight;
+    UI::Widget::PrefSpinButton  _misc_latency_skew;
+    UI::Widget::PrefCheckButton _misc_comment;
+    UI::Widget::PrefCheckButton _misc_forkvectors;
+    UI::Widget::PrefCheckButton _misc_scripts;
+    UI::Widget::PrefCheckButton _misc_namedicon_delay;
     Gtk::TextView   _misc_info;
     Gtk::ScrolledWindow _misc_info_scroll;
 
 
     // UI page
-    PrefCombo       _ui_languages;
-    PrefCombo       _misc_small_toolbar;
-    PrefCombo       _misc_small_secondary;
-    PrefCombo       _misc_small_tools;
-    PrefCheckButton _ui_colorsliders_top;
-    PrefSpinButton  _misc_recent;
-    PrefCheckButton _ui_partialdynamic;
-    ZoomCorrRulerSlider _ui_zoom_correction;
+    UI::Widget::PrefCombo       _ui_languages;
+    UI::Widget::PrefCombo       _misc_small_toolbar;
+    UI::Widget::PrefCombo       _misc_small_secondary;
+    UI::Widget::PrefCombo       _misc_small_tools;
+    UI::Widget::PrefCheckButton _ui_colorsliders_top;
+    UI::Widget::PrefSpinButton  _misc_recent;
+    UI::Widget::PrefCheckButton _ui_partialdynamic;
+    UI::Widget::ZoomCorrRulerSlider _ui_zoom_correction;
 
     //Spellcheck
-    PrefCombo       _spell_language;
-    PrefCombo       _spell_language2;
-    PrefCombo       _spell_language3;
-    PrefCheckButton _spell_ignorenumbers;
-    PrefCheckButton _spell_ignoreallcaps;
-
-    PrefCombo       _misc_overs_bitmap;
-    PrefCombo       _misc_bitmap_editor;
-    PrefCheckButton _misc_bitmap_autoreload;
-    PrefSpinButton  _bitmap_copy_res;
-
-    PrefCheckButton _save_use_current_dir;
-    PrefCheckButton _save_autosave_enable;
-    PrefSpinButton  _save_autosave_interval;
-    PrefEntry       _save_autosave_path;
-    PrefSpinButton  _save_autosave_max;
+    UI::Widget::PrefCombo       _spell_language;
+    UI::Widget::PrefCombo       _spell_language2;
+    UI::Widget::PrefCombo       _spell_language3;
+    UI::Widget::PrefCheckButton _spell_ignorenumbers;
+    UI::Widget::PrefCheckButton _spell_ignoreallcaps;
+
+    UI::Widget::PrefCombo       _misc_overs_bitmap;
+    UI::Widget::PrefCombo       _misc_bitmap_editor;
+    UI::Widget::PrefCheckButton _misc_bitmap_autoreload;
+    UI::Widget::PrefSpinButton  _bitmap_copy_res;
+
+    UI::Widget::PrefCheckButton _save_use_current_dir;
+    UI::Widget::PrefCheckButton _save_autosave_enable;
+    UI::Widget::PrefSpinButton  _save_autosave_interval;
+    UI::Widget::PrefEntry       _save_autosave_path;
+    UI::Widget::PrefSpinButton  _save_autosave_max;
 
     Gtk::ComboBoxText   _cms_display_profile;
-    PrefCheckButton     _cms_from_display;
-    PrefCombo           _cms_intent;
+    UI::Widget::PrefCheckButton     _cms_from_display;
+    UI::Widget::PrefCombo           _cms_intent;
 
-    PrefCheckButton     _cms_softproof;
-    PrefCheckButton     _cms_gamutwarn;
+    UI::Widget::PrefCheckButton     _cms_softproof;
+    UI::Widget::PrefCheckButton     _cms_gamutwarn;
     Gtk::ColorButton    _cms_gamutcolor;
     Gtk::ComboBoxText   _cms_proof_profile;
-    PrefCombo           _cms_proof_intent;
-    PrefCheckButton     _cms_proof_blackpoint;
-    PrefCheckButton     _cms_proof_preserveblack;
+    UI::Widget::PrefCombo           _cms_proof_intent;
+    UI::Widget::PrefCheckButton     _cms_proof_blackpoint;
+    UI::Widget::PrefCheckButton     _cms_proof_preserveblack;
 
     Gtk::Notebook       _grids_notebook;
-    PrefCheckButton     _grids_no_emphasize_on_zoom;
-    DialogPage          _grids_xy, _grids_axonom;
+    UI::Widget::PrefCheckButton     _grids_no_emphasize_on_zoom;
+    UI::Widget::DialogPage          _grids_xy;
+    UI::Widget::DialogPage          _grids_axonom;
     // CanvasXYGrid properties:
-        PrefUnit            _grids_xy_units;
-        PrefSpinButton      _grids_xy_origin_x;
-        PrefSpinButton      _grids_xy_origin_y;
-        PrefSpinButton      _grids_xy_spacing_x;
-        PrefSpinButton      _grids_xy_spacing_y;
-        PrefColorPicker     _grids_xy_color;
-        PrefColorPicker     _grids_xy_empcolor;
-        PrefSpinButton      _grids_xy_empspacing;
-        PrefCheckButton     _grids_xy_dotted;
+        UI::Widget::PrefUnit            _grids_xy_units;
+        UI::Widget::PrefSpinButton      _grids_xy_origin_x;
+        UI::Widget::PrefSpinButton      _grids_xy_origin_y;
+        UI::Widget::PrefSpinButton      _grids_xy_spacing_x;
+        UI::Widget::PrefSpinButton      _grids_xy_spacing_y;
+        UI::Widget::PrefColorPicker     _grids_xy_color;
+        UI::Widget::PrefColorPicker     _grids_xy_empcolor;
+        UI::Widget::PrefSpinButton      _grids_xy_empspacing;
+        UI::Widget::PrefCheckButton     _grids_xy_dotted;
     // CanvasAxonomGrid properties:
-        PrefUnit            _grids_axonom_units;
-        PrefSpinButton      _grids_axonom_origin_x;
-        PrefSpinButton      _grids_axonom_origin_y;
-        PrefSpinButton      _grids_axonom_spacing_y;
-        PrefSpinButton      _grids_axonom_angle_x;
-        PrefSpinButton      _grids_axonom_angle_z;
-        PrefColorPicker     _grids_axonom_color;
-        PrefColorPicker     _grids_axonom_empcolor;
-        PrefSpinButton      _grids_axonom_empspacing;
+        UI::Widget::PrefUnit            _grids_axonom_units;
+        UI::Widget::PrefSpinButton      _grids_axonom_origin_x;
+        UI::Widget::PrefSpinButton      _grids_axonom_origin_y;
+        UI::Widget::PrefSpinButton      _grids_axonom_spacing_y;
+        UI::Widget::PrefSpinButton      _grids_axonom_angle_x;
+        UI::Widget::PrefSpinButton      _grids_axonom_angle_z;
+        UI::Widget::PrefColorPicker     _grids_axonom_color;
+        UI::Widget::PrefColorPicker     _grids_axonom_empcolor;
+        UI::Widget::PrefSpinButton      _grids_axonom_empspacing;
 
     // SVG Output page:
-    PrefCheckButton   _svgoutput_usenamedcolors;
-    PrefSpinButton    _svgoutput_numericprecision;
-    PrefSpinButton    _svgoutput_minimumexponent;
-    PrefCheckButton   _svgoutput_inlineattrs;
-    PrefSpinButton    _svgoutput_indent;
-    PrefCheckButton   _svgoutput_allowrelativecoordinates;
-    PrefCheckButton   _svgoutput_forcerepeatcommands;
-
-    PrefEntryButtonHBox _importexport_ocal_url;
-    PrefEntry       _importexport_ocal_username;
-    PrefEntry       _importexport_ocal_password;
+    UI::Widget::PrefCheckButton   _svgoutput_usenamedcolors;
+    UI::Widget::PrefSpinButton    _svgoutput_numericprecision;
+    UI::Widget::PrefSpinButton    _svgoutput_minimumexponent;
+    UI::Widget::PrefCheckButton   _svgoutput_inlineattrs;
+    UI::Widget::PrefSpinButton    _svgoutput_indent;
+    UI::Widget::PrefCheckButton   _svgoutput_allowrelativecoordinates;
+    UI::Widget::PrefCheckButton   _svgoutput_forcerepeatcommands;
+
+    UI::Widget::PrefEntryButtonHBox _importexport_ocal_url;
+    UI::Widget::PrefEntry       _importexport_ocal_username;
+    UI::Widget::PrefEntry       _importexport_ocal_password;
 
     int _max_dialog_width;
     int _max_dialog_height;
     int _sb_width;
-    DialogPage* _current_page;
+    UI::Widget::DialogPage* _current_page;
 
-    Gtk::TreeModel::iterator AddPage(DialogPage& p, Glib::ustring title, int id);
-    Gtk::TreeModel::iterator AddPage(DialogPage& p, Glib::ustring title, Gtk::TreeModel::iterator parent, int id);
+    Gtk::TreeModel::iterator AddPage(UI::Widget::DialogPage& p, Glib::ustring title, int id);
+    Gtk::TreeModel::iterator AddPage(UI::Widget::DialogPage& p, Glib::ustring title, Gtk::TreeModel::iterator parent, int id);
     bool SetMaxDialogSize(const Gtk::TreeModel::iterator& iter);
     bool PresentPage(const Gtk::TreeModel::iterator& iter);
 
-    static void AddSelcueCheckbox(DialogPage& p, Glib::ustring const &prefs_path, bool def_value);
-    static void AddGradientCheckbox(DialogPage& p, Glib::ustring const &prefs_path, bool def_value);
-    static void AddConvertGuidesCheckbox(DialogPage& p, Glib::ustring const &prefs_path, bool def_value);
-    static void AddDotSizeSpinbutton(DialogPage& p, Glib::ustring const &prefs_path, double def_value);
-    static void AddNewObjectsStyle(DialogPage& p, Glib::ustring const &prefs_path, const gchar* banner = NULL);
+    static void AddSelcueCheckbox(UI::Widget::DialogPage& p, Glib::ustring const &prefs_path, bool def_value);
+    static void AddGradientCheckbox(UI::Widget::DialogPage& p, Glib::ustring const &prefs_path, bool def_value);
+    static void AddConvertGuidesCheckbox(UI::Widget::DialogPage& p, Glib::ustring const &prefs_path, bool def_value);
+    static void AddDotSizeSpinbutton(UI::Widget::DialogPage& p, Glib::ustring const &prefs_path, double def_value);
+    static void AddNewObjectsStyle(UI::Widget::DialogPage& p, Glib::ustring const &prefs_path, const gchar* banner = NULL);
 
     void on_pagelist_selection_changed();
     void on_reset_open_recent_clicked();

diff --git a/src/ui/dialog/panel-dialog.h b/src/ui/dialog/panel-dialog.h
index 7dbb6dd4ac25477142a8deafc18809fc1df09360..dc01c6a29e0c0de788797a5b382e6b62690f134e 100644 (file)
--- a/src/ui/dialog/panel-dialog.h
+++ b/src/ui/dialog/panel-dialog.h
@@ -30,14 +30,14 @@ namespace Dialog {
 
 class PanelDialogBase {
 public:
-    PanelDialogBase(Panel &panel, char const */*prefs_path*/, int const /*verb_num*/,
+    PanelDialogBase(UI::Widget::Panel &panel, char const */*prefs_path*/, int const /*verb_num*/,
                     Glib::ustring const &/*apply_label*/) :
       _panel (panel) { }
 
     virtual void present() = 0;
     virtual ~PanelDialogBase() {}
 
-    virtual Panel &getPanel() { return _panel; }
+    virtual UI::Widget::Panel &getPanel() { return _panel; }
 
 protected:
     static void handle_deactivate_desktop(Inkscape::Application *application, SPDesktop *desktop, void *data) {
@@ -54,7 +54,7 @@ protected:
     inline virtual void _propagateDesktopActivated(Inkscape::Application *, SPDesktop *);
     inline virtual void _propagateDesktopDeactivated(Inkscape::Application *, SPDesktop *);
 
-    Panel &_panel;
+    UI::Widget::Panel &_panel;
     sigc::connection _document_replaced_connection;
 };
 
@@ -62,7 +62,7 @@ template <typename Behavior>
 class PanelDialog : public PanelDialogBase, public Inkscape::UI::Dialog::Dialog {
 
 public:
-    PanelDialog(Panel &contents, char const *prefs_path, int const verb_num,
+    PanelDialog(UI::Widget::Panel &contents, char const *prefs_path, int const verb_num,
                 Glib::ustring const &apply_label);
 
     virtual ~PanelDialog() {}
@@ -86,7 +86,7 @@ class PanelDialog<Behavior::FloatingBehavior> :
         public PanelDialogBase, public Inkscape::UI::Dialog::Dialog {
 
 public:
-    inline PanelDialog(Panel &contents, char const *prefs_path, int const verb_num,
+    inline PanelDialog(UI::Widget::Panel &contents, char const *prefs_path, int const verb_num,
                        Glib::ustring const &apply_label);
 
     virtual ~PanelDialog() {}
@@ -128,7 +128,7 @@ PanelDialogBase::_propagateDesktopDeactivated(Inkscape::Application *application
 
 
 template <typename B>
-PanelDialog<B>::PanelDialog(Panel &panel, char const *prefs_path, int const verb_num,
+PanelDialog<B>::PanelDialog(Widget::Panel &panel, char const *prefs_path, int const verb_num,
                             Glib::ustring const &apply_label) :
     PanelDialogBase(panel, prefs_path, verb_num, apply_label),
     Dialog(&B::create, prefs_path, verb_num, apply_label)
@@ -163,7 +163,7 @@ template <typename B> template <typename P>
 PanelDialog<B> *
 PanelDialog<B>::create()
 {
-    Panel &panel = P::getInstance();
+    UI::Widget::Panel &panel = P::getInstance();
     return new PanelDialog<B>(panel, panel.getPrefsPath(), panel.getVerb(), panel.getApplyLabel());
 }
 
@@ -171,17 +171,17 @@ template <typename B>
 void
 PanelDialog<B>::present()
 {
-    _panel.present(); 
+    _panel.present();
 }
 
 template <typename B>
 void
 PanelDialog<B>::_presentDialog()
 {
-    Dialog::present(); 
+    Dialog::present();
 }
 
-PanelDialog<Behavior::FloatingBehavior>::PanelDialog(Panel &panel, char const *prefs_path,
+PanelDialog<Behavior::FloatingBehavior>::PanelDialog(UI::Widget::Panel &panel, char const *prefs_path,
                                                      int const verb_num, Glib::ustring const &apply_label) :
     PanelDialogBase(panel, prefs_path, verb_num, apply_label),
     Dialog(&Behavior::FloatingBehavior::create, prefs_path, verb_num, apply_label)
@@ -213,7 +213,7 @@ PanelDialog<Behavior::FloatingBehavior>::PanelDialog(Panel &panel, char const *p
 
 void
 PanelDialog<Behavior::FloatingBehavior>::present()
-{ 
+{
     Dialog::present();
     _panel.present();
 }
@@ -226,7 +226,7 @@ template <typename P>
 PanelDialog<Behavior::FloatingBehavior> *
 PanelDialog<Behavior::FloatingBehavior>::create()
 {
-    Panel &panel = P::getInstance();
+    UI::Widget::Panel &panel = P::getInstance();
     PanelDialog<Behavior::FloatingBehavior> *instance =
         new PanelDialog<Behavior::FloatingBehavior>(panel, panel.getPrefsPath(),
                                                     panel.getVerb(), panel.getApplyLabel());

diff --git a/src/ui/dialog/transformation.h b/src/ui/dialog/transformation.h
index 9d05713add057735d415f7cf9c8616ced7fcb967..0607871fd9bff5f7f96df53197d8a50515952c3f 100644 (file)
--- a/src/ui/dialog/transformation.h
+++ b/src/ui/dialog/transformation.h
@@ -26,8 +26,6 @@
 #include "ui/widget/button.h"
 
 
-using namespace Inkscape::UI::Widget;
-
 
 
 namespace Inkscape {
@@ -105,36 +103,36 @@ protected:
 
     Gtk::Notebook     _notebook;
 
-    NotebookPage      _page_move;
-    NotebookPage      _page_scale;
-    NotebookPage      _page_rotate;
-    NotebookPage      _page_skew;
-    NotebookPage      _page_transform;
-
-    UnitMenu          _units_move;
-    UnitMenu          _units_scale;
-    UnitMenu          _units_rotate;
-    UnitMenu          _units_skew;
-
-    ScalarUnit        _scalar_move_horizontal;
-    ScalarUnit        _scalar_move_vertical;
-    ScalarUnit        _scalar_scale_horizontal;
-    ScalarUnit        _scalar_scale_vertical;
-    ScalarUnit        _scalar_rotate;
-    ScalarUnit        _scalar_skew_horizontal;
-    ScalarUnit        _scalar_skew_vertical;
-
-    Scalar            _scalar_transform_a;
-    Scalar            _scalar_transform_b;
-    Scalar            _scalar_transform_c;
-    Scalar            _scalar_transform_d;
-    Scalar            _scalar_transform_e;
-    Scalar            _scalar_transform_f;
-
-    CheckButton  _check_move_relative;
-    CheckButton  _check_scale_proportional;
-    CheckButton  _check_apply_separately;
-    CheckButton  _check_replace_matrix;
+    UI::Widget::NotebookPage      _page_move;
+    UI::Widget::NotebookPage      _page_scale;
+    UI::Widget::NotebookPage      _page_rotate;
+    UI::Widget::NotebookPage      _page_skew;
+    UI::Widget::NotebookPage      _page_transform;
+
+    UI::Widget::UnitMenu          _units_move;
+    UI::Widget::UnitMenu          _units_scale;
+    UI::Widget::UnitMenu          _units_rotate;
+    UI::Widget::UnitMenu          _units_skew;
+
+    UI::Widget::ScalarUnit        _scalar_move_horizontal;
+    UI::Widget::ScalarUnit        _scalar_move_vertical;
+    UI::Widget::ScalarUnit        _scalar_scale_horizontal;
+    UI::Widget::ScalarUnit        _scalar_scale_vertical;
+    UI::Widget::ScalarUnit        _scalar_rotate;
+    UI::Widget::ScalarUnit        _scalar_skew_horizontal;
+    UI::Widget::ScalarUnit        _scalar_skew_vertical;
+
+    UI::Widget::Scalar            _scalar_transform_a;
+    UI::Widget::Scalar            _scalar_transform_b;
+    UI::Widget::Scalar            _scalar_transform_c;
+    UI::Widget::Scalar            _scalar_transform_d;
+    UI::Widget::Scalar            _scalar_transform_e;
+    UI::Widget::Scalar            _scalar_transform_f;
+
+    UI::Widget::CheckButton  _check_move_relative;
+    UI::Widget::CheckButton  _check_scale_proportional;
+    UI::Widget::CheckButton  _check_apply_separately;
+    UI::Widget::CheckButton  _check_replace_matrix;
 
     /**
      * Layout the GUI components, and prepare for use