gdaltools: more SIP APIv2 update

Author: brushtyler

python/plugins/GdalTools/tools/doFillNodata.py

@@ -205,7 +205,7 @@ def updateProgress(self, index, total):
         self.progressBar.setValue( 0 )
 
   def batchRun(self):
-      exts = self.formatCombo.currentText().remove( QRegExp('^.*\(') ).remove( QRegExp('\).*$') ).split( " " )
+      exts = re.sub('\).*$', '', re.sub('^.*\(', '', self.formatCombo.currentText())).split(" ")
       if exts and exts != "*" and exts != "*.*":
         outExt = exts[ 0 ].remove( "*" )
       else:
@@ -229,7 +229,7 @@ def batchRun(self):
       for f in files:
         self.inFiles.append( inDir + "/" + f )
         if outDir != None:
-          outFile = re.sub( f, "\.[a-zA-Z0-9]{2,4}", outExt )
+          outFile = re.sub( "\.[a-zA-Z0-9]{2,4}", outExt, f )
           self.outFiles.append( outDir + "/" + outFile )
 
       self.errors = []

python/plugins/GdalTools/tools/doTranslate.py

@@ -206,7 +206,7 @@ def getArguments(self):
       if self.sdsCheck.isChecked():
           arguments.append( "-sds")
       if self.srcwinCheck.isChecked() and self.srcwinEdit.text():
-          coordList = self.srcwinEdit.text().split( ' ', QString.SkipEmptyParts )
+          coordList = self.srcwinEdit.text().split() # split the string on whitespace(s)
           if len(coordList) == 4 and coordList[3]:
               try:
                   for x in coordList:
@@ -219,7 +219,7 @@ def getArguments(self):
                   for x in coordList:
                       arguments.append( x)
       if self.prjwinCheck.isChecked() and self.prjwinEdit.text():
-          coordList = self.prjwinEdit.text().split( ' ', QString.SkipEmptyParts )
+          coordList = self.prjwinEdit.text().split() # split the string on whitespace(s)
           if len(coordList) == 4 and coordList[3]:
               try:
                   for x in coordList:
@@ -276,7 +276,7 @@ def updateProgress(self, index, total):
         self.progressBar.setValue( 0 )
 
   def batchRun(self):
-      exts = self.formatCombo.currentText().remove( QRegExp('^.*\(') ).remove( QRegExp('\).*$') ).split( " " )
+      exts = re.sub('\).*$', '', re.sub('^.*\(', '', self.formatCombo.currentText())).split(" ")
       if exts and exts != "*" and exts != "*.*":
         outExt = exts[ 0 ].remove( "*" )
       else: