Changeset 25200 in vbox for trunk/src/VBox/Main/include/MediumAttachmentImpl.h

Timestamp:

Dec 4, 2009 6:19:05 PM (15 years ago)

Author:

vboxsync

Message:

Main: make MediumAttachment instance data private

File:

• trunk/src/VBox/Main/include/MediumAttachmentImpl.h (modified) (5 diffs)

trunk/src/VBox/Main/include/MediumAttachmentImpl.h

@@ -25 +25 @@
 #include "VirtualBoxBase.h"
 
-#include "MediumImpl.h"
-
 class Machine;
 class Medium;
@@ -48 +46 @@
     END_COM_MAP()
 
-    DECLARE_EMPTY_CTOR_DTOR(MediumAttachment)
+    MediumAttachment() { };
+    ~MediumAttachment() { };
 
     // public initializer/uninitializer for internal purposes only
@@ -63 +62 @@
     void FinalRelease();
 
-    bool rollback();
-    void commit();
-
     // IMediumAttachment properties
     STDMETHOD(COMGETTER(Medium))(IMedium **aMedium);
@@ -74 +70 @@
     STDMETHOD(COMGETTER(Passthrough))(BOOL *aPassthrough);
 
-    // unsafe inline public methods for internal purposes only (ensure there is
+    // public internal methods
+    bool rollback();
+    void commit();
+
+    // unsafe public methods for internal purposes only (ensure there is
     // a caller and a read lock before calling them!)
+    bool isImplicit() const;
+    void setImplicit(bool aImplicit);
 
-    bool isImplicit() const { return m->implicit; }
-    void setImplicit(bool aImplicit) { m->implicit = aImplicit; }
+    const ComObjPtr<Medium>& getMedium() const;
+    Bstr getControllerName() const;
+    LONG getPort() const;
+    LONG getDevice() const;
+    DeviceType_T getType() const;
+    bool getPassthrough() const;
 
-    const ComObjPtr<Medium>& getMedium() const { return m->medium; }
-    Bstr getControllerName() const { return m->controllerName; }
-    LONG getPort() const { return m->port; }
-    LONG getDevice() const { return m->device; }
-    DeviceType_T getType() const { return m->type; }
-    bool getPassthrough() const { AutoReadLock lock(this); return m->passthrough; }
-
-    bool matches(CBSTR aControllerName, LONG aPort, LONG aDevice)
-    {
-        return (    aControllerName == m->controllerName
-                 && aPort == m->port
-                 && aDevice == m->device);
-    }
+    bool matches(CBSTR aControllerName, LONG aPort, LONG aDevice);
 
     /** Must be called from under this object's write lock. */
-    void updateMedium(const ComObjPtr<Medium> &aMedium, bool aImplicit)
-    {
-        m.backup();
-        m->medium = aMedium;
-        m->implicit = aImplicit;
-    }
+    void updateMedium(const ComObjPtr<Medium> &aMedium, bool aImplicit);
 
     /** Must be called from under this object's write lock. */
-    void updatePassthrough(bool aPassthrough)
-    {
-        m.backup();
-        m->passthrough = aPassthrough;
-    }
+    void updatePassthrough(bool aPassthrough);
 
     /** Get a unique and somewhat descriptive name for logging. */
@@ -116 +101 @@
 
 private:
-
-    /** Reference to Machine object, for checking mutable state. */
-    const ComObjPtr<Machine, ComWeakRef> mParent;
-    /* later: const ComObjPtr<MediumAttachment> mPeer; */
-
-    struct Data
-    {
-        Data() : port(0), device(0), type(DeviceType_Null),
-                 passthrough(false), implicit(false) {}
-
-        bool operator== (const Data &that) const
-        {
-            return   this == &that
-                   || (passthrough == that.passthrough);
-        }
-
-        ComObjPtr<Medium> medium;
-        /* Since MediumAttachment is not a first class citizen when it
-         * comes to managing settings, having a reference to the storage
-         * controller will not work - when settings are changed it will point
-         * to the old, uninitialized instance. Changing this requires
-         * substantial changes to MediumImpl.cpp. */
-        const Bstr controllerName;
-        const LONG port;
-        const LONG device;
-        const DeviceType_T type;
-        bool passthrough : 1;
-        bool implicit : 1;
-    };
-
-    Backupable<Data> m;
+    struct Data;
+    Data *m;
 
     Utf8Str mLogName;                   /**< For logging purposes */