Changeset 94004 in vbox

Timestamp:

Mar 1, 2022 12:41:47 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: qt6: Compiler insists on braces around foreach() loops preceeded by an if-statement. bugref:9898

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (2 diffs)
• globals/UIIconPool.cpp (modified) (1 diff)
• manager/chooser/UIChooserModel.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsSF.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -1788 +1788 @@
         bool fIsRecentMediumUsed = false;
         if (enmMediumType != UIMediumDeviceType_DVD)
+        {
             foreach (const CMediumAttachment &otherAttachment, comAttachments)
             {
@@ -1800 +1801 @@
                 }
             }
+        }
         /* If recent-medium usage is unique: */
         if (!fIsRecentMediumUsed)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp

@@ -442 +442 @@
     /* 1. First, load icon from IMachine extra-data: */
     if (icon.isNull())
+    {
         foreach (const QString &strIconName, gEDataManager->machineWindowIconNames(uMachineId))
             if (!strIconName.isEmpty() && QFile::exists(strIconName))
                 icon.addFile(strIconName);
+    }
 
     /* 2. Otherwise, load icon from IMachine interface itself: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -1792 +1792 @@
     QStringList selectedItemDefinitions;
     if (fPreserveSelection && !selectedItems().isEmpty())
+    {
         foreach (UIChooserItem *pSelectedItem, selectedItems())
             selectedItemDefinitions << pSelectedItem->definition();
+    }
 
     /* Clean tree for main root: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp

@@ -338 +338 @@
     /* Load machine (permanent) folders if allowed: */
     if (isSharedFolderTypeSupported(MachineType))
+    {
         foreach (const CSharedFolder &folder, getSharedFolders(MachineType))
             folders.insertMulti(MachineType, folder);
+    }
     /* Load console (temporary) folders if allowed: */
     if (isSharedFolderTypeSupported(ConsoleType))
+    {
         foreach (const CSharedFolder &folder, getSharedFolders(ConsoleType))
             folders.insertMulti(ConsoleType, folder);
+    }
 
     /* For each folder type: */