Changeset 47998 in vbox for trunk/src/VBox

Timestamp:

Aug 22, 2013 3:46:10 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 6909: Medium-enumeration cleanup (part 2).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxVMInformationDlg.cpp (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (3 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• medium/UIMediumManager.cpp (modified) (5 diffs)
• medium/UIMediumManager.h (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (3 diffs)
• selector/UISelectorWindow.h (modified) (1 diff)
• selector/graphics/details/UIGDetailsSet.cpp (modified) (1 diff)
• settings/UISettingsDialogSpecific.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (3 diffs)
• settings/machine/UIMachineSettingsStorage.h (modified) (1 diff)
• widgets/VBoxMediaComboBox.cpp (modified) (2 diffs)
• widgets/VBoxMediaComboBox.h (modified) (1 diff)

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

@@ -116 +116 @@
     connect (pMachineWindow->machineView(), SIGNAL (resizeHintDone()), this, SLOT (processStatistics()));
     connect (mInfoStack, SIGNAL (currentChanged (int)), this, SLOT (onPageChanged (int)));
-    connect (&vboxGlobal(), SIGNAL (mediumEnumFinished (const VBoxMediaList &)), this, SLOT (updateDetails()));
+    connect(&vboxGlobal(), SIGNAL(sigMediumEnumerationFinished(const VBoxMediaList&)), this, SLOT(updateDetails()));
     connect (mStatTimer, SIGNAL (timeout()), this, SLOT (processStatistics()));
 

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

@@ -1799 +1799 @@
     AssertReturnVoid(m_pMediumEnumerationThread);
 
-    /* Emit mediumEnumStarted() after we set m_pMediumEnumerationThread to != NULL
+    /* Emit signal *after* we set m_pMediumEnumerationThread to != NULL
      * to cause isMediaEnumerationStarted() to return TRUE from slots: */
-    emit mediumEnumStarted();
+    emit sigMediumEnumerationStarted();
 
     m_pMediumEnumerationThread->start();
@@ -4035 +4035 @@
                 Assert (ev->mIterator != m_mediums.end());
                 *(ev->mIterator) = ev->mMedium;
-                emit mediumEnumerated (*ev->mIterator);
+                emit sigMediumEnumerated(*ev->mIterator);
             }
             else
@@ -4043 +4043 @@
                 delete m_pMediumEnumerationThread;
                 m_pMediumEnumerationThread = 0;
-                emit mediumEnumFinished (m_mediums);
+                emit sigMediumEnumerationFinished(m_mediums);
             }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -385 +385 @@
 
     /* Notifiers: Medium-enumeration stuff: */
-    void mediumEnumStarted();
-    void mediumEnumerated(const UIMedium &medum);
-    void mediumEnumFinished(const VBoxMediaList &mediums);
+    void sigMediumEnumerationStarted();
+    void sigMediumEnumerated(const UIMedium &medium);
+    void sigMediumEnumerationFinished(const VBoxMediaList &mediums);
 
     /** Emitted when a new media is added using #addMedia(). */

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -490 +490 @@
     mButtonBox->button (QDialogButtonBox::Cancel)->setVisible (mDoSelect);
 
-    /* Listen to "media enumeration started" signals */
-    connect (&vboxGlobal(), SIGNAL (mediumEnumStarted()),
-             this, SLOT (mediumEnumStarted()));
-    /* Listen to "media enumeration" signals */
-    connect (&vboxGlobal(), SIGNAL (mediumEnumerated (const UIMedium &)),
-             this, SLOT (mediumEnumerated (const UIMedium &)));
-    /* Listen to "media enumeration finished" signals */
-    connect (&vboxGlobal(), SIGNAL (mediumEnumFinished (const VBoxMediaList &)),
-             this, SLOT (mediumEnumFinished (const VBoxMediaList &)));
+    /* Configure medium-enumeration connections: */
+    connect(&vboxGlobal(), SIGNAL(sigMediumEnumerationStarted()),
+            this, SLOT(sltHandleMediumEnumerationStart()));
+    connect(&vboxGlobal(), SIGNAL(sigMediumEnumerated(const UIMedium&)),
+            this, SLOT(sltHandleMediumEnumerated(const UIMedium&)));
+    connect(&vboxGlobal(), SIGNAL(sigMediumEnumerationFinished(const VBoxMediaList&)),
+            this, SLOT(sltHandleMediumEnumerationFinish(const VBoxMediaList&)));
 
     /* Listen to "media add" signals */
@@ -528 +526 @@
         /* Emulate the finished signal to reuse the code */
         if (!vboxGlobal().isMediaEnumerationStarted())
-            mediumEnumFinished (list);
+            sltHandleMediumEnumerationFinish(list);
     }
 
@@ -967 +965 @@
 }
 
-void UIMediumManager::mediumEnumStarted()
+void UIMediumManager::sltHandleMediumEnumerationStart()
 {
     /* Reset inaccessible flags */
@@ -1001 +999 @@
 }
 
-void UIMediumManager::mediumEnumerated (const UIMedium &aMedium)
+void UIMediumManager::sltHandleMediumEnumerated(const UIMedium &aMedium)
 {
     mediumUpdated (aMedium);
@@ -1008 +1006 @@
 }
 
-void UIMediumManager::mediumEnumFinished (const VBoxMediaList &/* aList */)
+void UIMediumManager::sltHandleMediumEnumerationFinish(const VBoxMediaList &/* aList */)
 {
     mProgressBar->setVisible (false);

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h

@@ -81 +81 @@
     void mediumRemoved (UIMediumType aType, const QString &aId);
 
-    void mediumEnumStarted();
-    void mediumEnumerated (const UIMedium &aMedium);
-    void mediumEnumFinished (const VBoxMediaList &aList);
+    void sltHandleMediumEnumerationStart();
+    void sltHandleMediumEnumerated(const UIMedium &aMedium);
+    void sltHandleMediumEnumerationFinish(const VBoxMediaList &aList);
 
     void doNewMedium();

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -177 +177 @@
 }
 
-void UISelectorWindow::sltMediumEnumFinished()
+void UISelectorWindow::sltHandleMediumEnumerationFinish()
 {
     /* We try to warn about inaccessible mediums only once
@@ -1036 +1036 @@
     /* Make sure user warned about inaccessible medium(s)
      * even if enumeration had finished before selector window shown: */
-    QTimer::singleShot(0, this, SLOT(sltMediumEnumFinished()));
+    QTimer::singleShot(0, this, SLOT(sltHandleMediumEnumerationFinish()));
 }
 
@@ -1403 +1403 @@
 {
     /* Medium enumeration connections: */
-    connect(&vboxGlobal(), SIGNAL(mediumEnumFinished(const VBoxMediaList &)), this, SLOT(sltMediumEnumFinished()));
+    connect(&vboxGlobal(), SIGNAL(sigMediumEnumerationFinished(const VBoxMediaList &)), this, SLOT(sltHandleMediumEnumerationFinish()));
 
     /* Menu-bar connections: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h

@@ -65 +65 @@
 
     /* Handler: Medium enumeration stuff: */
-    void sltMediumEnumFinished();
+    void sltHandleMediumEnumerationFinish();
 
     /* Handler: Menubar/status stuff: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsSet.cpp

@@ -346 +346 @@
 
     /* Meidum-enumeration connections: */
-    connect(&vboxGlobal(), SIGNAL(mediumEnumStarted()), this, SLOT(sltUpdateAppearance()));
-    connect(&vboxGlobal(), SIGNAL(mediumEnumFinished(const VBoxMediaList &)), this, SLOT(sltUpdateAppearance()));
+    connect(&vboxGlobal(), SIGNAL(sigMediumEnumerationStarted()), this, SLOT(sltUpdateAppearance()));
+    connect(&vboxGlobal(), SIGNAL(sigMediumEnumerationFinished(const VBoxMediaList &)), this, SLOT(sltUpdateAppearance()));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -553 +553 @@
 
     /* Allow to reset first-run flag just when medium enumeration was finished: */
-    connect(&vboxGlobal(), SIGNAL(mediumEnumFinished(const VBoxMediaList &)), this, SLOT(sltAllowResetFirstRunFlag()));
+    connect(&vboxGlobal(), SIGNAL(sigMediumEnumerationFinished(const VBoxMediaList &)), this, SLOT(sltAllowResetFirstRunFlag()));
 
     /* Get corresponding machine (required to determine dialog type and page availability): */

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

@@ -1831 +1831 @@
 
     /* Setup connections */
-    connect (&vboxGlobal(), SIGNAL (mediumEnumerated (const UIMedium &)),
-             this, SLOT (mediumUpdated (const UIMedium &)));
+    connect (&vboxGlobal(), SIGNAL (sigMediumEnumerated (const UIMedium &)),
+             this, SLOT (sltHandleMediumUpdated (const UIMedium &)));
     connect (&vboxGlobal(), SIGNAL (mediumUpdated (const UIMedium &)),
-             this, SLOT (mediumUpdated (const UIMedium &)));
+             this, SLOT (sltHandleMediumUpdated (const UIMedium &)));
     connect (&vboxGlobal(), SIGNAL (mediumRemoved (UIMediumType, const QString &)),
-             this, SLOT (mediumRemoved (UIMediumType, const QString &)));
+             this, SLOT (sltHandleMediumRemoved (UIMediumType, const QString &)));
     connect (mAddCtrAction, SIGNAL (triggered (bool)), this, SLOT (addController()));
     connect (mAddIDECtrAction, SIGNAL (triggered (bool)), this, SLOT (addIDEController()));
@@ -2271 +2271 @@
 }
 
-void UIMachineSettingsStorage::mediumUpdated (const UIMedium &aMedium)
+void UIMachineSettingsStorage::sltHandleMediumUpdated(const UIMedium &aMedium)
 {
     QModelIndex rootIndex = mStorageModel->root();
@@ -2292 +2292 @@
 }
 
-void UIMachineSettingsStorage::mediumRemoved (UIMediumType /* aType */, const QString &aMediumId)
+void UIMachineSettingsStorage::sltHandleMediumRemoved(UIMediumType /* aType */, const QString &aMediumId)
 {
     QModelIndex rootIndex = mStorageModel->root();

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h

@@ -682 +682 @@
 private slots:
 
-    void mediumUpdated (const UIMedium &aMedium);
-    void mediumRemoved (UIMediumType aType, const QString &aMediumId);
+    void sltHandleMediumUpdated(const UIMedium &aMedium);
+    void sltHandleMediumRemoved(UIMediumType aType, const QString &aMediumId);
 
     void addController();

trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMediaComboBox.cpp

@@ -38 +38 @@
     setSizePolicy (sp1);
 
-    /* Setup enumeration handlers */
-    connect (&vboxGlobal(), SIGNAL (mediumEnumStarted()),
-             this, SLOT (mediumEnumStarted()));
-    connect (&vboxGlobal(), SIGNAL (mediumEnumerated (const UIMedium &)),
-             this, SLOT (mediumEnumerated (const UIMedium &)));
+    /* Setup medium-enumeration handlers: */
+    connect(&vboxGlobal(), SIGNAL(sigMediumEnumerationStarted()),
+            this, SLOT(sltHandleMediumEnumerationStart()));
+    connect(&vboxGlobal(), SIGNAL(sigMediumEnumerated (const UIMedium&)),
+            this, SLOT(sltHandleMediumEnumerated(const UIMedium&)));
 
     /* Setup update handlers */
@@ -168 +168 @@
 
 
-void VBoxMediaComboBox::mediumEnumStarted()
+void VBoxMediaComboBox::sltHandleMediumEnumerationStart()
 {
     refresh();
 }
 
-void VBoxMediaComboBox::mediumEnumerated (const UIMedium &aMedium)
+void VBoxMediaComboBox::sltHandleMediumEnumerated(const UIMedium &aMedium)
 {
     mediumUpdated (aMedium);

trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMediaComboBox.h

@@ -52 +52 @@
 protected slots:
 
-    void mediumEnumStarted();
-    void mediumEnumerated (const UIMedium &);
+    void sltHandleMediumEnumerationStart();
+    void sltHandleMediumEnumerated(const UIMedium &);
 
     void mediumAdded (const UIMedium &);