diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-11-13 00:00:04 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-11-13 00:00:04 +0000 |
| commit | 152a0caf7e216e7ceafeed20822500c385e3e2df (patch) | |
| tree | a3b5d60e08f3bd8221ba2e50eea80b087e5d541a /src/ui/tools/node-tool.h | |
| parent | Update to trunk (diff) | |
| parent | fix C++11 compilation. There A LOT of const_casts in this file... :-( (diff) | |
| download | inkscape-152a0caf7e216e7ceafeed20822500c385e3e2df.tar.gz inkscape-152a0caf7e216e7ceafeed20822500c385e3e2df.zip | |
Update to trunk
(bzr r12588.1.26)
Diffstat (limited to '')
| -rw-r--r-- | src/ui/tools/node-tool.h (renamed from src/ui/tool/node-tool.h) | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/ui/tool/node-tool.h b/src/ui/tools/node-tool.h index c41f50650..4d15ab70e 100644 --- a/src/ui/tool/node-tool.h +++ b/src/ui/tools/node-tool.h @@ -13,7 +13,7 @@ #include <boost/ptr_container/ptr_map.hpp> #include <glib.h> -#include "event-context.h" +#include "ui/tools/tool-base.h" namespace Inkscape { namespace Display { @@ -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 /* |