summaryrefslogtreecommitdiffstats
path: root/src/ui/tools/tool-base.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/ui/tools/tool-base.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/ui/tools/tool-base.cpp')
-rw-r--r--src/ui/tools/tool-base.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 72ba499de..735f5bd42 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -15,7 +15,7 @@
*/
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include <config.h>
#endif
#include "widgets/desktop-widget.h"
@@ -24,12 +24,8 @@
#include "file.h"
#include "ui/tools/tool-base.h"
-#include <string.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
#include <glibmm/i18n.h>
-#include <cstring>
-#include <string>
#include "display/sp-canvas.h"
#include "xml/node-event-vector.h"
@@ -43,18 +39,14 @@
#include "ui/interface.h"
#include "macros.h"
#include "ui/tools-switch.h"
-#include "preferences.h"
#include "message-context.h"
#include "gradient-drag.h"
-#include "attributes.h"
#include "rubberband.h"
#include "selcue.h"
#include "ui/tools/lpe-tool.h"
#include "ui/tool/control-point.h"
#include "ui/shape-editor.h"
#include "sp-guide.h"
-#include "color.h"
-#include "knot.h"
#include "knot-ptr.h"
// globals for temporary switching to selector by space