Cleanup some offset tool code

nyalldawson · nyalldawson · commit dacced8cb312 · 2017-11-28T10:11:02.000+10:00
diff --git a/src/app/qgsmaptooloffsetcurve.cpp b/src/app/qgsmaptooloffsetcurve.cpp
@@ -33,10 +33,6 @@
 
 QgsMapToolOffsetCurve::QgsMapToolOffsetCurve( QgsMapCanvas *canvas )
   : QgsMapToolEdit( canvas )
-  , mModifiedFeature( -1 )
-  , mGeometryModified( false )
-  , mForceCopy( false )
-  , mMultiPartGeometry( false )
 {
 }
 
@@ -76,11 +72,6 @@ void QgsMapToolOffsetCurve::canvasReleaseEvent( QgsMapMouseEvent *e )
     mGeometryModified = false;
     mForceCopy = false;
 
-    if ( e->button() == Qt::RightButton )
-    {
-      return;
-    }
-
     QgsSnappingUtils *snapping = mCanvas->snappingUtils();
 
     // store previous settings
@@ -122,10 +113,11 @@ void QgsMapToolOffsetCurve::canvasReleaseEvent( QgsMapMouseEvent *e )
     {
       emit messageEmitted( tr( "Could not find a nearby feature in any vector layer." ) );
     }
-    return;
   }
-
-  applyOffset();
+  else
+  {
+    applyOffset();
+  }
 }
 
 void QgsMapToolOffsetCurve::applyOffset()

Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,6 @@`
`33`	`33`
`34`	`34`	`QgsMapToolOffsetCurve::QgsMapToolOffsetCurve( QgsMapCanvas *canvas )`
`35`	`35`	`: QgsMapToolEdit( canvas )`
`36`		`- , mModifiedFeature( -1 )`
`37`		`- , mGeometryModified( false )`
`38`		`- , mForceCopy( false )`
`39`		`- , mMultiPartGeometry( false )`
`40`	`36`	`{`
`41`	`37`	`}`
`42`	`38`
`@@ -76,11 +72,6 @@ void QgsMapToolOffsetCurve::canvasReleaseEvent( QgsMapMouseEvent *e )`
`76`	`72`	`mGeometryModified = false;`
`77`	`73`	`mForceCopy = false;`
`78`	`74`
`79`		`- if ( e->button() == Qt::RightButton )`
`80`		`- {`
`81`		`- return;`
`82`		`- }`
`83`		`-`
`84`	`75`	`QgsSnappingUtils *snapping = mCanvas->snappingUtils();`
`85`	`76`
`86`	`77`	`// store previous settings`
`@@ -122,10 +113,11 @@ void QgsMapToolOffsetCurve::canvasReleaseEvent( QgsMapMouseEvent *e )`
`122`	`113`	`{`
`123`	`114`	`emit messageEmitted( tr( "Could not find a nearby feature in any vector layer." ) );`
`124`	`115`	`}`
`125`		`- return;`
`126`	`116`	`}`
`127`		`-`
`128`		`- applyOffset();`
	`117`	`+ else`
	`118`	`+ {`
	`119`	`+ applyOffset();`
	`120`	`+ }`
`129`	`121`	`}`
`130`	`122`
`131`	`123`	`void QgsMapToolOffsetCurve::applyOffset()`