summaryrefslogtreecommitdiffstats
path: root/src/style-internal.cpp
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2016-08-12 04:11:03 +0000
committerTed Gould <ted@gould.cx>2016-08-12 04:11:03 +0000
commitff848ebc9919d158c3ec3d7420e72b6aca99a3ea (patch)
tree030ab171865d0ed7f6bae3ef68315639cdb2622b /src/style-internal.cpp
parentMerging 0.92.x branch (diff)
parentCloneTiler: Further C++ification (diff)
downloadinkscape-ff848ebc9919d158c3ec3d7420e72b6aca99a3ea.tar.gz
inkscape-ff848ebc9919d158c3ec3d7420e72b6aca99a3ea.zip
Merge trunk
(bzr r14950.1.20)
Diffstat (limited to 'src/style-internal.cpp')
-rw-r--r--src/style-internal.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/style-internal.cpp b/src/style-internal.cpp
index 62b0de52d..136a522f8 100644
--- a/src/style-internal.cpp
+++ b/src/style-internal.cpp
@@ -23,16 +23,14 @@
*/
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include <config.h>
#endif
#include "style-internal.h"
-#include "style-enums.h"
#include "style.h"
#include "svg/svg.h"
#include "svg/svg-color.h"
-#include "svg/svg-icc-color.h"
#include "streq.h"
#include "strneq.h"
@@ -42,9 +40,6 @@
#include "svg/css-ostringstream.h"
#include "util/units.h"
-#include <sigc++/functors/ptr_fun.h>
-#include <sigc++/adaptors/bind.h>
-
#include <glibmm/regex.h>
// TODO REMOVE OR MAKE MEMBER FUNCTIONS