layerType -> mLayerType

lbartoletti · nyalldawson · commit ad94cce3b848 · 2018-09-25T18:13:50.000+10:00
diff --git a/src/app/qgsmaptooladdcircle.cpp b/src/app/qgsmaptooladdcircle.cpp
@@ -113,5 +113,5 @@ void QgsMapToolAddCircle::clean()
 
   QgsVectorLayer *vLayer = static_cast<QgsVectorLayer *>( QgisApp::instance()->activeLayer() );
   if ( vLayer )
-    layerType = vLayer->geometryType();
+    mLayerType = vLayer->geometryType();
 }
diff --git a/src/app/qgsmaptooladdcircle.h b/src/app/qgsmaptooladdcircle.h
@@ -56,8 +56,8 @@ class APP_EXPORT QgsMapToolAddCircle: public QgsMapToolCapture
     QgsGeometryRubberBand *mTempRubberBand = nullptr;
     //! Circle
     QgsCircle mCircle;
-    //! Layertype which will be used for rubberband
-    QgsWkbTypes::GeometryType layerType = QgsWkbTypes::LineGeometry;
+    //! Layer type which will be used for rubberband
+    QgsWkbTypes::GeometryType mLayerType = QgsWkbTypes::LineGeometry;
 
 };
 
diff --git a/src/app/qgsmaptooladdcircularstring.cpp b/src/app/qgsmaptooladdcircularstring.cpp
@@ -109,7 +109,7 @@ void QgsMapToolAddCircularString::activate()
 
   QgsVectorLayer *vLayer = static_cast<QgsVectorLayer *>( QgisApp::instance()->activeLayer() );
   if ( vLayer )
-    layerType = vLayer->geometryType();
+    mLayerType = vLayer->geometryType();
   if ( mParentTool )
   {
     mParentTool->deleteTempRubberBand();
@@ -128,7 +128,7 @@ void QgsMapToolAddCircularString::activate()
           mPoints.append( QgsPoint( mapPoint ) );
           if ( !mTempRubberBand )
           {
-            mTempRubberBand = createGeometryRubberBand( layerType, true );
+            mTempRubberBand = createGeometryRubberBand( mLayerType, true );
             mTempRubberBand->show();
           }
           QgsCircularString *c = new QgsCircularString();
diff --git a/src/app/qgsmaptooladdcircularstring.h b/src/app/qgsmaptooladdcircularstring.h
@@ -59,8 +59,8 @@ class APP_EXPORT QgsMapToolAddCircularString: public QgsMapToolCapture
     void createCenterPointRubberBand();
     void updateCenterPointRubberBand( const QgsPoint &pt );
     void removeCenterPointRubberBand();
-    //! Layertype which will be used for rubberband
-    QgsWkbTypes::GeometryType layerType = QgsWkbTypes::LineGeometry;
+    //! Layer type which will be used for rubberband
+    QgsWkbTypes::GeometryType mLayerType = QgsWkbTypes::LineGeometry;
 };
 
 #endif // QGSMAPTOOLADDCIRCULARSTRING_H
diff --git a/src/app/qgsmaptooladdellipse.cpp b/src/app/qgsmaptooladdellipse.cpp
@@ -113,5 +113,5 @@ void QgsMapToolAddEllipse::clean()
 
   QgsVectorLayer *vLayer = static_cast<QgsVectorLayer *>( QgisApp::instance()->activeLayer() );
   if ( vLayer )
-    layerType = vLayer->geometryType();
+    mLayerType = vLayer->geometryType();
 }
diff --git a/src/app/qgsmaptooladdellipse.h b/src/app/qgsmaptooladdellipse.h
@@ -54,8 +54,8 @@ class APP_EXPORT QgsMapToolAddEllipse: public QgsMapToolCapture
     QgsEllipse mEllipse;
     //! convenient method to return the number of segments
     unsigned int segments( ) { return QgsSettings().value( QStringLiteral( "/qgis/digitizing/offset_quad_seg" ), 8 ).toInt() * 12; }
-    //! Layertype which will be used for rubberband
-    QgsWkbTypes::GeometryType layerType = QgsWkbTypes::LineGeometry;
+    //! Layer type which will be used for rubberband
+    QgsWkbTypes::GeometryType mLayerType = QgsWkbTypes::LineGeometry;
 
 };
 
diff --git a/src/app/qgsmaptooladdrectangle.cpp b/src/app/qgsmaptooladdrectangle.cpp
@@ -186,5 +186,5 @@ void QgsMapToolAddRectangle::clean()
 
   QgsVectorLayer *vLayer = static_cast<QgsVectorLayer *>( QgisApp::instance()->activeLayer() );
   if ( vLayer )
-    layerType = vLayer->geometryType();
+    mLayerType = vLayer->geometryType();
 }
diff --git a/src/app/qgsmaptooladdrectangle.h b/src/app/qgsmaptooladdrectangle.h
@@ -77,8 +77,8 @@ class APP_EXPORT QgsMapToolAddRectangle: public QgsMapToolCapture
     //! Returns the side. \see mSide
     int side( ) const { return mSide; }
 
-    //! Layertype which will be used for rubberband
-    QgsWkbTypes::GeometryType layerType = QgsWkbTypes::LineGeometry;
+    //! Layer type which will be used for rubberband
+    QgsWkbTypes::GeometryType mLayerType = QgsWkbTypes::LineGeometry;
 
   private:
     //! Convenient member for the azimuth of the rotated rectangle or when map is rotated.
diff --git a/src/app/qgsmaptooladdregularpolygon.cpp b/src/app/qgsmaptooladdregularpolygon.cpp
@@ -138,5 +138,5 @@ void QgsMapToolAddRegularPolygon::clean()
 
   QgsVectorLayer *vLayer = static_cast<QgsVectorLayer *>( QgisApp::instance()->activeLayer() );
   if ( vLayer )
-    layerType = vLayer->geometryType();
+    mLayerType = vLayer->geometryType();
 }
diff --git a/src/app/qgsmaptooladdregularpolygon.h b/src/app/qgsmaptooladdregularpolygon.h
@@ -62,8 +62,8 @@ class APP_EXPORT QgsMapToolAddRegularPolygon: public QgsMapToolCapture
     //! Regular shape as a regular polygon
     QgsRegularPolygon mRegularPolygon;
 
-    //! Layertype which will be used for rubberband
-    QgsWkbTypes::GeometryType layerType = QgsWkbTypes::LineGeometry;
+    //! Layer type which will be used for rubberband
+    QgsWkbTypes::GeometryType mLayerType = QgsWkbTypes::LineGeometry;
 
 };
 
diff --git a/src/app/qgsmaptoolcircle2points.cpp b/src/app/qgsmaptoolcircle2points.cpp
@@ -36,7 +36,7 @@ void QgsMapToolCircle2Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
 
     if ( !mPoints.isEmpty() && !mTempRubberBand )
     {
-      mTempRubberBand = createGeometryRubberBand( layerType, true );
+      mTempRubberBand = createGeometryRubberBand( mLayerType, true );
       mTempRubberBand->show();
     }
   }
diff --git a/src/app/qgsmaptoolcircle2tangentspoint.cpp b/src/app/qgsmaptoolcircle2tangentspoint.cpp
@@ -108,7 +108,7 @@ void QgsMapToolCircle2TangentsPoint::cadCanvasMoveEvent( QgsMapMouseEvent *e )
   {
     if ( !mTempRubberBand )
     {
-      mTempRubberBand = createGeometryRubberBand( layerType, true );
+      mTempRubberBand = createGeometryRubberBand( mLayerType, true );
       mTempRubberBand->show();
     }
     else
diff --git a/src/app/qgsmaptoolcircle3points.cpp b/src/app/qgsmaptoolcircle3points.cpp
@@ -37,7 +37,7 @@ void QgsMapToolCircle3Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
       mPoints.append( point );
     if ( !mPoints.isEmpty() && !mTempRubberBand )
     {
-      mTempRubberBand = createGeometryRubberBand( layerType, true );
+      mTempRubberBand = createGeometryRubberBand( mLayerType, true );
       mTempRubberBand->show();
     }
   }
diff --git a/src/app/qgsmaptoolcircle3tangents.cpp b/src/app/qgsmaptoolcircle3tangents.cpp
@@ -79,7 +79,7 @@ void QgsMapToolCircle3Tangents::cadCanvasMoveEvent( QgsMapMouseEvent *e )
 
   if ( !mTempRubberBand )
   {
-    mTempRubberBand = createGeometryRubberBand( layerType, true );
+    mTempRubberBand = createGeometryRubberBand( mLayerType, true );
     mTempRubberBand->show();
   }
   else
diff --git a/src/app/qgsmaptoolcirclecenterpoint.cpp b/src/app/qgsmaptoolcirclecenterpoint.cpp
@@ -37,7 +37,7 @@ void QgsMapToolCircleCenterPoint::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
 
     if ( !mPoints.isEmpty() && !mTempRubberBand )
     {
-      mTempRubberBand = createGeometryRubberBand( layerType, true );
+      mTempRubberBand = createGeometryRubberBand( mLayerType, true );
       mTempRubberBand->show();
     }
 
diff --git a/src/app/qgsmaptoolcircularstringcurvepoint.cpp b/src/app/qgsmaptoolcircularstringcurvepoint.cpp
@@ -43,7 +43,7 @@ void QgsMapToolCircularStringCurvePoint::cadCanvasReleaseEvent( QgsMapMouseEvent
     {
       if ( !mTempRubberBand )
       {
-        mTempRubberBand = createGeometryRubberBand( layerType, true );
+        mTempRubberBand = createGeometryRubberBand( mLayerType, true );
         mTempRubberBand->show();
       }
 
@@ -57,7 +57,7 @@ void QgsMapToolCircularStringCurvePoint::cadCanvasReleaseEvent( QgsMapMouseEvent
     {
       if ( !mRubberBand )
       {
-        mRubberBand = createGeometryRubberBand( layerType );
+        mRubberBand = createGeometryRubberBand( mLayerType );
         mRubberBand->show();
       }
 
diff --git a/src/app/qgsmaptoolcircularstringradius.cpp b/src/app/qgsmaptoolcircularstringradius.cpp
@@ -110,7 +110,7 @@ void QgsMapToolCircularStringRadius::recalculateRubberBand()
     int rubberBandSize = mPoints.size() - ( mPoints.size() + 1 ) % 2;
     cString->setPoints( mPoints.mid( 0, rubberBandSize ) );
     delete mRubberBand;
-    mRubberBand = createGeometryRubberBand( layerType );
+    mRubberBand = createGeometryRubberBand( mLayerType );
     mRubberBand->setGeometry( cString );
     mRubberBand->show();
   }
@@ -141,7 +141,7 @@ void QgsMapToolCircularStringRadius::recalculateTempRubberBand( const QgsPointXY
   QgsCircularString *cString = new QgsCircularString();
   cString->setPoints( rubberBandPoints );
   delete mTempRubberBand;
-  mTempRubberBand = createGeometryRubberBand( layerType, true );
+  mTempRubberBand = createGeometryRubberBand( mLayerType, true );
   mTempRubberBand->setGeometry( cString );
   mTempRubberBand->show();
 }
diff --git a/src/app/qgsmaptoolellipsecenter2points.cpp b/src/app/qgsmaptoolellipsecenter2points.cpp
@@ -40,7 +40,7 @@ void QgsMapToolEllipseCenter2Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e
 
     if ( !mPoints.isEmpty() && !mTempRubberBand )
     {
-      mTempRubberBand = createGeometryRubberBand( layerType, true );
+      mTempRubberBand = createGeometryRubberBand( mLayerType, true );
       mTempRubberBand->show();
     }
   }
diff --git a/src/app/qgsmaptoolellipsecenterpoint.cpp b/src/app/qgsmaptoolellipsecenterpoint.cpp
@@ -36,7 +36,7 @@ void QgsMapToolEllipseCenterPoint::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
 
     if ( !mPoints.isEmpty() && !mTempRubberBand )
     {
-      mTempRubberBand = createGeometryRubberBand( layerType, true );
+      mTempRubberBand = createGeometryRubberBand( mLayerType, true );
       mTempRubberBand->show();
     }
   }
diff --git a/src/app/qgsmaptoolellipseextent.cpp b/src/app/qgsmaptoolellipseextent.cpp
@@ -38,7 +38,7 @@ void QgsMapToolEllipseExtent::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
 
     if ( !mPoints.isEmpty() && !mTempRubberBand )
     {
-      mTempRubberBand = createGeometryRubberBand( layerType, true );
+      mTempRubberBand = createGeometryRubberBand( mLayerType, true );
       mTempRubberBand->show();
     }
   }
diff --git a/src/app/qgsmaptoolellipsefoci.cpp b/src/app/qgsmaptoolellipsefoci.cpp
@@ -38,7 +38,7 @@ void QgsMapToolEllipseFoci::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
 
     if ( !mPoints.isEmpty() && !mTempRubberBand )
     {
-      mTempRubberBand = createGeometryRubberBand( layerType, true );
+      mTempRubberBand = createGeometryRubberBand( mLayerType, true );
       mTempRubberBand->show();
     }
   }
diff --git a/src/app/qgsmaptoolrectangle3points.cpp b/src/app/qgsmaptoolrectangle3points.cpp
@@ -40,7 +40,7 @@ void QgsMapToolRectangle3Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
 
     if ( !mPoints.isEmpty() && !mTempRubberBand )
     {
-      mTempRubberBand = createGeometryRubberBand( layerType, true );
+      mTempRubberBand = createGeometryRubberBand( mLayerType, true );
       mTempRubberBand->show();
     }
   }
diff --git a/src/app/qgsmaptoolrectanglecenter.cpp b/src/app/qgsmaptoolrectanglecenter.cpp
@@ -39,7 +39,7 @@ void QgsMapToolRectangleCenter::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
 
     if ( !mPoints.isEmpty() && !mTempRubberBand )
     {
-      mTempRubberBand = createGeometryRubberBand( layerType, true );
+      mTempRubberBand = createGeometryRubberBand( mLayerType, true );
       mTempRubberBand->show();
     }
   }
diff --git a/src/app/qgsmaptoolrectangleextent.cpp b/src/app/qgsmaptoolrectangleextent.cpp
@@ -39,7 +39,7 @@ void QgsMapToolRectangleExtent::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
 
     if ( !mPoints.isEmpty() && !mTempRubberBand )
     {
-      mTempRubberBand = createGeometryRubberBand( layerType, true );
+      mTempRubberBand = createGeometryRubberBand( mLayerType, true );
       mTempRubberBand->show();
     }
   }
diff --git a/src/app/qgsmaptoolregularpolygon2points.cpp b/src/app/qgsmaptoolregularpolygon2points.cpp
@@ -46,7 +46,7 @@ void QgsMapToolRegularPolygon2Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e
     {
       if ( !mTempRubberBand )
       {
-        mTempRubberBand = createGeometryRubberBand( layerType, true );
+        mTempRubberBand = createGeometryRubberBand( mLayerType, true );
         mTempRubberBand->show();
 
         createNumberSidesSpinBox();
diff --git a/src/app/qgsmaptoolregularpolygoncentercorner.cpp b/src/app/qgsmaptoolregularpolygoncentercorner.cpp
@@ -43,7 +43,7 @@ void QgsMapToolRegularPolygonCenterCorner::cadCanvasReleaseEvent( QgsMapMouseEve
     {
       if ( !mTempRubberBand )
       {
-        mTempRubberBand = createGeometryRubberBand( layerType, true );
+        mTempRubberBand = createGeometryRubberBand( mLayerType, true );
         mTempRubberBand->show();
 
         createNumberSidesSpinBox();
diff --git a/src/app/qgsmaptoolregularpolygoncenterpoint.cpp b/src/app/qgsmaptoolregularpolygoncenterpoint.cpp
@@ -43,7 +43,7 @@ void QgsMapToolRegularPolygonCenterPoint::cadCanvasReleaseEvent( QgsMapMouseEven
     {
       if ( !mTempRubberBand )
       {
-        mTempRubberBand = createGeometryRubberBand( layerType, true );
+        mTempRubberBand = createGeometryRubberBand( mLayerType, true );
         mTempRubberBand->show();
 
         createNumberSidesSpinBox();

Original file line number	Diff line number	Diff line change
`@@ -113,5 +113,5 @@ void QgsMapToolAddCircle::clean()`
`113`	`113`
`114`	`114`	`QgsVectorLayer vLayer = static_cast<QgsVectorLayer >( QgisApp::instance()->activeLayer() );`
`115`	`115`	`if ( vLayer )`
`116`		`- layerType = vLayer->geometryType();`
	`116`	`+ mLayerType = vLayer->geometryType();`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ void QgsMapToolAddCircularString::activate()`
`109`	`109`
`110`	`110`	`QgsVectorLayer vLayer = static_cast<QgsVectorLayer >( QgisApp::instance()->activeLayer() );`
`111`	`111`	`if ( vLayer )`
`112`		`- layerType = vLayer->geometryType();`
	`112`	`+ mLayerType = vLayer->geometryType();`
`113`	`113`	`if ( mParentTool )`
`114`	`114`	`{`
`115`	`115`	`mParentTool->deleteTempRubberBand();`
`@@ -128,7 +128,7 @@ void QgsMapToolAddCircularString::activate()`
`128`	`128`	`mPoints.append( QgsPoint( mapPoint ) );`
`129`	`129`	`if ( !mTempRubberBand )`
`130`	`130`	`{`
`131`		`- mTempRubberBand = createGeometryRubberBand( layerType, true );`
	`131`	`+ mTempRubberBand = createGeometryRubberBand( mLayerType, true );`
`132`	`132`	`mTempRubberBand->show();`
`133`	`133`	`}`
`134`	`134`	`QgsCircularString *c = new QgsCircularString();`
Original file line number	Diff line number	Diff line change
`@@ -113,5 +113,5 @@ void QgsMapToolAddEllipse::clean()`
`113`	`113`
`114`	`114`	`QgsVectorLayer vLayer = static_cast<QgsVectorLayer >( QgisApp::instance()->activeLayer() );`
`115`	`115`	`if ( vLayer )`
`116`		`- layerType = vLayer->geometryType();`
	`116`	`+ mLayerType = vLayer->geometryType();`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -186,5 +186,5 @@ void QgsMapToolAddRectangle::clean()`
`186`	`186`
`187`	`187`	`QgsVectorLayer vLayer = static_cast<QgsVectorLayer >( QgisApp::instance()->activeLayer() );`
`188`	`188`	`if ( vLayer )`
`189`		`- layerType = vLayer->geometryType();`
	`189`	`+ mLayerType = vLayer->geometryType();`
`190`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,5 +138,5 @@ void QgsMapToolAddRegularPolygon::clean()`
`138`	`138`
`139`	`139`	`QgsVectorLayer vLayer = static_cast<QgsVectorLayer >( QgisApp::instance()->activeLayer() );`
`140`	`140`	`if ( vLayer )`
`141`		`- layerType = vLayer->geometryType();`
	`141`	`+ mLayerType = vLayer->geometryType();`
`142`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ void QgsMapToolCircle2Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e )`
`36`	`36`
`37`	`37`	`if ( !mPoints.isEmpty() && !mTempRubberBand )`
`38`	`38`	`{`
`39`		`- mTempRubberBand = createGeometryRubberBand( layerType, true );`
	`39`	`+ mTempRubberBand = createGeometryRubberBand( mLayerType, true );`
`40`	`40`	`mTempRubberBand->show();`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ void QgsMapToolCircle2TangentsPoint::cadCanvasMoveEvent( QgsMapMouseEvent *e )`
`108`	`108`	`{`
`109`	`109`	`if ( !mTempRubberBand )`
`110`	`110`	`{`
`111`		`- mTempRubberBand = createGeometryRubberBand( layerType, true );`
	`111`	`+ mTempRubberBand = createGeometryRubberBand( mLayerType, true );`
`112`	`112`	`mTempRubberBand->show();`
`113`	`113`	`}`
`114`	`114`	`else`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ void QgsMapToolCircle3Points::cadCanvasReleaseEvent( QgsMapMouseEvent *e )`
`37`	`37`	`mPoints.append( point );`
`38`	`38`	`if ( !mPoints.isEmpty() && !mTempRubberBand )`
`39`	`39`	`{`
`40`		`- mTempRubberBand = createGeometryRubberBand( layerType, true );`
	`40`	`+ mTempRubberBand = createGeometryRubberBand( mLayerType, true );`
`41`	`41`	`mTempRubberBand->show();`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ void QgsMapToolCircle3Tangents::cadCanvasMoveEvent( QgsMapMouseEvent *e )`
`79`	`79`
`80`	`80`	`if ( !mTempRubberBand )`
`81`	`81`	`{`
`82`		`- mTempRubberBand = createGeometryRubberBand( layerType, true );`
	`82`	`+ mTempRubberBand = createGeometryRubberBand( mLayerType, true );`
`83`	`83`	`mTempRubberBand->show();`
`84`	`84`	`}`
`85`	`85`	`else`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ void QgsMapToolCircularStringCurvePoint::cadCanvasReleaseEvent( QgsMapMouseEvent`
`43`	`43`	`{`
`44`	`44`	`if ( !mTempRubberBand )`
`45`	`45`	`{`
`46`		`- mTempRubberBand = createGeometryRubberBand( layerType, true );`
	`46`	`+ mTempRubberBand = createGeometryRubberBand( mLayerType, true );`
`47`	`47`	`mTempRubberBand->show();`
`48`	`48`	`}`
`49`	`49`
`@@ -57,7 +57,7 @@ void QgsMapToolCircularStringCurvePoint::cadCanvasReleaseEvent( QgsMapMouseEvent`
`57`	`57`	`{`
`58`	`58`	`if ( !mRubberBand )`
`59`	`59`	`{`
`60`		`- mRubberBand = createGeometryRubberBand( layerType );`
	`60`	`+ mRubberBand = createGeometryRubberBand( mLayerType );`
`61`	`61`	`mRubberBand->show();`
`62`	`62`	`}`
`63`	`63`