summaryrefslogtreecommitdiffstats
path: root/src/snap.h
diff options
context:
space:
mode:
authorDiederik van Lierop <mail@diedenrezi.nl>2008-08-28 19:32:55 +0000
committerdvlierop2 <dvlierop2@users.sourceforge.net>2008-08-28 19:32:55 +0000
commite2a6ff85eaa5a4411ac70c642f78f4791d9d9d46 (patch)
tree2740560017f69a77edaf5ace7ad0705c9dc1b5df /src/snap.h
parentnull check fixes patch from bug 261475 (diff)
downloadinkscape-e2a6ff85eaa5a4411ac70c642f78f4791d9d9d46.tar.gz
inkscape-e2a6ff85eaa5a4411ac70c642f78f4791d9d9d46.zip
Modify the parameters required for setting up the SnapManager
(bzr r6722)
Diffstat (limited to 'src/snap.h')
-rw-r--r--src/snap.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/snap.h b/src/snap.h
index e4f9aaddf..02cee70ca 100644
--- a/src/snap.h
+++ b/src/snap.h
@@ -47,8 +47,8 @@ public:
bool SomeSnapperMightSnap() const;
- void setup(SPDesktop const *desktop_for_snapindicator = NULL, SPItem const *item_to_ignore = NULL, std::vector<Geom::Point> *unselected_nodes = NULL);
- void setup(SPDesktop const *desktop_for_snapindicator, std::vector<SPItem const *> &items_to_ignore, std::vector<Geom::Point> *unselected_nodes = NULL);
+ void setup(SPDesktop const *desktop, bool snapindicator = true, SPItem const *item_to_ignore = NULL, std::vector<Geom::Point> *unselected_nodes = NULL);
+ void setup(SPDesktop const *desktop, bool snapindicator, std::vector<SPItem const *> &items_to_ignore, std::vector<Geom::Point> *unselected_nodes = NULL);
// freeSnapReturnByRef() is preferred over freeSnap(), because it only returns a
// point if snapping has occured (by overwriting p); otherwise p is untouched
@@ -172,7 +172,8 @@ private:
std::vector<SPItem const *> *_items_to_ignore;
SPItem const *_item_to_ignore;
- SPDesktop const *_desktop_for_snapindicator;
+ SPDesktop const *_desktop;
+ bool _snapindicator;
std::vector<Geom::Point> *_unselected_nodes;
Inkscape::SnappedPoint _snapTransformed(Inkscape::Snapper::PointType type,