[ftools] More SIP API updates

m-kuhn · m-kuhn · commit e3608db6a239 · 2013-06-16T14:21:32.000+02:00
diff --git a/python/plugins/fTools/tools/doGeoprocessing.py b/python/plugins/fTools/tools/doGeoprocessing.py
@@ -892,7 +892,7 @@ def intersect( self ):
         crs_match = crsA == crsB
     fields = ftools_utils.combineVectorFields( self.vlayerA, self.vlayerB )
     longNames = ftools_utils.checkFieldNameLength( fields )
-    if not longNames.isEmpty():
+    if longNames:
       message = self.tr('Following field names are longer than 10 characters:\n%s') % ( '\n'.join(longNames) )
       return GEOS_EXCEPT, FEATURE_EXCEPT, crs_match, message
 
@@ -1077,7 +1077,7 @@ def union( self ):
 
     fields = ftools_utils.combineVectorFields( self.vlayerA, self.vlayerB )
     longNames = ftools_utils.checkFieldNameLength( fields )
-    if not longNames.isEmpty():
+    if longNames:
       message = self.tr( 'Following field names are longer than 10 characters:\n%s' ) % ( "\n".join(longNames) )
       return GEOS_EXCEPT, FEATURE_EXCEPT, crs_match, message
 
@@ -1263,7 +1263,7 @@ def symetrical_difference( self ):
 
     fields = ftools_utils.combineVectorFields( self.vlayerA, self.vlayerB )
     longNames = ftools_utils.checkFieldNameLength( fields )
-    if not longNames.isEmpty():
+    if longNames:
       message = self.tr( 'Following field names are longer than 10 characters:\n%s' ) % ( "\n".join(longNames) )
       return GEOS_EXCEPT, FEATURE_EXCEPT, crs_match, message
 
diff --git a/python/plugins/fTools/tools/doMergeShapes.py b/python/plugins/fTools/tools/doMergeShapes.py
@@ -53,7 +53,7 @@ def inputDir( self ):
               self.tr( "Select directory with shapefiles to merge" ),
               lastDir )
 
-    if inDir.isEmpty():
+    if not inDir:
       return
 
     workDir = QDir( inDir )
@@ -89,8 +89,8 @@ def inputFile( self ):
       fileName = QFileInfo( f ).fileName()
       self.inputFiles.append( fileName )
 
-    self.progressFiles.setRange( 0, self.inputFiles.count() )
-    self.leInputDir.setText( files.join( ";" ) )
+    self.progressFiles.setRange( 0, len( self.inputFiles ) )
+    self.leInputDir.setText( ";".join( files ) )
 
   def changeMode( self ):
     if self.chkListMode.isChecked():
diff --git a/python/plugins/fTools/tools/doPointDistance.py b/python/plugins/fTools/tools/doPointDistance.py
@@ -143,7 +143,7 @@ def saveFile(self):
         fileCheck = QFile(outName)
         filePath = QFileInfo(outName).absoluteFilePath()
         if filePath.right(4) != ".csv": filePath = filePath + ".csv"
-        if not outName.isEmpty():
+        if outName:
             self.outFile.insert(filePath)
 
     def compute(self, line1, line2, field1, field2, outPath, matType, nearest, progressBar):
diff --git a/python/plugins/fTools/tools/doSpatialIndex.py b/python/plugins/fTools/tools/doSpatialIndex.py
@@ -133,7 +133,7 @@ def processFinished( self, errors ):
     self.stopProcessing()
     self.restoreGui()
 
-    if not errors.isEmpty():
+    if errors:
       msg = self.tr( "Processing of the following layers/files ended with error:<br><br>" ) + "<br>".join(errors)
       QErrorMessage( self ).showMessage( msg )
 
diff --git a/python/plugins/fTools/tools/doValidate.py b/python/plugins/fTools/tools/doValidate.py
@@ -115,7 +115,7 @@ def keyPressEvent( self, e ):
       for row in range( self.tblUnique.rowCount() ):
         items.append( self.tblUnique.item( row, 0 ).text()
         + "," + self.tblUnique.item( row, 1 ).text() + "\n" )
-      if not items.isEmpty():
+      if items:
         clip_board = QApplication.clipboard()
         clip_board.setText( items )
     else:
diff --git a/python/plugins/fTools/tools/doVectorSplit.py b/python/plugins/fTools/tools/doVectorSplit.py
@@ -123,7 +123,7 @@ def processFinished(self, errors):
         outPath = self.outShape.text()
         self.restoreGui()
 
-        if not errors.isEmpty():
+        if errors:
             msg = self.tr( "Processing of the following layers/files ended with error:<br><br>" ) + "<br>".join(errors)
             QErrorMessage( self ).showMessage( msg )
 
diff --git a/python/plugins/fTools/tools/doVisual.py b/python/plugins/fTools/tools/doVisual.py
@@ -72,7 +72,7 @@ def keyPressEvent( self, e ):
       else:
         for rec in range( self.tblUnique.rowCount() ):
           items.append( self.tblUnique.item( rec, 0 ).text() + ":" + self.tblUnique.item( rec, 1 ).text() + "\n" )
-      if not items.isEmpty():
+      if items:
         clip_board = QApplication.clipboard()
         clip_board.setText( items )
     else:
