From 0a9f019f27538b115899c0f51d3adb7e76fe91ef Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 30 Jan 2018 15:59:35 +1000 Subject: [PATCH] Indentation --- src/app/mainwin.cpp | 2 +- tests/src/core/testqgslayoutmultiframe.cpp | 2 +- tests/src/gui/testqgslayoutview.cpp | 2 +- tests/src/python/test_qgsfieldmodel.py | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/mainwin.cpp b/src/app/mainwin.cpp index 70f4c5a91c0..8198175c5a3 100644 --- a/src/app/mainwin.cpp +++ b/src/app/mainwin.cpp @@ -143,7 +143,7 @@ int CALLBACK WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdL NULL ); std::string message = "Could not load qgis_app.dll \n Windows Error: " + std::string( errorText ) - + "\n Help: \n\n Check " + basename + ".env for correct environment paths"; + + "\n Help: \n\n Check " + basename + ".env for correct environment paths"; showError( message, "Error loading QGIS" ); LocalFree( errorText ); diff --git a/tests/src/core/testqgslayoutmultiframe.cpp b/tests/src/core/testqgslayoutmultiframe.cpp index e3724262fbe..a1e1ed03a69 100644 --- a/tests/src/core/testqgslayoutmultiframe.cpp +++ b/tests/src/core/testqgslayoutmultiframe.cpp @@ -522,7 +522,7 @@ void TestQgsLayoutMultiFrame::registry() QVERIFY( registry.itemTypes().isEmpty() ); QVERIFY( !registry.createMultiFrame( 1, nullptr ) ); - auto create = []( QgsLayout * layout )->QgsLayoutMultiFrame* + auto create = []( QgsLayout * layout )->QgsLayoutMultiFrame * { return new TestMultiFrame( layout ); }; diff --git a/tests/src/gui/testqgslayoutview.cpp b/tests/src/gui/testqgslayoutview.cpp index 046b7d34c09..1c27351f774 100644 --- a/tests/src/gui/testqgslayoutview.cpp +++ b/tests/src/gui/testqgslayoutview.cpp @@ -272,7 +272,7 @@ void TestQgsLayoutView::guiRegistry() QSignalSpy spyTypeAdded( ®istry, &QgsLayoutItemGuiRegistry::typeAdded ); // add a dummy item to registry - auto createWidget = []( QgsLayoutItem * item )->QgsLayoutItemBaseWidget* + auto createWidget = []( QgsLayoutItem * item )->QgsLayoutItemBaseWidget * { return new QgsLayoutItemBaseWidget( nullptr, item ); }; diff --git a/tests/src/python/test_qgsfieldmodel.py b/tests/src/python/test_qgsfieldmodel.py index de00a831bc3..cc84a785265 100755 --- a/tests/src/python/test_qgsfieldmodel.py +++ b/tests/src/python/test_qgsfieldmodel.py @@ -40,6 +40,7 @@ def create_model(): class TestQgsFieldModel(unittest.TestCase): + def testGettersSetters(self): """ test model getters/setters """ l = create_layer()