More V2 drop fixes

qgis · Oct 29, 2017 · 271ef7c0a35d9205005691306eec2776e2d56a36 · 271ef7c
1 parent e19f648
commit 271ef7c0a35d9205005691306eec2776e2d56a36
Unified Split

Showing with 8 additions and 8 deletions.

+2 −2 src/app/qgsmaptooldeletering.cpp

+1 −1 src/app/qgsmaptoolfillring.cpp

+1 −1 src/app/qgsmaptooloffsetcurve.cpp

+2 −2 src/app/qgsmaptoolselectutils.cpp

+2 −2 src/plugins/topology/topolTest.cpp
diff --git a/src/app/qgsmaptooldeletering.cpp b/src/app/qgsmaptooldeletering.cpp
@@ -127,7 +127,7 @@ QgsGeometry QgsMapToolDeleteRing::ringUnderPoint( const QgsPointXY &p, QgsFeatur
   QgsGeometry g;
   QgsGeometry ringGeom;
   QgsMultiPolygonXY pol;
-  QgsPolygonXYtempPol;
+  QgsPolygonXY tempPol;
   QgsGeometry tempGeom;
   double area = std::numeric_limits<double>::max();
   while ( fit.nextFeature( f ) )
@@ -202,7 +202,7 @@ void QgsMapToolDeleteRing::deleteRing( QgsFeatureId fId, int beforeVertexNr, Qgs
 
 int QgsMapToolDeleteRing::ringNumInPolygon( const QgsGeometry &g, int vertexNr )
 {
-  QgsPolygonXYpolygon = g.asPolygon();
+  QgsPolygonXY polygon = g.asPolygon();
   for ( int ring = 0; ring < polygon.count(); ring++ )
   {
     if ( vertexNr < polygon[ring].count() )

diff --git a/src/app/qgsmaptoolfillring.cpp b/src/app/qgsmaptoolfillring.cpp
@@ -216,7 +216,7 @@ QgsGeometry QgsMapToolFillRing::ringUnderPoint( const QgsPointXY &p, QgsFeatureI
       {
         for ( int j = 1; j < pol[i].size(); ++j )
         {
-          QgsPolygonXYtempPol = QgsPolygonXY() << pol[i][j];
+          QgsPolygonXY tempPol = QgsPolygonXY() << pol[i][j];
           QgsGeometry tempGeom = QgsGeometry::fromPolygon( tempPol );
           if ( tempGeom.area() < area && tempGeom.contains( &p ) )
           {

diff --git a/src/app/qgsmaptooloffsetcurve.cpp b/src/app/qgsmaptooloffsetcurve.cpp
@@ -412,7 +412,7 @@ QgsGeometry QgsMapToolOffsetCurve::linestringFromPolygon( const QgsGeometry &fea
 
   if ( geomType == QgsWkbTypes::Polygon || geomType == QgsWkbTypes::Polygon25D )
   {
-    QgsPolygonXYpolygon = featureGeom.asPolygon();
+    QgsPolygonXY polygon = featureGeom.asPolygon();
     multiPoly.append( polygon );
   }
   else if ( geomType == QgsWkbTypes::MultiPolygon || geomType == QgsWkbTypes::MultiPolygon25D )

diff --git a/src/app/qgsmaptoolselectutils.cpp b/src/app/qgsmaptoolselectutils.cpp
@@ -182,12 +182,12 @@ QgsFeatureIds QgsMapToolSelectUtils::getMatchingFeatures( QgsMapCanvas *canvas,
     {
       // convert add more points to the edges of the rectangle
       // improve transformation result
-      QgsPolygonXYpoly( selectGeomTrans.asPolygon() );
+      QgsPolygonXY poly( selectGeomTrans.asPolygon() );
       if ( poly.size() == 1 && poly.at( 0 ).size() == 5 )
       {
         const QgsPolylineXY &ringIn = poly.at( 0 );
 
-        QgsPolygonXYnewpoly( 1 );
+        QgsPolygonXY newpoly( 1 );
         newpoly[0].resize( 41 );
         QgsPolylineXY &ringOut = newpoly[0];
 

diff --git a/src/plugins/topology/topolTest.cpp b/src/plugins/topology/topolTest.cpp
@@ -636,7 +636,7 @@ ErrorList topolTest::checkGaps( double tolerance, QgsVectorLayer *layer1, QgsVec
       QgsMultiPolygonXY polys = g1.asMultiPolygon();
       for ( int m = 0; m < polys.count(); m++ )
       {
-        QgsPolygonXYpolygon = polys[m];
+        QgsPolygonXY polygon = polys[m];
 
         QgsGeometry polyGeom = QgsGeometry::fromPolygon( polygon );
 
@@ -980,7 +980,7 @@ ErrorList topolTest::checkSegmentLength( double tolerance, QgsVectorLayer *layer
 
   QList<FeatureLayer>::iterator it;
 
-  QgsPolygonXYpol;
+  QgsPolygonXY pol;
 
   QgsMultiPolygonXY mpol;
   QgsPolylineXY segm;