Changeset 25202 in vbox for trunk/src/VBox/Main/include

Timestamp:

Dec 4, 2009 7:13:21 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

55683

Message:

Main: make ParallelPort instance data private and make it use the XML settings struct for simplicity

File:

• trunk/src/VBox/Main/include/ParallelPortImpl.h (modified) (4 diffs)

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

@@ -40 +40 @@
 {
 public:
-
-    struct Data
-    {
-        Data()
-            : mSlot (0)
-            , mEnabled (FALSE)
-            , mIRQ (4)
-            , mIOBase (0x378)
-        {}
-
-        bool operator== (const Data &that) const
-        {
-            return this == &that ||
-                   (mSlot == that.mSlot &&
-                    mEnabled == that.mEnabled &&
-                    mIRQ == that.mIRQ &&
-                    mIOBase == that.mIOBase &&
-                    mPath == that.mPath);
-        }
-
-        ULONG mSlot;
-        BOOL  mEnabled;
-        ULONG mIRQ;
-        ULONG mIOBase;
-        Bstr  mPath;
-    };
-
     VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT (ParallelPort)
 
@@ -79 +52 @@
     END_COM_MAP()
 
-    DECLARE_EMPTY_CTOR_DTOR (ParallelPort)
+    ParallelPort() {}
+    ~ParallelPort() {}
 
     HRESULT FinalConstruct();
@@ -106 +80 @@
     HRESULT saveSettings(settings::ParallelPort &data);
 
-    bool isModified() { AutoWriteLock alock (this); return mData.isBackedUp(); }
-    bool isReallyModified() { AutoWriteLock alock (this); return mData.hasActualChanges(); }
+    bool isModified();
+    bool isReallyModified();
     bool rollback();
     void commit();
-    void copyFrom (ParallelPort *aThat);
+    void copyFrom(ParallelPort *aThat);
 
     // public methods for internal purposes only
@@ -120 +94 @@
 private:
 
-    HRESULT checkSetPath (CBSTR aPath);
+    HRESULT checkSetPath(const Utf8Str &str);
 
-    const ComObjPtr<Machine, ComWeakRef> mParent;
-    const ComObjPtr<ParallelPort> mPeer;
-
-    Backupable<Data> mData;
+    struct Data;
+    Data *m;
 };