[snapping] fix default advanced mode values for added layers (#3513)

nirvn · wonder-sk · commit e863c6fa65b8 · 2016-09-21T08:56:42.000+08:00
diff --git a/src/app/qgssnappingdialog.cpp b/src/app/qgssnappingdialog.cpp
@@ -310,7 +310,7 @@ void QgsSnappingDialog::addLayer( QgsMapLayer *theMapLayer )
   bool myDockFlag = myQsettings.value( "/qgis/dockSnapping", false ).toBool();
   double defaultSnappingTolerance = myQsettings.value( "/qgis/digitizing/default_snapping_tolerance", 0 ).toDouble();
   int defaultSnappingUnit = myQsettings.value( "/qgis/digitizing/default_snapping_tolerance_unit", QgsTolerance::ProjectUnits ).toInt();
-  QString defaultSnappingString = myQsettings.value( "/qgis/digitizing/default_snap_mode", "to vertex" ).toString();
+  QString defaultSnappingString = myQsettings.value( "/qgis/digitizing/default_snap_mode", "off" ).toString();
 
   int defaultSnappingStringIdx = 0;
   if ( defaultSnappingString == "to vertex" )
diff --git a/src/core/qgstolerance.h b/src/core/qgstolerance.h
@@ -34,7 +34,7 @@ class CORE_EXPORT QgsTolerance
     enum UnitType
     {
       /** Layer unit value */
-      LayerUnits = 1,
+      LayerUnits,
       /** Pixels unit of tolerance*/
       Pixels,
       /** Map (project) units. Added in 2.8 */

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class CORE_EXPORT QgsTolerance`
`34`	`34`	`enum UnitType`
`35`	`35`	`{`
`36`	`36`	`/** Layer unit value */`
`37`		`- LayerUnits = 1,`
	`37`	`+ LayerUnits,`
`38`	`38`	`/** Pixels unit of tolerance*/`
`39`	`39`	`Pixels,`
`40`	`40`	`/** Map (project) units. Added in 2.8 */`