1 files changed, 13 insertions, 5 deletions
diff --git a/src/ui/tool/node-tool.h b/src/ui/tool/node-tool.h
index c41f50650..a670256bb 100644
--- a/src/ui/tool/node-tool.h
+++ b/src/ui/tool/node-tool.h
@@ -30,13 +30,17 @@ namespace Inkscape {
 	}
 }
 
-#define INK_NODE_TOOL(obj) (dynamic_cast<InkNodeTool*>((SPEventContext*)obj))
-#define INK_IS_NODE_TOOL(obj) (dynamic_cast<const InkNodeTool*>((const SPEventContext*)obj))
+#define INK_NODE_TOOL(obj) (dynamic_cast<Inkscape::UI::Tools::NodeTool*>((Inkscape::UI::Tools::ToolBase*)obj))
+#define INK_IS_NODE_TOOL(obj) (dynamic_cast<const Inkscape::UI::Tools::NodeTool*>((const Inkscape::UI::Tools::ToolBase*)obj))
 
-class InkNodeTool : public SPEventContext {
+namespace Inkscape {
+namespace UI {
+namespace Tools {
+
+class NodeTool : public ToolBase {
 public:
-	InkNodeTool();
-	virtual ~InkNodeTool();
+	NodeTool();
+	virtual ~NodeTool();
 
 	Inkscape::UI::ControlPointSelection* _selected_nodes;
     Inkscape::UI::MultiPathManipulator* _multipath;
@@ -83,6 +87,10 @@ private:
 	void handleControlUiStyleChange();
 };
 
+}
+}
+}
+
 #endif
 
 /*