moved widgets/sp-color-slider to ui/widget/color-slider

(bzr r13341.6.2)

11 files changed, 27 insertions, 18 deletions

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 7d80f1e36..883ba3427 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -109,6 +109,7 @@ set(ui_SRC
 	widget/button.cpp
 	widget/color-picker.cpp
 	widget/color-preview.cpp
+	widget/color-slider.cpp
 	widget/dock-item.cpp
 	widget/dock.cpp
 	widget/entity-entry.cpp
@@ -270,6 +271,7 @@ set(ui_SRC
 	widget/button.h
 	widget/color-picker.h
 	widget/color-preview.h
+	widget/color-slider.h
 	widget/combo-enums.h
 	widget/dock-item.h
 	widget/dock.h
diff --git a/src/ui/widget/Makefile_insert b/src/ui/widget/Makefile_insert
index 608dd5334..6deaf6671 100644
--- a/src/ui/widget/Makefile_insert
+++ b/src/ui/widget/Makefile_insert
@@ -10,6 +10,8 @@ ink_common_sources +=	\
 	ui/widget/color-picker.h        \
 	ui/widget/color-preview.cpp     \
 	ui/widget/color-preview.h       \
+	ui/widget/color-slider.cpp      \
+	ui/widget/color-slider.h       \
 	ui/widget/combo-enums.h \
 	ui/widget/dock.h		\
 	ui/widget/dock.cpp		\
diff --git a/src/widgets/sp-color-slider.cpp b/src/ui/widget/color-slider.cpp
index 07e1d79fb..430239f00 100644
--- a/src/widgets/sp-color-slider.cpp
+++ b/src/ui/widget/color-slider.cpp
@@ -15,20 +15,23 @@
 # include "config.h"
 #endif
 
-#include "sp-color-slider.h"
+#include "color-slider.h"
 
 #include <gtk/gtk.h>
 #include <gdkmm/screen.h>
 #include <gdkmm/general.h>
 #include <gtkmm/adjustment.h>
 
-#include "sp-color-scales.h"
+#include "widgets/sp-color-scales.h"
 #include "preferences.h"
 
 static const gint SLIDER_WIDTH = 96;
 static const gint SLIDER_HEIGHT = 8;
 static const gint ARROW_SIZE = 7;
 
+namespace Inkscape {
+namespace UI {
+namespace Widget {
 
 ColorSlider::ColorSlider(Gtk::Adjustment* adjustment)
     : _dragging(false)
@@ -178,10 +181,9 @@ bool ColorSlider::on_draw(const Cairo::RefPtr<Cairo::Context>& cr) {
     return false;
 }
 
-
-
-
-
+}//namespace Widget
+}//namespace UI
+}//namespace Inkscape
 
 
 
diff --git a/src/widgets/sp-color-slider.h b/src/ui/widget/color-slider.h
index 6821c8fe4..d8be7d111 100644
--- a/src/widgets/sp-color-slider.h
+++ b/src/ui/widget/color-slider.h
@@ -18,9 +18,14 @@
 #endif
 
 #include <gtkmm/widget.h>
-
 #include <sigc++/signal.h>
 
+namespace Inkscape
+{
+namespace UI
+{
+namespace Widget
+{
 
 /*
  * A slider with colored background
@@ -81,8 +86,9 @@ private:
     Glib::RefPtr<Gdk::Window> _refGdkWindow;
 };
 
-
-
+}//namespace Widget
+}//namespace UI
+}//namespace Inkscape
 
 
 #include <gtk/gtk.h>
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index fe4433153..b65e0b1db 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -40,7 +40,6 @@ set(widgets_SRC
 	sp-color-notebook.cpp
 	sp-color-scales.cpp
 	sp-color-selector.cpp
-	sp-color-slider.cpp
 	sp-color-wheel-selector.cpp
 	sp-widget.cpp
 	sp-xmlview-attr-list.cpp
@@ -97,7 +96,6 @@ set(widgets_SRC
 	sp-color-notebook.h
 	sp-color-scales.h
 	sp-color-selector.h
-	sp-color-slider.h
 	sp-color-wheel-selector.h
 	sp-widget.h
 	sp-xmlview-attr-list.h
diff --git a/src/widgets/Makefile_insert b/src/widgets/Makefile_insert
index 97713cbee..a4a3bb61b 100644
--- a/src/widgets/Makefile_insert
+++ b/src/widgets/Makefile_insert
@@ -74,8 +74,6 @@ ink_common_sources +=	\
 	widgets/sp-color-scales.h	\
 	widgets/sp-color-selector.cpp	\
 	widgets/sp-color-selector.h	\
-	widgets/sp-color-slider.cpp	\
-	widgets/sp-color-slider.h	\
 	widgets/sp-color-wheel-selector.cpp	\
 	widgets/sp-color-wheel-selector.h	\
 	widgets/spinbutton-events.cpp	\
diff --git a/src/widgets/sp-color-icc-selector.cpp b/src/widgets/sp-color-icc-selector.cpp
index 53e73dd57..baed7e3b6 100644
--- a/src/widgets/sp-color-icc-selector.cpp
+++ b/src/widgets/sp-color-icc-selector.cpp
@@ -13,7 +13,7 @@
 #include "../dialogs/dialog-events.h"
 #include "sp-color-icc-selector.h"
 #include "sp-color-scales.h"
-#include "sp-color-slider.h"
+#include "ui/widget/color-slider.h"
 #include "svg/svg-icc-color.h"
 #include "colorspace.h"
 #include "document.h"
diff --git a/src/widgets/sp-color-scales.cpp b/src/widgets/sp-color-scales.cpp
index a7d458561..7d5874506 100644
--- a/src/widgets/sp-color-scales.cpp
+++ b/src/widgets/sp-color-scales.cpp
@@ -13,6 +13,7 @@
 #include <glibmm/i18n.h>
 #include "../dialogs/dialog-events.h"
 #include "svg/svg-icc-color.h"
+#include "ui/widget/color-slider.h"
 
 #define CSC_CHANNEL_R (1 << 0)
 #define CSC_CHANNEL_G (1 << 1)
diff --git a/src/widgets/sp-color-scales.h b/src/widgets/sp-color-scales.h
index cd3900f85..65925fecb 100644
--- a/src/widgets/sp-color-scales.h
+++ b/src/widgets/sp-color-scales.h
@@ -13,12 +13,13 @@
 #include <gtk/gtk.h>
 
 #include <color.h>
-#include <widgets/sp-color-slider.h>
 #include <widgets/sp-color-selector.h>
 
 
 struct SPColorScales;
 struct SPColorScalesClass;
+struct SPColorSlider;
+
 
 typedef enum {
     SP_COLOR_SCALES_MODE_NONE = 0,
diff --git a/src/widgets/sp-color-wheel-selector.cpp b/src/widgets/sp-color-wheel-selector.cpp
index 1cc2e06d6..de2d030d4 100644
--- a/src/widgets/sp-color-wheel-selector.cpp
+++ b/src/widgets/sp-color-wheel-selector.cpp
@@ -11,6 +11,7 @@
 #include "sp-color-scales.h"
 #include "sp-color-icc-selector.h"
 #include "../svg/svg-icc-color.h"
+#include "ui/widget/color-slider.h"
 #include "ui/widget/gimpcolorwheel.h"
 
 G_BEGIN_DECLS
diff --git a/src/widgets/sp-color-wheel-selector.h b/src/widgets/sp-color-wheel-selector.h
index 6f45b6bba..b7b86438c 100644
--- a/src/widgets/sp-color-wheel-selector.h
+++ b/src/widgets/sp-color-wheel-selector.h
@@ -12,14 +12,12 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include "sp-color-slider.h"
 #include "sp-color-selector.h"
 
-
-
 typedef struct _GimpColorWheel GimpColorWheel;
 struct SPColorWheelSelector;
 struct SPColorWheelSelectorClass;
+struct SPColorSlider;
 
 class ColorWheelSelector: public ColorSelector
 {