Changeset 24400 in vbox for trunk/src/VBox

Timestamp:

Nov 5, 2009 5:01:29 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: VBoxConsoleWND: Reusing some code added in r54442; Coding-style fixes.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -2201 +2201 @@
 
             /* Mount Medium actions */
-            int addedIntoList = 0;
             CMediumVector mediums;
             switch (mediumType)
@@ -2217 +2216 @@
             }
 
+            int mediumsToBeShown = 0;
             const int maxMediumsToBeShown = 5;
             CMedium currentMedium = attachment.GetMedium();
@@ -2238 +2238 @@
                 if (!isMediumUsed)
                 {
-                    if (   !currentUsed
-                        && !currentMedium.isNull()
-                        && addedIntoList == maxMediumsToBeShown-1)
+                    if (!currentUsed && !currentMedium.isNull() && mediumsToBeShown == maxMediumsToBeShown - 1)
                         medium = currentMedium;
 
@@ -2248 +2246 @@
                     QAction *mountMediumAction = new QAction (VBoxMedium (medium, mediumType).name(), attachmentMenu);
                     mountMediumAction->setCheckable (true);
-                    mountMediumAction->setChecked (!attachment.GetMedium().isNull() &&
-                                                   medium.GetId() == currentId);
+                    mountMediumAction->setChecked (!currentMedium.isNull() && medium.GetId() == currentId);
                     mountMediumAction->setData (QVariant::fromValue (MountTarget (attachment.GetController().GetName(),
                                                                                   attachment.GetPort(),
@@ -2256 +2253 @@
                     connect (mountMediumAction, SIGNAL (triggered (bool)), this, SLOT (mountMedium()));
                     attachmentMenu->addAction (mountMediumAction);
-                    ++ addedIntoList;
-                    if (addedIntoList == maxMediumsToBeShown)
+                    ++ mediumsToBeShown;
+                    if (mediumsToBeShown == maxMediumsToBeShown)
                         break;
                 }
@@ -2278 +2275 @@
             /* Unmount Medium action */
             QAction *unmountMediumAction = new QAction (attachmentMenu);
-            unmountMediumAction->setEnabled (!attachment.GetMedium().isNull());
+            unmountMediumAction->setEnabled (!currentMedium.isNull());
             unmountMediumAction->setData (QVariant::fromValue (MountTarget (attachment.GetController().GetName(),
                                                                             attachment.GetPort(),