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/tools-switch.cpp | |
| 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 'src/tools-switch.cpp')
| -rw-r--r-- | src/tools-switch.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/tools-switch.cpp b/src/tools-switch.cpp index 5f54ad15a..fe9d32f43 100644 --- a/src/tools-switch.cpp +++ b/src/tools-switch.cpp @@ -25,36 +25,36 @@ #include <xml/repr.h> -#include "select-context.h" -#include "ui/tool/node-tool.h" -#include "tweak-context.h" -#include "spray-context.h" +#include "ui/tools/select-tool.h" +#include "ui/tools/node-tool.h" +#include "ui/tools/tweak-tool.h" +#include "ui/tools/spray-tool.h" #include "sp-path.h" -#include "rect-context.h" +#include "ui/tools/rect-tool.h" #include "sp-rect.h" -#include "box3d-context.h" +#include "ui/tools/box3d-tool.h" #include "box3d.h" -#include "arc-context.h" +#include "ui/tools/arc-tool.h" #include "sp-ellipse.h" -#include "star-context.h" +#include "ui/tools/tweak-tool.h" #include "sp-star.h" -#include "spiral-context.h" +#include "ui/tools/spiral-tool.h" #include "sp-spiral.h" -#include "dyna-draw-context.h" -#include "eraser-context.h" -#include "pen-context.h" -#include "pencil-context.h" -#include "lpe-tool-context.h" -#include "text-context.h" +#include "ui/tools/calligraphic-tool.h" +#include "ui/tools/eraser-tool.h" +#include "ui/tools/pen-tool.h" +#include "ui/tools/pencil-tool.h" +#include "ui/tools/lpe-tool.h" +#include "ui/tools/text-tool.h" #include "sp-text.h" #include "sp-flowtext.h" -#include "gradient-context.h" -#include "mesh-context.h" -#include "zoom-context.h" -#include "measure-context.h" -#include "dropper-context.h" -#include "connector-context.h" -#include "flood-context.h" +#include "ui/tools/gradient-tool.h" +#include "ui/tools/mesh-tool.h" +#include "ui/tools/zoom-tool.h" +#include "ui/tools/measure-tool.h" +#include "ui/tools/dropper-tool.h" +#include "ui/tools/connector-tool.h" +#include "ui/tools/flood-tool.h" #include "sp-offset.h" #include "message-context.h" @@ -169,7 +169,7 @@ void tools_switch_by_item(SPDesktop *dt, SPItem *item, Geom::Point const p) } else if (SP_IS_SPIRAL(item)) { tools_switch(dt, TOOLS_SHAPES_SPIRAL); } else if (SP_IS_PATH(item)) { - if (cc_item_is_connector(item)) { + if (Inkscape::UI::Tools::cc_item_is_connector(item)) { tools_switch(dt, TOOLS_CONNECTOR); } else { |