SPColorScales c++-sification - move to ui/widget

(bzr r13341.6.38)

8 files changed, 8 insertions, 8 deletions

diff --git a/src/ui/widget/Makefile_insert b/src/ui/widget/Makefile_insert
index 97625f04e..039e2a8d9 100644
--- a/src/ui/widget/Makefile_insert
+++ b/src/ui/widget/Makefile_insert
@@ -16,6 +16,8 @@ ink_common_sources +=	\
 	ui/widget/color-preview.h       \
 	ui/widget/color-slider.cpp      \
 	ui/widget/color-slider.h       \
+	ui/widget/color-scales.cpp   \
+	ui/widget/color-scales.h    \
 	ui/widget/combo-enums.h \
 	ui/widget/dock.h		\
 	ui/widget/dock.cpp		\
diff --git a/src/widgets/sp-color-scales.cpp b/src/ui/widget/color-scales.cpp
index 3d9de650c..bba44034a 100644
--- a/src/widgets/sp-color-scales.cpp
+++ b/src/ui/widget/color-scales.cpp
@@ -6,14 +6,14 @@
 # include "config.h"
 #endif
 
-#include "sp-color-scales.h"
+#include "ui/widget/color-scales.h"
 
 #include <math.h>
 #include <gtk/gtk.h>
 #include <glibmm/i18n.h>
 #include <gtkmm/adjustment.h>
 
-#include "../dialogs/dialog-events.h"
+#include "dialogs/dialog-events.h"
 #include "svg/svg-icc-color.h"
 #include "ui/widget/color-slider.h"
 
diff --git a/src/widgets/sp-color-scales.h b/src/ui/widget/color-scales.h
index 946f0935e..946f0935e 100644
--- a/src/widgets/sp-color-scales.h
+++ b/src/ui/widget/color-scales.h
diff --git a/src/ui/widget/color-slider.cpp b/src/ui/widget/color-slider.cpp
index 711942e28..ad9662c6c 100644
--- a/src/ui/widget/color-slider.cpp
+++ b/src/ui/widget/color-slider.cpp
@@ -28,7 +28,7 @@
 #include <gtkmm/style.h>
 #endif
 
-#include "widgets/sp-color-scales.h"
+#include "ui/widget/color-scales.h"
 #include "preferences.h"
 
 static const gint SLIDER_WIDTH = 96;
diff --git a/src/ui/widget/color-wheel-selector.cpp b/src/ui/widget/color-wheel-selector.cpp
index e49e4ba16..4bf40dbb6 100644
--- a/src/ui/widget/color-wheel-selector.cpp
+++ b/src/ui/widget/color-wheel-selector.cpp
@@ -11,9 +11,9 @@
 #include <gtkmm/label.h>
 #include <gtkmm/spinbutton.h>
 #include "dialogs/dialog-events.h"
-#include "widgets/sp-color-scales.h"
 #include "svg/svg-icc-color.h"
 #include "ui/selected-color.h"
+#include "ui/widget/color-scales.h"
 #include "ui/widget/color-slider.h"
 #include "ui/widget/gimpcolorwheel.h"
 
diff --git a/src/widgets/Makefile_insert b/src/widgets/Makefile_insert
index 7a1a7a4ef..6d860996a 100644
--- a/src/widgets/Makefile_insert
+++ b/src/widgets/Makefile_insert
@@ -70,8 +70,6 @@ ink_common_sources +=	\
 	widgets/sp-color-icc-selector.h	\
 	widgets/sp-color-notebook.cpp	\
 	widgets/sp-color-notebook.h	\
-	widgets/sp-color-scales.cpp	\
-	widgets/sp-color-scales.h	\
 	widgets/sp-color-selector.cpp	\
 	widgets/sp-color-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 cd1586661..808dfc925 100644
--- a/src/widgets/sp-color-icc-selector.cpp
+++ b/src/widgets/sp-color-icc-selector.cpp
@@ -12,7 +12,7 @@
 
 #include "../dialogs/dialog-events.h"
 #include "sp-color-icc-selector.h"
-#include "sp-color-scales.h"
+#include "ui/widget/color-scales.h"
 #include "ui/widget/color-slider.h"
 #include "svg/svg-icc-color.h"
 #include "colorspace.h"
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index 7495d1deb..0e1634314 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -30,7 +30,6 @@
 #include "../preferences.h"
 #include "sp-color-notebook.h"
 #include "spw-utilities.h"
-#include "sp-color-scales.h"
 #include "sp-color-icc-selector.h"
 #include "svg/svg-icc-color.h"
 #include "../inkscape.h"
@@ -41,6 +40,7 @@
 #include "tools-switch.h"
 #include "ui/tools/tool-base.h"
 #include "ui/widget/color-entry.h"
+#include "ui/widget/color-scales.h"
 #include "ui/widget/color-wheel-selector.h"
 
 using Inkscape::CMSSystem;