Update to trunk

(bzr r15017.1.35)

1 files changed, 8 insertions, 18 deletions

diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index 23aaf6bb1..2bd4fdea3 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -24,25 +24,19 @@
 #include "message-context.h"
 #include "selection.h"
 #include "ui/shape-editor.h" // temporary!
-#include "live_effects/effect.h"
-#include "display/curve.h"
 #include "snap.h"
 #include "sp-namedview.h"
 #include "sp-clippath.h"
 #include "sp-item-group.h"
 #include "sp-mask.h"
-#include "sp-object-group.h"
-#include "sp-path.h"
 #include "sp-text.h"
 #include "ui/control-manager.h"
 #include "ui/tools/node-tool.h"
 #include "ui/tool/control-point-selection.h"
 #include "ui/tool/event-utils.h"
-#include "ui/tool/manipulator.h"
 #include "ui/tool/multi-path-manipulator.h"
 #include "ui/tool/path-manipulator.h"
 #include "ui/tool/selector.h"
-#include "ui/tool/shape-record.h"
 
 #include "pixmaps/cursor-node.xpm"
 #include "pixmaps/cursor-node-d.xpm"
@@ -250,7 +244,6 @@ void NodeTool::setup() {
     this->flash_tempitem = NULL;
     this->flashed_item = NULL;
     this->_last_over = NULL;
-    this->helperpath_tmpitem = NULL;
 
     // read prefs before adding items to selection to prevent momentarily showing the outline
     sp_event_context_read(this, "show_handles");
@@ -311,7 +304,7 @@ void  NodeTool::update_helperpath () {
                 cc->reset();
             }
             if (!c->is_empty()) {
-                SPCanvasItem *helperpath = sp_canvas_bpath_new(this->desktop->getTempGroup(), c);
+                SPCanvasItem *helperpath = sp_canvas_bpath_new(this->desktop->getTempGroup(), c, true);
                 sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(helperpath), 0x0000ff9A, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
                 sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(helperpath), 0, SP_WIND_RULE_NONZERO);
                 sp_canvas_item_affine_absolute(helperpath, selection->singleItem()->i2dt_affine());
@@ -378,8 +371,8 @@ void gather_items(NodeTool *nt, SPItem *base, SPObject *obj, Inkscape::UI::Shape
         r.role = role;
         s.insert(r);
     } else if (role != SHAPE_ROLE_NORMAL && (SP_IS_GROUP(obj) || SP_IS_OBJECTGROUP(obj))) {
-        for (SPObject *c = obj->children; c; c = c->next) {
-            gather_items(nt, base, c, role, s);
+        for (auto& c: obj->children) {
+            gather_items(nt, base, &c, role, s);
         }
     } else if (SP_IS_ITEM(obj)) {
         SPItem *item = static_cast<SPItem*>(obj);
@@ -407,8 +400,8 @@ void NodeTool::selection_changed(Inkscape::Selection *sel) {
 
     std::set<ShapeRecord> shapes;
 
-    std::vector<SPItem*> items=sel->itemList();
-    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();++i){
+    auto items= sel->items();
+    for(auto i=items.begin();i!=items.end();++i){
         SPObject *obj = *i;
 
         if (SP_IS_ITEM(obj)) {
@@ -443,8 +436,9 @@ void NodeTool::selection_changed(Inkscape::Selection *sel) {
         }
     }
 
+    std::vector<SPItem *> vec(sel->items().begin(), sel->items().end());
     _previous_selection = _current_selection;
-    _current_selection = sel->itemList();
+    _current_selection = vec;
 
     this->_multipath->setItems(shapes);
     this->update_tip(NULL);
@@ -473,13 +467,10 @@ bool NodeTool::root_handler(GdkEvent* event) {
     if (this->_selected_nodes->event(this, event)) {
         return true;
     }
-
     switch (event->type)
     {
     case GDK_MOTION_NOTIFY: {
-        this->update_helperpath();
         combine_motion_events(desktop->canvas, event->motion, 0);
-        this->update_helperpath();
         SPItem *over_item = sp_event_context_find_item (desktop, event_point(event->button),
                 FALSE, TRUE);
 
@@ -532,7 +523,7 @@ bool NodeTool::root_handler(GdkEvent* event) {
             }
 
             c->transform(over_item->i2dt_affine());
-            SPCanvasItem *flash = sp_canvas_bpath_new(desktop->getTempGroup(), c);
+            SPCanvasItem *flash = sp_canvas_bpath_new(desktop->getTempGroup(), c, true);
 
             sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(flash),
                 //prefs->getInt("/tools/nodes/highlight_color", 0xff0000ff), 1.0,
@@ -634,7 +625,6 @@ bool NodeTool::root_handler(GdkEvent* event) {
 
 void NodeTool::update_tip(GdkEvent *event) {
     using namespace Inkscape::UI;
-
     if (event && (event->type == GDK_KEY_PRESS || event->type == GDK_KEY_RELEASE)) {
         unsigned new_state = state_after_event(event);