updated to latest trunk

(bzr r14876.2.4)

1 files changed, 2 insertions, 8 deletions

diff --git a/src/snap.cpp b/src/snap.cpp
index 7f0e8d9dc..c84da0491 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -19,10 +19,6 @@
 #include <2geom/transforms.h>
 
 #include "sp-namedview.h"
-#include "snap.h"
-#include "snap-enums.h"
-#include "snapped-line.h"
-#include "snapped-curve.h"
 #include "pure-transform.h"
 
 #include "display/canvas-grid.h"
@@ -30,9 +26,7 @@
 
 #include "inkscape.h"
 #include "desktop.h"
-#include "selection.h"
 #include "sp-guide.h"
-#include "preferences.h"
 #include "ui/tools/tool-base.h"
 #include "helper/mathfns.h"
 using std::vector;
@@ -708,8 +702,8 @@ void SnapManager::setupIgnoreSelection(SPDesktop const *desktop,
     _items_to_ignore.clear();
 
     Inkscape::Selection *sel = _desktop->selection;
-    std::vector<SPItem*> const 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) {
         _items_to_ignore.push_back(*i);
     }
 }