Skip to content

Commit

Permalink
Fix failing indentation test
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Jan 13, 2016
1 parent f639d1e commit d97a5e3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions python/plugins/fTools/tools/doSimplify.py
Expand Up @@ -112,9 +112,9 @@ def accept(self):
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
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/grass/nviz.py
Expand Up @@ -160,7 +160,7 @@ def getDefaultCellsize(self):
else:
layer = dataobjects.getObjectFromUri(param.value)
cellsize = max(cellsize, (layer.extent().xMaximum()
- layer.extent().xMinimum())
- layer.extent().xMinimum())
/ layer.width())
elif isinstance(param, ParameterMultipleInput):

Expand Down
2 changes: 1 addition & 1 deletion scripts/verify-indentation.sh
Expand Up @@ -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
;;
Expand Down

0 comments on commit d97a5e3

Please sign in to comment.