Replace more splitted by split

DelazJ · DelazJ · commit 69af2facdea3 · 2016-12-29T01:46:19.000+01:00
diff --git a/src/core/qgsvectorlayereditutils.cpp b/src/core/qgsvectorlayereditutils.cpp
@@ -301,7 +301,7 @@ int QgsVectorLayerEditUtils::splitFeatures( const QList<QgsPoint>& splitLine, bo
   QgsRectangle bBox; //bounding box of the split line
   int returnCode = 0;
   int splitFunctionReturn; //return code of QgsGeometry::splitGeometry
-  int numberOfSplittedFeatures = 0;
+  int numberOfSplitFeatures = 0;
 
   QgsFeatureIterator features;
   const QgsFeatureIds selectedIds = L->selectedFeatureIds();
@@ -384,15 +384,15 @@ int QgsVectorLayerEditUtils::splitFeatures( const QList<QgsPoint>& splitLine, bo
           addTopologicalPoints( *topol_it );
         }
       }
-      ++numberOfSplittedFeatures;
+      ++numberOfSplitFeatures;
     }
     else if ( splitFunctionReturn > 1 ) //1 means no split but also no error
     {
       returnCode = splitFunctionReturn;
     }
   }
 
-  if ( numberOfSplittedFeatures == 0 && !selectedIds.isEmpty() )
+  if ( numberOfSplitFeatures == 0 && !selectedIds.isEmpty() )
   {
     //There is a selection but no feature has been split.
     //Maybe user forgot that only the selected features are split
@@ -411,7 +411,7 @@ int QgsVectorLayerEditUtils::splitParts( const QList<QgsPoint>& splitLine, bool
   QgsRectangle bBox; //bounding box of the split line
   int returnCode = 0;
   int splitFunctionReturn; //return code of QgsGeometry::splitGeometry
-  int numberOfSplittedParts = 0;
+  int numberOfSplitParts = 0;
 
   QgsFeatureIterator fit;
 
@@ -519,15 +519,15 @@ int QgsVectorLayerEditUtils::splitParts( const QList<QgsPoint>& splitLine, bool
           addTopologicalPoints( *topol_it );
         }
       }
-      ++numberOfSplittedParts;
+      ++numberOfSplitParts;
     }
     else if ( splitFunctionReturn > 1 ) //1 means no split but also no error
     {
       returnCode = splitFunctionReturn;
     }
   }
 
-  if ( numberOfSplittedParts == 0 && L->selectedFeatureCount() > 0  && returnCode == 0 )
+  if ( numberOfSplitParts == 0 && L->selectedFeatureCount() > 0  && returnCode == 0 )
   {
     //There is a selection but no feature has been split.
     //Maybe user forgot that only the selected features are split
diff --git a/tests/src/python/test_qgsdelimitedtextprovider.py b/tests/src/python/test_qgsdelimitedtextprovider.py
@@ -88,14 +88,14 @@ def toString(self):
 
 
 def normalize_query_items_order(s):
-    splitted_url = s.split('?')
-    urlstr = splitted_url[0]
-    if len(splitted_url) == 2:
-        items_list = splitted_url[1].split('&')
+    split_url = s.split('?')
+    urlstr = split_url[0]
+    if len(split_url) == 2:
+        items_list = split_url[1].split('&')
         items_map = {}
         for item in items_list:
-            splitted_item = item.split('=')
-            items_map[splitted_item[0]] = splitted_item[1]
+            split_item = item.split('=')
+            items_map[split_item[0]] = split_item[1]
         first_arg = True
         for k in sorted(items_map.keys()):
             if first_arg:

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ int QgsVectorLayerEditUtils::splitFeatures( const QList<QgsPoint>& splitLine, bo`
`301`	`301`	`QgsRectangle bBox; //bounding box of the split line`
`302`	`302`	`int returnCode = 0;`
`303`	`303`	`int splitFunctionReturn; //return code of QgsGeometry::splitGeometry`
`304`		`- int numberOfSplittedFeatures = 0;`
	`304`	`+ int numberOfSplitFeatures = 0;`
`305`	`305`
`306`	`306`	`QgsFeatureIterator features;`
`307`	`307`	`const QgsFeatureIds selectedIds = L->selectedFeatureIds();`
`@@ -384,15 +384,15 @@ int QgsVectorLayerEditUtils::splitFeatures( const QList<QgsPoint>& splitLine, bo`
`384`	`384`	`addTopologicalPoints( *topol_it );`
`385`	`385`	`}`
`386`	`386`	`}`
`387`		`- ++numberOfSplittedFeatures;`
	`387`	`+ ++numberOfSplitFeatures;`
`388`	`388`	`}`
`389`	`389`	`else if ( splitFunctionReturn > 1 ) //1 means no split but also no error`
`390`	`390`	`{`
`391`	`391`	`returnCode = splitFunctionReturn;`
`392`	`392`	`}`
`393`	`393`	`}`
`394`	`394`
`395`		`- if ( numberOfSplittedFeatures == 0 && !selectedIds.isEmpty() )`
	`395`	`+ if ( numberOfSplitFeatures == 0 && !selectedIds.isEmpty() )`
`396`	`396`	`{`
`397`	`397`	`//There is a selection but no feature has been split.`
`398`	`398`	`//Maybe user forgot that only the selected features are split`
`@@ -411,7 +411,7 @@ int QgsVectorLayerEditUtils::splitParts( const QList<QgsPoint>& splitLine, bool`
`411`	`411`	`QgsRectangle bBox; //bounding box of the split line`
`412`	`412`	`int returnCode = 0;`
`413`	`413`	`int splitFunctionReturn; //return code of QgsGeometry::splitGeometry`
`414`		`- int numberOfSplittedParts = 0;`
	`414`	`+ int numberOfSplitParts = 0;`
`415`	`415`
`416`	`416`	`QgsFeatureIterator fit;`
`417`	`417`
`@@ -519,15 +519,15 @@ int QgsVectorLayerEditUtils::splitParts( const QList<QgsPoint>& splitLine, bool`
`519`	`519`	`addTopologicalPoints( *topol_it );`
`520`	`520`	`}`
`521`	`521`	`}`
`522`		`- ++numberOfSplittedParts;`
	`522`	`+ ++numberOfSplitParts;`
`523`	`523`	`}`
`524`	`524`	`else if ( splitFunctionReturn > 1 ) //1 means no split but also no error`
`525`	`525`	`{`
`526`	`526`	`returnCode = splitFunctionReturn;`
`527`	`527`	`}`
`528`	`528`	`}`
`529`	`529`
`530`		`- if ( numberOfSplittedParts == 0 && L->selectedFeatureCount() > 0 && returnCode == 0 )`
	`530`	`+ if ( numberOfSplitParts == 0 && L->selectedFeatureCount() > 0 && returnCode == 0 )`
`531`	`531`	`{`
`532`	`532`	`//There is a selection but no feature has been split.`
`533`	`533`	`//Maybe user forgot that only the selected features are split`