Cleanup and modernise code a little

Author: nyalldawson

src/app/qgisapp.cpp

@@ -17678,8 +17678,8 @@ void QgisApp::triggerCrashHandler()
 void QgisApp::addTabifiedDockWidget( Qt::DockWidgetArea area, QDockWidget *dockWidget, const QStringList &tabifyWith, bool raiseTab )
 {
   QList<QDockWidget *> dockWidgetsInArea;
-  const auto dockWidgets = findChildren<QDockWidget *>();
-  for ( QDockWidget *w : dockWidgets )
+  const QList<QDockWidget *> allDockWidgets = findChildren<QDockWidget *>();
+  for ( QDockWidget *w : allDockWidgets )
   {
     if ( w->isVisible() && dockWidgetArea( w ) == area )
     {
@@ -17688,80 +17688,73 @@ void QgisApp::addTabifiedDockWidget( Qt::DockWidgetArea area, QDockWidget *dockW
   }
 
   addDockWidget( area, dockWidget ); // First add the dock widget, then attempt to tabify
-  if ( dockWidgetsInArea.length() > 0 )
+  if ( dockWidgetsInArea.empty() )
+    return;
+
+  // Get the base dock widget that we'll use to tabify our new dockWidget
+  QDockWidget *tabifyWithDockWidget = nullptr;
+  for ( const QString &targetName : tabifyWith )
   {
-    // Get the base dock widget that we'll use to tabify our new dockWidget
-    QDockWidget *tabifyWithDockWidget = nullptr;
-    if ( !tabifyWith.isEmpty() )
-    {
-      // Iterate the list of object names looking for a
-      // dock widget to tabify the new one on top of it
-      bool objectNameFound = false;
-      for ( int i = 0; i < tabifyWith.size(); i++ )
-      {
-        for ( QDockWidget *cw : std::as_const( dockWidgetsInArea ) )
-        {
-          if ( cw->objectName() == tabifyWith.at( i ) || cw->property( "dock_uuid" ).toString() == tabifyWith.at( i ) )
-          {
-            tabifyWithDockWidget = cw;
-            objectNameFound = true; // Also exit the outer for loop
-            break;
-          }
-        }
-        if ( objectNameFound )
-        {
-          break;
-        }
-      }
-    }
-    if ( !tabifyWithDockWidget )
+    auto it = std::find_if( dockWidgetsInArea.begin(), dockWidgetsInArea.end(), [&targetName]( QDockWidget *cw ) {
+      return cw->objectName() == targetName || cw->property( "dock_uuid" ).toString() == targetName;
+    } );
+
+    if ( it != dockWidgetsInArea.end() )
     {
-      tabifyWithDockWidget = dockWidgetsInArea.at( 0 ); // Last resort
+      tabifyWithDockWidget = *it;
+      break;
     }
-    if ( tabifyWithDockWidget == dockWidget )
-      return;
+  }
 
-    QTabBar *existentTabBar = nullptr;
-    int currentIndex = -1;
-    if ( !raiseTab && dockWidgetsInArea.length() > 1 )
+  if ( !tabifyWithDockWidget )
+  {
+    // fallback to the first available dock widget if no matches were found, or if no tabifyWith names were specified
+    tabifyWithDockWidget = dockWidgetsInArea.at( 0 );
+  }
+  if ( tabifyWithDockWidget == dockWidget )
+    return;
+
+  // find the currently active dock widget so that we can restore that if we're not raising the new tab
+  QTabBar *existingTabBar = nullptr;
+  int currentTabIndex = -1;
+  if ( !raiseTab && dockWidgetsInArea.length() > 1 )
+  {
+    // Chances are we've already got a tabBar, if so, get
+    // currentTabIndex to restore status after inserting our new tab
+    const QList<QTabBar *> tabBars = findChildren<QTabBar *>( QString(), Qt::FindDirectChildrenOnly );
+    bool tabBarFound = false;
+    for ( QTabBar *tabBar : tabBars )
     {
-      // Chances are we've already got a tabBar, if so, get
-      // currentIndex to restore status after inserting our new tab
-      const QList<QTabBar *> tabBars = findChildren<QTabBar *>( QString(), Qt::FindDirectChildrenOnly );
-      bool tabBarFound = false;
-      for ( QTabBar *tabBar : tabBars )
+      for ( int i = 0; i < tabBar->count(); i++ )
       {
-        for ( int i = 0; i < tabBar->count(); i++ )
-        {
-          if ( tabBar->tabText( i ) == tabifyWithDockWidget->windowTitle() )
-          {
-            existentTabBar = tabBar;
-            currentIndex = tabBar->currentIndex();
-            tabBarFound = true;
-            break;
-          }
-        }
-        if ( tabBarFound )
+        if ( tabBar->tabText( i ) == tabifyWithDockWidget->windowTitle() )
         {
+          existingTabBar = tabBar;
+          currentTabIndex = tabBar->currentIndex();
+          tabBarFound = true;
           break;
         }
       }
+      if ( tabBarFound )
+      {
+        break;
+      }
     }
+  }
 
-    // Now we can put the new dockWidget on top of tabifyWith
-    tabifyDockWidget( tabifyWithDockWidget, dockWidget );
+  // Now we can put the new dockWidget on top of tabifyWith
+  tabifyDockWidget( tabifyWithDockWidget, dockWidget );
 
-    // Should we restore dock widgets status?
-    if ( !raiseTab )
+  // Should we restore dock widgets status?
+  if ( !raiseTab )
+  {
+    if ( existingTabBar )
     {
-      if ( existentTabBar )
-      {
-        existentTabBar->setCurrentIndex( currentIndex );
-      }
-      else
-      {
-        tabifyWithDockWidget->raise(); // Single base dock widget, we can just raise it
-      }
+      existingTabBar->setCurrentIndex( currentTabIndex );
+    }
+    else
+    {
+      tabifyWithDockWidget->raise(); // Single base dock widget, we can just raise it
     }
   }
 }