Changeset 48089 in vbox for trunk/src/VBox

Timestamp:

Aug 27, 2013 4:00:23 PM (11 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.h (modified) (1 diff)
• medium/UIMedium.cpp (modified) (3 diffs)
• medium/UIMedium.h (modified) (4 diffs)

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

@@ -254 +254 @@
     bool findMedium (const CMedium &, UIMedium &) const;
     UIMedium findMedium (const QString &aMediumId) const;
-
-    /** Compact version of #findMediumTo(). Asserts if not found. */
-    UIMedium getMedium (const CMedium &aObj) const
-    {
-        UIMedium medium;
-        if (!findMedium (aObj, medium))
-            AssertFailed();
-        return medium;
-    }
 
     QString openMediumWithFileOpenDialog(UIMediumType mediumType, QWidget *pParent = 0,

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

@@ -42 +42 @@
 UIMedium& UIMedium::operator=(const UIMedium &other)
 {
-    m_fHidden = other.m_fHidden;
-    m_fAttachedToHiddenMachinesOnly = other.m_fAttachedToHiddenMachinesOnly;
-
     m_medium = other.medium();
     m_type = other.type();
@@ -66 +63 @@
     m_strToolTip = other.tip();
 
+    m_fHidden = other.m_fHidden;
+    m_fAttachedToHiddenMachinesOnly = other.m_fAttachedToHiddenMachinesOnly;
     m_fReadOnly = other.isReadOnly();
     m_fUsedInSnapshots = other.isUsedInSnapshots();
@@ -125 +124 @@
 void UIMedium::refresh()
 {
-    /* We assume these flags are 'false' by default: */
+    /* Flags are 'false' by default: */
     m_fHidden = false;
     m_fAttachedToHiddenMachinesOnly = false;
+    m_fReadOnly = false;
+    m_fUsedInSnapshots = false;
+    m_fHostDrive = false;
 
     /* Detect basic parameters */

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

@@ -89 +89 @@
         : m_type(UIMediumType_Invalid)
         , m_state(KMediumState_NotCreated)
-        , m_fReadOnly(false)
-        , m_fUsedInSnapshots(false)
         , m_pParent(0) { refresh(); }
 
@@ -108 +106 @@
         , m_type(type)
         , m_state(KMediumState_NotCreated)
-        , m_fReadOnly(false)
-        , m_fUsedInSnapshots(false)
         , m_pParent(pParent) { refresh(); }
 
@@ -121 +117 @@
         , m_type(type)
         , m_state(state)
-        , m_fReadOnly(false)
-        , m_fUsedInSnapshots(false)
         , m_pParent(0) { refresh(); }
 
@@ -267 +261 @@
     QString m_strToolTip;
 
+    bool m_fHidden                       : 1;
+    bool m_fAttachedToHiddenMachinesOnly : 1;
     bool m_fReadOnly                     : 1;
     bool m_fUsedInSnapshots              : 1;
     bool m_fHostDrive                    : 1;
-    bool m_fHidden                       : 1;
-    bool m_fAttachedToHiddenMachinesOnly : 1;
 
     QList<QString> m_curStateMachineIds;