diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-11-08 01:57:36 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-11-08 01:57:36 +0000 |
| commit | 3b2966fe4bce6752e47c9180828a628d027d2715 (patch) | |
| tree | e403f77747f8cebd523a48b3a7f7b4a3164254a6 /src/live_effects | |
| parent | Update to trunk (diff) | |
| parent | First step of moving tools into appropriate namespaces. (diff) | |
| download | inkscape-3b2966fe4bce6752e47c9180828a628d027d2715.tar.gz inkscape-3b2966fe4bce6752e47c9180828a628d027d2715.zip | |
Update to trunk
(bzr r11950.1.193)
Diffstat (limited to 'src/live_effects')
| -rw-r--r-- | src/live_effects/effect.cpp | 4 | ||||
| -rw-r--r-- | src/live_effects/lpe-line_segment.cpp | 2 | ||||
| -rw-r--r-- | src/live_effects/lpe-perp_bisector.h | 4 | ||||
| -rw-r--r-- | src/live_effects/parameter/path.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 1f1c8d2dd..e47b4c3e9 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -354,8 +354,8 @@ Effect::doAcceptPathPreparations(SPLPEItem *lpeitem) tools_switch(desktop, TOOLS_FREEHAND_PEN); } - SPEventContext *ec = desktop->event_context; - SPPenContext *pc = SP_PEN_CONTEXT(ec); + Inkscape::UI::Tools::ToolBase *ec = desktop->event_context; + Inkscape::UI::Tools::PenTool *pc = SP_PEN_CONTEXT(ec); pc->expecting_clicks_for_LPE = this->acceptsNumClicks(); pc->waiting_LPE = this; pc->waiting_item = lpeitem; diff --git a/src/live_effects/lpe-line_segment.cpp b/src/live_effects/lpe-line_segment.cpp index 2e7240e25..793b00bcc 100644 --- a/src/live_effects/lpe-line_segment.cpp +++ b/src/live_effects/lpe-line_segment.cpp @@ -45,7 +45,7 @@ LPELineSegment::~LPELineSegment() void LPELineSegment::doBeforeEffect (SPLPEItem const* lpeitem) { - lpetool_get_limiting_bbox_corners(lpeitem->document, bboxA, bboxB); + Inkscape::UI::Tools::lpetool_get_limiting_bbox_corners(lpeitem->document, bboxA, bboxB); } std::vector<Geom::Path> diff --git a/src/live_effects/lpe-perp_bisector.h b/src/live_effects/lpe-perp_bisector.h index 4ff9909a4..3a2278de3 100644 --- a/src/live_effects/lpe-perp_bisector.h +++ b/src/live_effects/lpe-perp_bisector.h @@ -27,7 +27,7 @@ namespace PB { class KnotHolderEntityEnd; class KnotHolderEntityLeftEnd; class KnotHolderEntityRightEnd; - void bisector_end_set(SPItem *item, Geom::Point const &p, guint state, bool left); + void bisector_end_set(SPItem *item, Geom::Point const &p, guint state, bool left = true); } class LPEPerpBisector : public Effect { @@ -46,7 +46,7 @@ public: friend class PB::KnotHolderEntityEnd; friend class PB::KnotHolderEntityLeftEnd; friend class PB::KnotHolderEntityRightEnd; - friend void PB::bisector_end_set(SPItem *item, Geom::Point const &p, guint state, bool left = true); + friend void PB::bisector_end_set(SPItem *item, Geom::Point const &p, guint state, bool left); void addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item); private: diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp index e5648dc68..6e951f6ea 100644 --- a/src/live_effects/parameter/path.cpp +++ b/src/live_effects/parameter/path.cpp @@ -208,7 +208,7 @@ PathParam::param_editOncanvas(SPItem *item, SPDesktop * dt) tools_switch(dt, TOOLS_NODES); } - InkNodeTool *nt = static_cast<InkNodeTool*>(dt->event_context); + Inkscape::UI::Tools::NodeTool *nt = static_cast<Inkscape::UI::Tools::NodeTool*>(dt->event_context); std::set<ShapeRecord> shapes; ShapeRecord r; |