summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2013-11-10 02:08:46 +0000
committerJabiertxof <jtx@jtx.marker.es>2013-11-10 02:08:46 +0000
commitca1286aa677b5ff8d80fe274dfa3e759478570b3 (patch)
tree36c7edfa575cea3d3bddfc4b034f7a35a8374ade /src/ui/dialog
parentFixing bugs on update to trunk (diff)
parentRevert unintentional change. (diff)
downloadinkscape-ca1286aa677b5ff8d80fe274dfa3e759478570b3.tar.gz
inkscape-ca1286aa677b5ff8d80fe274dfa3e759478570b3.zip
Update to trunk
(bzr r11950.1.195)
Diffstat (limited to 'src/ui/dialog')
-rw-r--r--src/ui/dialog/align-and-distribute.cpp2
-rw-r--r--src/ui/dialog/dialog.cpp2
-rw-r--r--src/ui/dialog/guides.cpp2
-rw-r--r--src/ui/dialog/layer-properties.cpp2
-rw-r--r--src/ui/dialog/layers.cpp2
-rw-r--r--src/ui/dialog/spellcheck.cpp2
-rw-r--r--src/ui/dialog/xml-tree.cpp2
7 files changed, 7 insertions, 7 deletions
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 4a3852d5d..6b4aeebb9 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -40,7 +40,7 @@
#include "text-editing.h"
#include "tools-switch.h"
#include "ui/icon-names.h"
-#include "ui/tool/node-tool.h"
+#include "ui/tools/node-tool.h"
#include "ui/tool/multi-path-manipulator.h"
#include "util/glib-list-iterators.h"
#include "verbs.h"
diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index 7fc9c3889..3cc3f3d88 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -23,7 +23,7 @@
#include <gdk/gdkkeysyms.h>
#include "inkscape.h"
-#include "event-context.h"
+#include "ui/tools/tool-base.h"
#include "desktop.h"
#include "desktop-handles.h"
#include "modifier-fns.h"
diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp
index 5dfafa78d..e84f25733 100644
--- a/src/ui/dialog/guides.cpp
+++ b/src/ui/dialog/guides.cpp
@@ -25,7 +25,7 @@
#include "sp-guide.h"
#include "sp-namedview.h"
#include "desktop-handles.h"
-#include "event-context.h"
+#include "ui/tools/tool-base.h"
#include "widgets/desktop-widget.h"
#include <glibmm/i18n.h>
#include "dialogs/dialog-events.h"
diff --git a/src/ui/dialog/layer-properties.cpp b/src/ui/dialog/layer-properties.cpp
index c726f93af..f19828b1f 100644
--- a/src/ui/dialog/layer-properties.cpp
+++ b/src/ui/dialog/layer-properties.cpp
@@ -31,7 +31,7 @@
#include "selection-chemistry.h"
#include "ui/icon-names.h"
#include "ui/widget/imagetoggler.h"
-#include "event-context.h"
+#include "ui/tools/tool-base.h"
namespace Inkscape {
namespace UI {
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index ff9265c8d..12fdf6b7d 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -41,7 +41,7 @@
#include "widgets/icon.h"
#include "xml/repr.h"
#include "sp-root.h"
-#include "event-context.h"
+#include "ui/tools/tool-base.h"
#include "selection-chemistry.h"
//#define DUMP_LAYERS 1
diff --git a/src/ui/dialog/spellcheck.cpp b/src/ui/dialog/spellcheck.cpp
index 45106755c..00bd445bf 100644
--- a/src/ui/dialog/spellcheck.cpp
+++ b/src/ui/dialog/spellcheck.cpp
@@ -24,7 +24,7 @@
#include "desktop.h"
#include "desktop-handles.h"
#include "tools-switch.h"
-#include "text-context.h"
+#include "ui/tools/text-tool.h"
#include "interface.h"
#include "preferences.h"
#include "sp-text.h"
diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp
index dfddfb1d3..0e1e9f7a6 100644
--- a/src/ui/dialog/xml-tree.cpp
+++ b/src/ui/dialog/xml-tree.cpp
@@ -27,7 +27,7 @@
#include "dialogs/dialog-events.h"
#include "document.h"
#include "document-undo.h"
-#include "event-context.h"
+#include "ui/tools/tool-base.h"
#include "helper/window.h"
#include "inkscape.h"
#include "interface.h"