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

Timestamp:

Dec 4, 2009 7:30:50 PM (15 years ago)

Author:

vboxsync

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

55684

Message:

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

Location:

trunk/src/VBox/Main/include

Files:

• ParallelPortImpl.h (modified) (1 diff)
• SerialPortImpl.h (modified) (3 diffs)

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

@@ -93 +93 @@
 
 private:
-
     HRESULT checkSetPath(const Utf8Str &str);
 

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

@@ -42 +42 @@
 {
 public:
-
-    struct Data
-    {
-        Data()
-            : mSlot (0)
-            , mEnabled (FALSE)
-            , mIRQ (4)
-            , mIOBase (0x3f8)
-            , mHostMode (PortMode_Disconnected)
-            , mServer (FALSE)
-        {}
-
-        bool operator== (const Data &that) const
-        {
-            return this == &that ||
-                   (mSlot     == that.mSlot     &&
-                    mEnabled  == that.mEnabled  &&
-                    mIRQ      == that.mIRQ      &&
-                    mIOBase   == that.mIOBase   &&
-                    mHostMode == that.mHostMode &&
-                    mPath     == that.mPath     &&
-                    mServer   == that.mServer);
-        }
-
-        ULONG mSlot;
-        BOOL  mEnabled;
-        ULONG mIRQ;
-        ULONG mIOBase;
-        PortMode_T mHostMode;
-        Bstr  mPath;
-        BOOL  mServer;
-    };
-
     VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT (SerialPort)
 
@@ -118 +85 @@
     HRESULT saveSettings(settings::SerialPort &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 (SerialPort *aThat);
+    void copyFrom(SerialPort *aThat);
+
     void applyDefaults (GuestOSType *aOsType);
 
@@ -132 +100 @@
 
 private:
+    HRESULT checkSetPath(const Utf8Str &str);
 
-    HRESULT checkSetPath (CBSTR aPath);
-
-    const ComObjPtr<Machine, ComWeakRef> mParent;
-    const ComObjPtr<SerialPort> mPeer;
-
-    Backupable<Data> mData;
+    struct Data;
+    Data *m;
 };