diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-03-02 01:09:08 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-03-02 01:09:08 +0000 |
| commit | dc53920a347f1ac1157d863f91a18f206d134fd5 (patch) | |
| tree | ff9765299345e61fc42590dc3f17c042895b438f /src/ui/tools/lpe-tool.cpp | |
| parent | update to trunk (diff) | |
| parent | Added some consts. Turned functions to member functions. (diff) | |
| download | inkscape-dc53920a347f1ac1157d863f91a18f206d134fd5.tar.gz inkscape-dc53920a347f1ac1157d863f91a18f206d134fd5.zip | |
Resolving conflicts, maybe broken
(bzr r11950.1.264)
Diffstat (limited to 'src/ui/tools/lpe-tool.cpp')
| -rw-r--r-- | src/ui/tools/lpe-tool.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/tools/lpe-tool.cpp b/src/ui/tools/lpe-tool.cpp index 6c41bb160..9ab6d7814 100644 --- a/src/ui/tools/lpe-tool.cpp +++ b/src/ui/tools/lpe-tool.cpp @@ -191,7 +191,7 @@ bool LpeTool::root_handler(GdkEvent* event) { bool ret = false; - if (sp_pen_context_has_waiting_LPE(this)) { + if (this->hasWaitingLPE()) { // quit when we are waiting for a LPE to be applied //ret = ((ToolBaseClass *) sp_lpetool_context_parent_class)->root_handler(event_context, event); return PenTool::root_handler(event); @@ -222,7 +222,7 @@ bool LpeTool::root_handler(GdkEvent* event) { //bool over_stroke = lc->shape_editor->is_over_stroke(Geom::Point(event->button.x, event->button.y), true); - sp_pen_context_wait_for_LPE_mouse_clicks(this, type, Inkscape::LivePathEffect::Effect::acceptsNumClicks(type)); + this->waitForLPEMouseClicks(type, Inkscape::LivePathEffect::Effect::acceptsNumClicks(type)); // we pass the mouse click on to pen tool as the first click which it should collect //ret = ((ToolBaseClass *) sp_lpetool_context_parent_class)->root_handler(event_context, event); |