From ed4d7f8b668ebf280ef2a29badc6999c9c145ce0 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Tue, 12 Jun 2012 21:42:58 +0200
Subject: cppcheck

(bzr r11492)
---
 src/snap.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/snap.cpp')

diff --git a/src/snap.cpp b/src/snap.cpp
index e059bbe13..1ee55fcf8 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -46,6 +46,7 @@ SnapManager::SnapManager(SPNamedView const *v) :
     _rotation_center_source_items(NULL),
     _guide_to_ignore(NULL),
     _desktop(NULL),
+    _snapindicator(true),
     _unselected_nodes(NULL)
 {
 }
-- 
cgit v1.2.3


From d0d3e7f80dafc80e47c9a95bf31c14283010a2c2 Mon Sep 17 00:00:00 2001
From: Diederik van Lierop <mail@diedenrezi.nl>
Date: Sat, 8 Dec 2012 21:29:18 +0100
Subject: Selector tool: improve responsiveness for snapping a path's internal
 intersections (was unbearable already for paths having 20+ segments)

(bzr r11937)
---
 src/snap.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/snap.cpp')

diff --git a/src/snap.cpp b/src/snap.cpp
index 1ee55fcf8..695424194 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -77,9 +77,14 @@ SnapManager::SnapperList SnapManager::getGridSnappers() const
     return s;
 }
 
-bool SnapManager::someSnapperMightSnap() const
+bool SnapManager::someSnapperMightSnap(bool immediately) const
 {
-    if ( !snapprefs.getSnapEnabledGlobally() || snapprefs.getSnapPostponedGlobally() ) {
+    if ( !snapprefs.getSnapEnabledGlobally() ) {
+        return false;
+    }
+
+    // If we're asking if some snapper might snap RIGHT NOW (without the snap being postponed)...
+    if ( immediately && snapprefs.getSnapPostponedGlobally() ) {
         return false;
     }
 
-- 
cgit v1.2.3


From f6c82a02188953dcb6d2119123ffc0aaa8d35010 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Sat, 16 Mar 2013 20:42:47 +0100
Subject: cppcheck

(bzr r12217)
---
 src/snap.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/snap.cpp')

diff --git a/src/snap.cpp b/src/snap.cpp
index 695424194..15f24ef53 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -500,7 +500,6 @@ Inkscape::SnappedPoint SnapManager::_snapTransformed(
     /* The current best metric for the best transformation; lower is better, Geom::infinity()
     ** means that we haven't snapped anything.
     */
-    Geom::Point best_scale_metric(Geom::infinity(), Geom::infinity());
     Inkscape::SnappedPoint best_snapped_point;
     g_assert(best_snapped_point.getAlwaysSnap() == false); // Check initialization of snapped point
     g_assert(best_snapped_point.getAtIntersection() == false);
-- 
cgit v1.2.3


From c04e30df241a3ee039077425bab9b9c37abe2854 Mon Sep 17 00:00:00 2001
From: Markus Engel <markus.engel@tum.de>
Date: Sat, 9 Nov 2013 23:36:13 +0100
Subject: Moved and renamed some tool-related files.

(bzr r12785)
---
 src/snap.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/snap.cpp')

diff --git a/src/snap.cpp b/src/snap.cpp
index 15f24ef53..ecf799cdc 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -32,7 +32,7 @@
 #include "selection.h"
 #include "sp-guide.h"
 #include "preferences.h"
-#include "event-context.h"
+#include "ui/tools/tool-base.h"
 #include "util/mathfns.h"
 using std::vector;
 using Inkscape::Util::round_to_upper_multiple_plus;
-- 
cgit v1.2.3