diff options
| author | Tomasz Boczkowski <penginsbacon@gmail.com> | 2014-05-31 08:48:29 +0000 |
|---|---|---|
| committer | Tomasz Boczkowski <penginsbacon@gmail.com> | 2014-05-31 08:48:29 +0000 |
| commit | ba8232e27fbff22f2af10c39a66c2a084bacbfb4 (patch) | |
| tree | be17d60aaf5a7c6920f42925fcdd7e6e68fb5d29 /src | |
| parent | added dragged, released, grabbed signals to SelectedColor (diff) | |
| download | inkscape-ba8232e27fbff22f2af10c39a66c2a084bacbfb4.tar.gz inkscape-ba8232e27fbff22f2af10c39a66c2a084bacbfb4.zip | |
SPColorWheelSelector c++-sification: moved to ui/widgets
(bzr r13341.6.34)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/widget/Makefile_insert | 2 | ||||
| -rw-r--r-- | src/ui/widget/color-wheel-selector.cpp (renamed from src/widgets/sp-color-wheel-selector.cpp) | 9 | ||||
| -rw-r--r-- | src/ui/widget/color-wheel-selector.h (renamed from src/widgets/sp-color-wheel-selector.h) | 2 | ||||
| -rw-r--r-- | src/widgets/Makefile_insert | 2 | ||||
| -rw-r--r-- | src/widgets/sp-color-notebook.cpp | 2 |
5 files changed, 8 insertions, 9 deletions
diff --git a/src/ui/widget/Makefile_insert b/src/ui/widget/Makefile_insert index bad3342b1..97625f04e 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-wheel-selector.cpp \ + ui/widget/color-wheel-selector.h \ ui/widget/color-picker.cpp \ ui/widget/color-picker.h \ ui/widget/color-preview.cpp \ diff --git a/src/widgets/sp-color-wheel-selector.cpp b/src/ui/widget/color-wheel-selector.cpp index 2b448e075..134232813 100644 --- a/src/widgets/sp-color-wheel-selector.cpp +++ b/src/ui/widget/color-wheel-selector.cpp @@ -2,16 +2,15 @@ # include "config.h" #endif -#include "sp-color-wheel-selector.h" +#include "color-wheel-selector.h" #include <math.h> #include <gtk/gtk.h> #include <glibmm/i18n.h> #include <gtkmm/adjustment.h> -#include "../dialogs/dialog-events.h" -#include "sp-color-scales.h" -#include "sp-color-icc-selector.h" -#include "../svg/svg-icc-color.h" +#include "dialogs/dialog-events.h" +#include "widgets/sp-color-scales.h" +#include "svg/svg-icc-color.h" #include "ui/widget/color-slider.h" #include "ui/widget/gimpcolorwheel.h" diff --git a/src/widgets/sp-color-wheel-selector.h b/src/ui/widget/color-wheel-selector.h index ad0d11bad..7a9cb5093 100644 --- a/src/widgets/sp-color-wheel-selector.h +++ b/src/ui/widget/color-wheel-selector.h @@ -12,7 +12,7 @@ #include <glib.h> #include <gtk/gtk.h> -#include "sp-color-selector.h" +#include "widgets/sp-color-selector.h" #include "ui/selected-color.h" typedef struct _GimpColorWheel GimpColorWheel; diff --git a/src/widgets/Makefile_insert b/src/widgets/Makefile_insert index a4a3bb61b..7a1a7a4ef 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-wheel-selector.cpp \ - widgets/sp-color-wheel-selector.h \ widgets/spinbutton-events.cpp \ widgets/spinbutton-events.h \ widgets/sp-widget.cpp \ diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp index ac110b86c..ca189e086 100644 --- a/src/widgets/sp-color-notebook.cpp +++ b/src/widgets/sp-color-notebook.cpp @@ -32,7 +32,6 @@ #include "spw-utilities.h" #include "sp-color-scales.h" #include "sp-color-icc-selector.h" -#include "sp-color-wheel-selector.h" #include "svg/svg-icc-color.h" #include "../inkscape.h" #include "../document.h" @@ -42,6 +41,7 @@ #include "tools-switch.h" #include "ui/tools/tool-base.h" #include "ui/widget/color-entry.h" +#include "ui/widget/color-wheel-selector.h" using Inkscape::CMSSystem; |