#include svg/svg-color.h instead of or as well as (as appropriate) svg/svg.h.

diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index 8a3074e2e3a2aecd7eb680192fd7152e07958018..d4ce30e11b75bea6b4150105e52080253fb00233 100644 (file)
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
@@ -14,7 +14,7 @@
 #include "desktop.h"
 #include "color-rgba.h"
 #include "svg/css-ostringstream.h"
-#include "svg/svg.h"
+#include "svg/svg-color.h"
 #include "selection.h"
 #include "sp-tspan.h"
 #include "sp-textpath.h"

diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp
index 304bf7c0ee3e5c34141b226a37325fc5ed6113bd..b33d8b0f3d0ba48d3eaf1708ee844f565f70899e 100644 (file)
--- a/src/dialogs/clonetiler.cpp
+++ b/src/dialogs/clonetiler.cpp
@@ -40,6 +40,7 @@
 #include "xml/repr.h"
 
 #include "svg/svg.h"
+#include "svg/svg-color.h"
 
 #include "libnr/nr-matrix-fns.h"
 #include "libnr/nr-matrix-ops.h"

diff --git a/src/dialogs/swatches.cpp b/src/dialogs/swatches.cpp
index 5ed09b3e01808b8d73b5f2585a6d09a5c134b3e5..17418186a77f402ccf482171a03adcdda292f412 100644 (file)
--- a/src/dialogs/swatches.cpp
+++ b/src/dialogs/swatches.cpp
@@ -24,7 +24,7 @@
 #include "desktop-handles.h"
 #include "extension/db.h"
 #include "inkscape.h"
-#include "svg/svg.h"
+#include "svg/svg-color.h"
 #include "desktop-style.h"
 #include "io/sys.h"
 #include "path-prefix.h"

diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp
index b998b1b15f779c7531766aef65874f54c6a84280..fbe1bd6ce9449f52cd882ad22ec92f18ad5e232a 100644 (file)
--- a/src/dropper-context.cpp
+++ b/src/dropper-context.cpp
@@ -27,7 +27,7 @@
 #include "display/canvas-bpath.h"
 #include "display/canvas-arena.h"
 #include "display/curve.h"
-#include "svg/svg.h"
+#include "svg/svg-color.h"
 #include "color.h"
 #include "color-rgba.h"
 #include "desktop-style.h"

diff --git a/src/extension/internal/gimpgrad.cpp b/src/extension/internal/gimpgrad.cpp
index 5e3924cef3f1aee0da0088d20d775a2792cf3db0..21b689015ecf859e4e732056b19a11435ee23762 100644 (file)
--- a/src/extension/internal/gimpgrad.cpp
+++ b/src/extension/internal/gimpgrad.cpp
@@ -19,7 +19,7 @@
 #include "io/sys.h"
 #include "extension/system.h"
 #include "svg/css-ostringstream.h"
-#include "svg/svg.h" // svg-color.h
+#include "svg/svg-color.h"
 
 #include "gimpgrad.h"
 #include "streq.h"

diff --git a/src/gradient-chemistry.cpp b/src/gradient-chemistry.cpp
index b4a1eca92571c2d78bd765c7f0f98924140dae70..85f3107f72cc2e906b6d51cb1c41c68d0d3e8e07 100644 (file)
--- a/src/gradient-chemistry.cpp
+++ b/src/gradient-chemistry.cpp
@@ -29,6 +29,7 @@
 #include <libnr/nr-matrix-fns.h>
 #include "xml/repr.h"
 #include "svg/svg.h"
+#include "svg/svg-color.h"
 
 
 // Terminology:

diff --git a/src/interface.cpp b/src/interface.cpp
index f47d0ffa255eb2a6bd720bfde38e420122fc6c6c..26552d510133fd1faf82da13568d26e21cb60416 100644 (file)
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -56,7 +56,7 @@
 // Added for color drag-n-drop
 #include "display/sp-canvas.h"
 #include "color.h"
-#include "svg/svg.h"
+#include "svg/svg-color.h"
 #include "desktop-style.h"
 #include "style.h"
 

diff --git a/src/main.cpp b/src/main.cpp
index e791af153060e9bc677657b423e84cc12b08aa69..32a4b6f94350b3966dcff0784a35de8b386aa6e6 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -65,6 +65,7 @@
 #include "unit-constants.h"
 
 #include "svg/svg.h"
+#include "svg/svg-color.h"
 #include "svg/stringstream.h"
 
 #include "inkscape-private.h"

diff --git a/src/sp-gradient.cpp b/src/sp-gradient.cpp
index c2b0b32a3cb881169f6562a13d5ef59e649f38ea..dd7b7b257aa6659a0fe50616b896d529c3107007 100644 (file)
--- a/src/sp-gradient.cpp
+++ b/src/sp-gradient.cpp
@@ -29,6 +29,7 @@
 
 #include "display/nr-gradient-gpl.h"
 #include "svg/svg.h"
+#include "svg/svg-color.h"
 #include "svg/css-ostringstream.h"
 #include "attributes.h"
 #include "document-private.h"

diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index f1d957d84acd87578da4bda8e413db3131a81c94..4dfdb1b282945fea93f2dd213e0a750c3191d87e 100644 (file)
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -20,7 +20,7 @@
 
 #include "display/canvas-grid.h"
 #include "helper/units.h"
-#include "svg/svg.h"
+#include "svg/svg-color.h"
 #include "xml/repr.h"
 #include "attributes.h"
 #include "document.h"

diff --git a/src/style.cpp b/src/style.cpp
index ee67469ade716ac45dc3e9710748d83d23b53aa3..8a28b9f9e7366c7798c6f3bb0d3df847c23f7927 100644 (file)
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -23,6 +23,7 @@
 #include "xml/croco-node-iface.h"
 
 #include "svg/svg.h"
+#include "svg/svg-color.h"
 
 #include "display/canvas-bpath.h"
 #include "attributes.h"

diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index e1f0ee7a43d3753d71f3e43785ead67856a8ff7b..bed44ae16645a3ae361d7a5ceb87e6098afaf705 100644 (file)
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.cpp
@@ -24,7 +24,7 @@
 
 #include "helper/units.h"
 #include "xml/repr.h"
-#include "svg/svg.h"
+#include "svg/svg-color.h"
 #include "svg/stringstream.h"
 
 #include "inkscape.h"

diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index be707e15ee45b5487c9acb7b6770fa1335d82655..066d721752d2f5ccc82957642fe75a88521b6a5b 100644 (file)
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -32,7 +32,7 @@
 #include "document.h"
 #include "widgets/widget-sizes.h"
 #include "widgets/spinbutton-events.h"
-#include "svg/svg.h"
+#include "svg/svg-color.h"
 #include "svg/css-ostringstream.h"
 #include "helper/units.h"
 

diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index 2917ab89d0d379c9bc34cc4fb551b2e3199ace9f..5befb11d03c774ddaf16e2885324b212fce1fba2 100644 (file)
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -393,7 +393,7 @@ sp_gvs_defs_modified (SPObject *defs, guint flags, SPGradientVectorSelector *gvs
 #include "../widgets/sp-color-preview.h"
 #include "../widgets/widget-sizes.h"
 #include "../xml/node-event-vector.h"
-#include "../svg/svg.h"
+#include "../svg/svg-color.h"
 
 
 #define PAD 4

diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index f16bc585265d7b5d2fc7cb3222bdce2064078f7d..5fc74097924bffb47cdb93141d422248aea7f411 100644 (file)
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -41,7 +41,7 @@
 #include <document-private.h>
 #include <desktop-style.h>
 #include <style.h>
-#include "svg/svg.h"
+#include "svg/svg-color.h"
 #include "svg/css-ostringstream.h"
 
 #include "paint-selector.h"