Skip to content

Commit

Permalink
Indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Mar 1, 2017
1 parent 899888d commit 081cf96
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 9 deletions.
Empty file modified src/core/geometry/qgscompoundcurve.cpp 100755 → 100644
Empty file.
Empty file modified src/core/geometry/qgsgeometryutils.cpp 100755 → 100644
Empty file.
Empty file modified src/core/geometry/qgspointv2.cpp 100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion src/gui/symbology-ng/qgsellipsesymbollayerwidget.cpp
Expand Up @@ -28,7 +28,7 @@ QgsEllipseSymbolLayerWidget::QgsEllipseSymbolLayerWidget( const QgsVectorLayer*
mSymbolHeightUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
<< QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
mStrokeWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
<< QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
<< QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
<< QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );

Expand Down
4 changes: 2 additions & 2 deletions src/gui/symbology-ng/qgssymbollayerwidget.cpp
Expand Up @@ -377,7 +377,7 @@ QgsSimpleMarkerSymbolLayerWidget::QgsSimpleMarkerSymbolLayerWidget( const QgsVec
mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
<< QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
mStrokeWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
<< QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
<< QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );

btnChangeColorFill->setAllowAlpha( true );
btnChangeColorFill->setColorDialogTitle( tr( "Select fill color" ) );
Expand Down Expand Up @@ -2111,7 +2111,7 @@ QgsSVGFillSymbolLayerWidget::QgsSVGFillSymbolLayerWidget( const QgsVectorLayer*
mTextureWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
<< QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
mSvgStrokeWidthUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
<< QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
<< QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
mSvgTreeView->setHeaderHidden( true );
insertIcons();

Expand Down
Empty file modified tests/src/core/testqgsgeometryimport.cpp 100755 → 100644
Empty file.
1 change: 1 addition & 0 deletions tests/src/python/test_qgsnoapplication.py
Expand Up @@ -30,6 +30,7 @@


class TestQgsNoApplication(unittest.TestCase):

def testMembers(self):
self.assertTrue(QgsApplication.actionScopeRegistry())
# self.assertTrue(QgsApplication.annotationRegistry()) NOT AVAILABLE IN BINDINGS
Expand Down
9 changes: 3 additions & 6 deletions tests/src/python/test_qgsprojectionselectionwidgets.py
Expand Up @@ -15,7 +15,7 @@
import qgis # NOQA

from qgis.gui import (QgsProjectionSelectionWidget,
QgsProjectionSelectionTreeWidget,
QgsProjectionSelectionTreeWidget,
QgsProjectionSelectionDialog)
from qgis.core import QgsCoordinateReferenceSystem, QgsProject
from qgis.testing import start_app, unittest
Expand Down Expand Up @@ -120,10 +120,9 @@ def testTreeWidgetGettersSetters(self):
w.show()
self.assertFalse(w.hasValidSelection())
w.setCrs(QgsCoordinateReferenceSystem('EPSG:3111'))
self.assertEqual(w.crs().authid(),'EPSG:3111')
self.assertEqual(w.crs().authid(), 'EPSG:3111')
self.assertTrue(w.hasValidSelection())


def testTreeWidgetNotSetOption(self):
""" test allowing no projection option for QgsProjectionSelectionTreeWidget """
w = QgsProjectionSelectionTreeWidget()
Expand All @@ -144,7 +143,7 @@ def testDialogGettersSetters(self):
w = QgsProjectionSelectionDialog()
w.show()
w.setCrs(QgsCoordinateReferenceSystem('EPSG:3111'))
self.assertEqual(w.crs().authid(),'EPSG:3111')
self.assertEqual(w.crs().authid(), 'EPSG:3111')

def testDialogNotSetOption(self):
""" test allowing no projection option for QgsProjectionSelectionTreeWidget """
Expand All @@ -160,7 +159,5 @@ def testDialogNotSetOption(self):
self.assertFalse(w.crs().isValid())




if __name__ == '__main__':
unittest.main()

0 comments on commit 081cf96

Please sign in to comment.