summaryrefslogtreecommitdiffstats
path: root/src/style-internal.cpp
diff options
context:
space:
mode:
authorkamalpreetgrewal <grewalkamal005@gmail.com>2016-08-04 06:19:46 +0000
committerkamalpreetgrewal <grewalkamal005@gmail.com>2016-08-04 06:19:46 +0000
commite0728cfe3dcf882045af5295ffd7c2725b6a430f (patch)
tree3289217df16f6f73a2950cd3d40d24a9c856cae1 /src/style-internal.cpp
parentAdd functionality to add and delete CSS property in CSS panel (diff)
parentAdd legacy verb SP_VERB_SELECTION_OUTLINE_LEGACY as pointed in bug 1556592#14 (diff)
downloadinkscape-e0728cfe3dcf882045af5295ffd7c2725b6a430f.tar.gz
inkscape-e0728cfe3dcf882045af5295ffd7c2725b6a430f.zip
Merge changes from trunk
(bzr r14949.1.62)
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 f25eb730e..803132a16 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