From e2a6ff85eaa5a4411ac70c642f78f4791d9d9d46 Mon Sep 17 00:00:00 2001 From: Diederik van Lierop Date: Thu, 28 Aug 2008 19:32:55 +0000 Subject: Modify the parameters required for setting up the SnapManager (bzr r6722) --- src/snap.cpp | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'src/snap.cpp') diff --git a/src/snap.cpp b/src/snap.cpp index 9ae330b77..15bc8658d 100644 --- a/src/snap.cpp +++ b/src/snap.cpp @@ -871,11 +871,11 @@ Inkscape::SnappedPoint SnapManager::findBestSnap(Geom::Point const &p, SnappedCo // Update the snap indicator, if requested - if (_desktop_for_snapindicator) { + if (_snapindicator) { if (bestSnappedPoint.getSnapped()) { - _desktop_for_snapindicator->snapindicator->set_new_snappoint(bestSnappedPoint); + _desktop->snapindicator->set_new_snappoint(bestSnappedPoint); } else { - _desktop_for_snapindicator->snapindicator->remove_snappoint(); + _desktop->snapindicator->remove_snappoint(); } } @@ -883,19 +883,23 @@ Inkscape::SnappedPoint SnapManager::findBestSnap(Geom::Point const &p, SnappedCo return bestSnappedPoint; } -void SnapManager::setup(SPDesktop const *desktop_for_snapindicator, SPItem const *item_to_ignore, std::vector *unselected_nodes) +void SnapManager::setup(SPDesktop const *desktop, bool snapindicator, SPItem const *item_to_ignore, std::vector *unselected_nodes) { - _item_to_ignore = item_to_ignore; + g_assert(desktop != NULL); + _item_to_ignore = item_to_ignore; _items_to_ignore = NULL; - _desktop_for_snapindicator = desktop_for_snapindicator; + _desktop = desktop; + _snapindicator = snapindicator; _unselected_nodes = unselected_nodes; } -void SnapManager::setup(SPDesktop const *desktop_for_snapindicator, std::vector &items_to_ignore, std::vector *unselected_nodes) +void SnapManager::setup(SPDesktop const *desktop, bool snapindicator, std::vector &items_to_ignore, std::vector *unselected_nodes) { - _item_to_ignore = NULL; + g_assert(desktop != NULL); + _item_to_ignore = NULL; _items_to_ignore = &items_to_ignore; - _desktop_for_snapindicator = desktop_for_snapindicator; + _desktop = desktop; + _snapindicator = snapindicator; _unselected_nodes = unselected_nodes; } -- cgit v1.2.3