Avoid indentation dance

nyalldawson · nyalldawson · commit b6a441277c82 · 2020-05-25T11:39:20.000+10:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2121,9 +2121,7 @@ const QList<QgsVectorLayerRef> QgisApp::findBrokenLayerDependencies( QgsVectorLa
                ! dependency.source.isEmpty() ||
                ! dependency.layerId.isEmpty() )
           {
-            const QgsVectorLayer *depVl { QgsVectorLayerRef( dependency ).resolveWeakly(
-                                            QgsProject::instance(),
-                                            QgsVectorLayerRef::MatchType::Name ) };
+            const QgsVectorLayer *depVl { QgsVectorLayerRef( dependency ).resolveWeakly( QgsProject::instance(), QgsVectorLayerRef::MatchType::Name ) };
             if ( ! depVl || ! depVl->isValid() )
             {
               brokenDependencies.append( dependency );
@@ -2272,9 +2270,7 @@ void QgisApp::resolveVectorLayerDependencies( QgsVectorLayer *vl, QgsMapLayer::S
       }
       if ( ! loaded )
       {
-        const QString msg { tr( "layer '%1' requires layer '%2' to be loaded but '%2' could not be found, please load it manually if possible." )
-                            .arg( vl->name() )
-                            .arg( dependency.name ) };
+        const QString msg { tr( "layer '%1' requires layer '%2' to be loaded but '%2' could not be found, please load it manually if possible." ).arg( vl->name(), dependency.name ) };
         messageBar()->pushWarning( tr( "Missing layer form dependency" ), msg );
       }
       else

Original file line number	Diff line number	Diff line change
`@@ -2121,9 +2121,7 @@ const QList<QgsVectorLayerRef> QgisApp::findBrokenLayerDependencies( QgsVectorLa`
`2121`	`2121`	`! dependency.source.isEmpty() \|\|`
`2122`	`2122`	`! dependency.layerId.isEmpty() )`
`2123`	`2123`	`{`
`2124`		`- const QgsVectorLayer *depVl { QgsVectorLayerRef( dependency ).resolveWeakly(`
`2125`		`- QgsProject::instance(),`
`2126`		`- QgsVectorLayerRef::MatchType::Name ) };`
	`2124`	`+ const QgsVectorLayer *depVl { QgsVectorLayerRef( dependency ).resolveWeakly( QgsProject::instance(), QgsVectorLayerRef::MatchType::Name ) };`
`2127`	`2125`	`if ( ! depVl \|\| ! depVl->isValid() )`
`2128`	`2126`	`{`
`2129`	`2127`	`brokenDependencies.append( dependency );`
`@@ -2272,9 +2270,7 @@ void QgisApp::resolveVectorLayerDependencies( QgsVectorLayer *vl, QgsMapLayer::S`
`2272`	`2270`	`}`
`2273`	`2271`	`if ( ! loaded )`
`2274`	`2272`	`{`
`2275`		`- const QString msg { tr( "layer '%1' requires layer '%2' to be loaded but '%2' could not be found, please load it manually if possible." )`
`2276`		`- .arg( vl->name() )`
`2277`		`- .arg( dependency.name ) };`
	`2273`	`+ const QString msg { tr( "layer '%1' requires layer '%2' to be loaded but '%2' could not be found, please load it manually if possible." ).arg( vl->name(), dependency.name ) };`
`2278`	`2274`	`messageBar()->pushWarning( tr( "Missing layer form dependency" ), msg );`
`2279`	`2275`	`}`
`2280`	`2276`	`else`