1 files changed, 7 insertions, 8 deletions
diff --git a/src/ui/tools/tool-base.h b/src/ui/tools/tool-base.h
index 69533e417..09a9db660 100644
--- a/src/ui/tools/tool-base.h
+++ b/src/ui/tools/tool-base.h
@@ -14,12 +14,12 @@
 
 #include <stddef.h>
 #include <string>
-
+#include "knot.h"
+#include "knotholder.h"
 #include <2geom/point.h>
 #include <gdk/gdk.h>
 #include <glib-object.h>
 #include <sigc++/trackable.h>
-#include "knot.h"
 
 #include "preferences.h"
 
@@ -30,7 +30,7 @@ namespace Glib {
 class GrDrag;
 class SPDesktop;
 class SPItem;
-
+class KnotHolder;
 namespace Inkscape {
     class MessageContext;
     class SelCue;
@@ -42,6 +42,7 @@ namespace Inkscape {
 namespace Inkscape {
 namespace UI {
 
+
 class ShapeEditor;
 
 namespace Tools {
@@ -144,7 +145,7 @@ public:
     void enableGrDrag (bool enable=true);
     bool deleteSelectedDrag(bool just_one);
 
-    ToolBase(gchar const *const *cursor_shape, gint hot_x, gint hot_y, bool uses_snap = true);
+    ToolBase(gchar const *const *cursor_shape, bool uses_snap=true);
 
     virtual ~ToolBase();
 
@@ -219,20 +220,18 @@ public:
 
 	SPDesktop *desktop;
     bool _uses_snap; // TODO: make protected or private
-
 protected:
 	/// An xpm containing the shape of the tool's cursor.
     gchar const *const *cursor_shape;
 
-    /// The cursor's hot spot
-    gint hot_x, hot_y;
-
     bool sp_event_context_knot_mouseover() const;
 
 private:
 	ToolBase(const ToolBase&);
 	ToolBase& operator=(const ToolBase&);
+        bool _keyboardMove(GdkEventKey const &event, Geom::Point const &dir);
 
+        
 	void sp_event_context_set_cursor(GdkCursorType cursor_type);
 
 };