diff options
| author | Diederik van Lierop <mail@diedenrezi.nl> | 2008-04-11 08:03:13 +0000 |
|---|---|---|
| committer | dvlierop2 <dvlierop2@users.sourceforge.net> | 2008-04-11 08:03:13 +0000 |
| commit | b95db4b4d6c41793e804a235a869cb5107d35b22 (patch) | |
| tree | 82028b14024cfbb8a33353017ef6fcd90793ff47 /src/snapper.cpp | |
| parent | Cmake: Correct INKSCAPE_LIBDIR value in config.h.cmake, to correct compiling ... (diff) | |
| download | inkscape-b95db4b4d6c41793e804a235a869cb5107d35b22.tar.gz inkscape-b95db4b4d6c41793e804a235a869cb5107d35b22.zip | |
Refactor snapping mechanisms: in seltrans.cpp, a GSList was converted to a std::list in four different places. Now this is handled in only one place
(bzr r5407)
Diffstat (limited to 'src/snapper.cpp')
| -rw-r--r-- | src/snapper.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/snapper.cpp b/src/snapper.cpp index 31a96a871..803506e76 100644 --- a/src/snapper.cpp +++ b/src/snapper.cpp @@ -104,7 +104,7 @@ void Inkscape::Snapper::freeSnap(SnappedConstraints &sc, std::vector<NR::Point> &points_to_snap, SPItem const *it) const { - std::list<SPItem const *> lit; + std::vector<SPItem const *> lit; if (it) { lit.push_back(it); } @@ -128,7 +128,7 @@ void Inkscape::Snapper::freeSnap(SnappedConstraints &sc, NR::Point const &p, bool const &first_point, std::vector<NR::Point> &points_to_snap, - std::list<SPItem const *> const &it, + std::vector<SPItem const *> const &it, std::vector<NR::Point> *unselected_nodes) const { if (_snap_enabled == false || getSnapFrom(t) == false) { @@ -160,8 +160,10 @@ void Inkscape::Snapper::constrainedSnap(SnappedConstraints &sc, ConstraintLine const &c, SPItem const *it) const { - std::list<SPItem const *> lit; - lit.push_back(it); + std::vector<SPItem const *> lit; + if (it) { + lit.push_back(it); + } constrainedSnap(sc, t, p, first_point, points_to_snap, c, lit); } @@ -183,7 +185,7 @@ void Inkscape::Snapper::constrainedSnap(SnappedConstraints &sc, bool const &first_point, std::vector<NR::Point> &points_to_snap, ConstraintLine const &c, - std::list<SPItem const *> const &it) const + std::vector<SPItem const *> const &it) const { if (_snap_enabled == false || getSnapFrom(t) == false) { return; |