summaryrefslogtreecommitdiffstats
path: root/src/ui/tools/node-tool.cpp
diff options
context:
space:
mode:
authormc <>2015-02-18 01:02:37 +0000
committerMarc Jeanmougin <mc>2015-02-18 01:02:37 +0000
commit193b25a53c51a36fe9538e03203b0054c8cfc355 (patch)
treeb366fc322e28a2b8c2d2a46f9a3523b19fdb1a03 /src/ui/tools/node-tool.cpp
parentAt first, I was thinking "I just have to go to the selection file, and change... (diff)
downloadinkscape-193b25a53c51a36fe9538e03203b0054c8cfc355.tar.gz
inkscape-193b25a53c51a36fe9538e03203b0054c8cfc355.zip
Just...
some... more... lines... (bzr r13922.1.2)
Diffstat (limited to 'src/ui/tools/node-tool.cpp')
-rw-r--r--src/ui/tools/node-tool.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index caec901a6..46c978c84 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -420,10 +420,9 @@ void NodeTool::selection_changed(Inkscape::Selection *sel) {
std::set<ShapeRecord> shapes;
- GSList const *ilist = sel->itemList();
-
- for (GSList *i = const_cast<GSList*>(ilist); i; i = i->next) {
- SPObject *obj = static_cast<SPObject*>(i->data);
+ SelContainer items=sel->itemList();
+ for(SelContainer::const_iterator i=items.begin();i!=items.end();i++){
+ SPObject *obj = static_cast<SPObject*>(*i);
if (SP_IS_ITEM(obj)) {
gather_items(this, NULL, static_cast<SPItem*>(obj), SHAPE_ROLE_NORMAL, shapes);
@@ -668,9 +667,8 @@ void NodeTool::select_area(Geom::Rect const &sel, GdkEventButton *event) {
if (this->_multipath->empty()) {
// if multipath is empty, select rubberbanded items rather than nodes
Inkscape::Selection *selection = this->desktop->selection;
- GSList *items = this->desktop->getDocument()->getItemsInBox(this->desktop->dkey, sel);
+ SelContainer items = this->desktop->getDocument()->getItemsInBox(this->desktop->dkey, sel);
selection->setList(items);
- g_slist_free(items);
} else {
if (!held_shift(*event)) {
this->_selected_nodes->clear();