SPColorICC c++sification: moved to ui/widget/

(bzr r13341.6.41)

7 files changed, 9 insertions, 9 deletions

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 65e93f1b0..dbfba0508 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -109,6 +109,7 @@ set(ui_SRC
 	widget/anchor-selector.cpp
 	widget/button.cpp
 	widget/color-entry.cpp
+	widget/color-icc-selector.cpp
 	widget/color-picker.cpp
 	widget/color-preview.cpp
 	widget/color-scales.cpp
@@ -275,6 +276,7 @@ set(ui_SRC
 	widget/attr-widget.h
 	widget/button.h
 	widget/color-entry.h
+	widget/color-icc-selector.h
 	widget/color-picker.h
 	widget/color-preview.h
 	widget/color-scales.h
diff --git a/src/ui/widget/Makefile_insert b/src/ui/widget/Makefile_insert
index 039e2a8d9..f39236da7 100644
--- a/src/ui/widget/Makefile_insert
+++ b/src/ui/widget/Makefile_insert
@@ -8,6 +8,8 @@ ink_common_sources +=	\
 	ui/widget/button.cpp	\
 	ui/widget/color-entry.cpp    \
 	ui/widget/color-entry.h     \
+	ui/widget/color-icc-selector.cpp	\
+	ui/widget/color-icc-selector.h	\
 	ui/widget/color-wheel-selector.cpp    \
 	ui/widget/color-wheel-selector.h    \
 	ui/widget/color-picker.cpp     \
diff --git a/src/widgets/sp-color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index f872a3164..74e63f320 100644
--- a/src/widgets/sp-color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -2,7 +2,7 @@
 # include "config.h"
 #endif
 
-#include "gradient-vector.h"
+#include "widgets/gradient-vector.h"
 #include <math.h>
 #include <gtk/gtk.h>
 #include <glibmm/i18n.h>
@@ -10,8 +10,8 @@
 #include <set>
 #include <vector>
 
-#include "../dialogs/dialog-events.h"
-#include "sp-color-icc-selector.h"
+#include "dialogs/dialog-events.h"
+#include "ui/widget/color-icc-selector.h"
 #include "ui/widget/color-scales.h"
 #include "ui/widget/color-slider.h"
 #include "svg/svg-icc-color.h"
diff --git a/src/widgets/sp-color-icc-selector.h b/src/ui/widget/color-icc-selector.h
index a59d3fe7e..cee8305cd 100644
--- a/src/widgets/sp-color-icc-selector.h
+++ b/src/ui/widget/color-icc-selector.h
@@ -4,7 +4,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include "sp-color-selector.h"
+#include "widgets/sp-color-selector.h"
 #include "ui/selected-color.h"
 
 namespace Inkscape {
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index dd0cba0b2..f546c516f 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -36,7 +36,6 @@ set(widgets_SRC
 	select-toolbar.cpp
 	shrink-wrap-button.cpp
 	sp-attribute-widget.cpp
-	sp-color-icc-selector.cpp
 	sp-color-notebook.cpp
 	sp-color-selector.cpp
 	sp-widget.cpp
@@ -90,7 +89,6 @@ set(widgets_SRC
 	select-toolbar.h
 	shrink-wrap-button.h
 	sp-attribute-widget.h
-	sp-color-icc-selector.h
 	sp-color-notebook.h
 	sp-color-selector.h
 	sp-widget.h
diff --git a/src/widgets/Makefile_insert b/src/widgets/Makefile_insert
index 6d860996a..88e79f118 100644
--- a/src/widgets/Makefile_insert
+++ b/src/widgets/Makefile_insert
@@ -66,8 +66,6 @@ ink_common_sources +=	\
 	widgets/spiral-toolbar.h		\
 	widgets/sp-attribute-widget.cpp	\
 	widgets/sp-attribute-widget.h	\
-	widgets/sp-color-icc-selector.cpp	\
-	widgets/sp-color-icc-selector.h	\
 	widgets/sp-color-notebook.cpp	\
 	widgets/sp-color-notebook.h	\
 	widgets/sp-color-selector.cpp	\
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index 807fe38e0..2097737d4 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-icc-selector.h"
 #include "svg/svg-icc-color.h"
 #include "../inkscape.h"
 #include "../document.h"
@@ -40,6 +39,7 @@
 #include "tools-switch.h"
 #include "ui/tools/tool-base.h"
 #include "ui/widget/color-entry.h"
+#include "ui/widget/color-icc-selector.h"
 #include "ui/widget/color-scales.h"
 #include "ui/widget/color-wheel-selector.h"