summaryrefslogtreecommitdiffstats
path: root/src/snapper.h
diff options
context:
space:
mode:
authorDiederik van Lierop <mailat-signdiedenrezidotnl>2010-01-09 21:14:38 +0000
committerDiederik van Lierop <mailat-signdiedenrezidotnl>2010-01-09 21:14:38 +0000
commite8f4c644181a8a68e2c33e1783f77a400dc1a29f (patch)
tree38083930039a3507ff467c62cf2e588a229a061f /src/snapper.h
parentPatch by Alex Leone to fix crash with recursive masks from 190130, I also add... (diff)
downloadinkscape-e8f4c644181a8a68e2c33e1783f77a400dc1a29f.tar.gz
inkscape-e8f4c644181a8a68e2c33e1783f77a400dc1a29f.zip
Refactoring the snapping API (making it easier to maintain and understand for the devs)
(bzr r8960)
Diffstat (limited to 'src/snapper.h')
-rw-r--r--src/snapper.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/snapper.h b/src/snapper.h
index dcc0fbb81..dbbf7ebe9 100644
--- a/src/snapper.h
+++ b/src/snapper.h
@@ -20,6 +20,7 @@
#include "snapped-line.h"
#include "snapped-curve.h"
#include "snap-preferences.h"
+#include "snap-candidate.h"
struct SnappedConstraints {
std::list<Inkscape::SnappedPoint> points;
@@ -34,7 +35,6 @@ struct SPItem;
namespace Inkscape
{
-
/// Parent for classes that can snap points to something
class Snapper
{
@@ -59,12 +59,10 @@ public:
virtual void freeSnap(SnappedConstraints &/*sc*/,
SnapPreferences::PointType const &/*t*/,
- Geom::Point const &/*p*/,
- SnapSourceType const &/*source_type*/,
- long /*source_num*/,
+ Inkscape::SnapCandidatePoint const &/*p*/,
Geom::OptRect const &/*bbox_to_snap*/,
std::vector<SPItem const *> const */*it*/,
- std::vector<std::pair<Geom::Point, int> > */*unselected_nodes*/) const {};
+ std::vector<SnapCandidatePoint> */*unselected_nodes*/) const {};
class ConstraintLine
{
@@ -104,9 +102,7 @@ public:
virtual void constrainedSnap(SnappedConstraints &/*sc*/,
SnapPreferences::PointType const &/*t*/,
- Geom::Point const &/*p*/,
- SnapSourceType const &/*source_type*/,
- long /*source_num*/,
+ Inkscape::SnapCandidatePoint const &/*p*/,
Geom::OptRect const &/*bbox_to_snap*/,
ConstraintLine const &/*c*/,
std::vector<SPItem const *> const */*it*/) const {};