diff --git a/python/plugins/fTools/tools/doSimplify.py b/python/plugins/fTools/tools/doSimplify.py index 94e045a6f48..cb34b51520f 100644 --- a/python/plugins/fTools/tools/doSimplify.py +++ b/python/plugins/fTools/tools/doSimplify.py @@ -112,9 +112,9 @@ class Dialog(QDialog, Ui_Dialog): res = QMessageBox.warning(self, self.tr("Warning"), self.tr( "Currently QGIS doesn't allow simultaneous access from " - "different threads to the same datasource. Make sure your layer's " - "attribute tables are closed. Continue?"), - QMessageBox.Yes | QMessageBox.No) + "different threads to the same datasource. Make sure your layer's " + "attribute tables are closed. Continue?"), + QMessageBox.Yes | QMessageBox.No) if res == QMessageBox.No: self.btnOk.setEnabled(False) return diff --git a/python/plugins/processing/algs/grass/nviz.py b/python/plugins/processing/algs/grass/nviz.py index 9f5e0cca263..6c5238580b7 100644 --- a/python/plugins/processing/algs/grass/nviz.py +++ b/python/plugins/processing/algs/grass/nviz.py @@ -160,7 +160,7 @@ class nviz(GeoAlgorithm): else: layer = dataobjects.getObjectFromUri(param.value) cellsize = max(cellsize, (layer.extent().xMaximum() - - layer.extent().xMinimum()) + - layer.extent().xMinimum()) / layer.width()) elif isinstance(param, ParameterMultipleInput): diff --git a/scripts/verify-indentation.sh b/scripts/verify-indentation.sh index 0fdce155d52..fe0e5749c65 100755 --- a/scripts/verify-indentation.sh +++ b/scripts/verify-indentation.sh @@ -38,7 +38,7 @@ do echo "Checking $f" >>/tmp/ctest-important.log case "$f" in - src/core/gps/qextserialport/*|src/plugins/dxf2shp_converter/dxflib/src/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*) + src/core/gps/qextserialport/*|src/plugins/dxf2shp_converter/dxflib/src/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*|scripts/customwidget_template*) echo "$f skipped" continue ;;