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

Timestamp:

Feb 2, 2010 8:37:36 PM (15 years ago)

Author:

vboxsync

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

57185

Message:

Main: get rid of Backupable<>::hasActualChanges and the operator== in all the machine data structures which it required; nuke obsolete Shareable.h

Location:

trunk/src/VBox/Main/include

Files:

• AudioAdapterImpl.h (modified) (2 diffs)
• MachineImpl.h (modified) (3 diffs)
• MediumAttachmentImpl.h (modified) (1 diff)
• NetworkAdapterImpl.h (modified) (2 diffs)
• ParallelPortImpl.h (modified) (1 diff)
• SerialPortImpl.h (modified) (1 diff)
• Shareable.h (deleted)
• StorageControllerImpl.h (modified) (1 diff)
• USBControllerImpl.h (modified) (1 diff)
• VRDPServerImpl.h (modified) (2 diffs)
• VirtualBoxBase.h (modified) (1 diff)

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

@@ -44 +44 @@
         Data();
 
-        bool operator== (const Data &that) const
-        {
-            return this == &that ||
-                   (mEnabled == that.mEnabled &&
-                    mAudioDriver == that.mAudioDriver &&
-                    mAudioController == that.mAudioController);
-        }
-
         BOOL mEnabled;
         AudioDriverType_T mAudioDriver;
@@ -92 +84 @@
     HRESULT saveSettings(settings::AudioAdapter &data);
 
-    bool rollback();
+    void rollback();
     void commit();
     void copyFrom(AudioAdapter *aThat);

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

@@ -225 +225 @@
         ~UserData();
 
-        bool operator==(const UserData &that) const
-        {
-            return this == &that
-                || (   mName                 == that.mName
-                    && mNameSync             == that.mNameSync
-                    && mDescription          == that.mDescription
-                    && mOSTypeId             == that.mOSTypeId
-                    && mSnapshotFolderFull   == that.mSnapshotFolderFull
-                    && mTeleporterEnabled    == that.mTeleporterEnabled
-                    && mTeleporterPort       == that.mTeleporterPort
-                    && mTeleporterAddress    == that.mTeleporterAddress
-                    && mTeleporterPassword   == that.mTeleporterPassword
-                    && mRTCUseUTC            == that.mRTCUseUTC);
-        }
-
         Bstr    mName;
         BOOL    mNameSync;
@@ -279 +264 @@
         HWData();
         ~HWData();
-
-        bool operator==(const HWData &that) const;
 
         Bstr           mHWVersion;
@@ -333 +316 @@
         MediaData();
         ~MediaData();
-
-        bool operator==(const MediaData &that) const;
 
         typedef std::list< ComObjPtr<MediumAttachment> > AttachmentList;

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

@@ -68 +68 @@
 
     // public internal methods
-    bool rollback();
+    void rollback();
     void commit();
 

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

@@ -50 +50 @@
                  mNATNetwork("") /* cannot be null */
         {}
-
-        bool operator== (const Data &that) const
-        {
-            return this == &that ||
-                   (mSlot == that.mSlot &&
-                    mEnabled == that.mEnabled &&
-                    mMACAddress == that.mMACAddress &&
-                    mAttachmentType == that.mAttachmentType &&
-                    mCableConnected == that.mCableConnected &&
-                    mLineSpeed == that.mLineSpeed &&
-                    mTraceEnabled == that.mTraceEnabled &&
-                    mHostInterface == that.mHostInterface &&
-                    mInternalNetwork == that.mInternalNetwork &&
-                    mNATNetwork == that.mNATNetwork);
-        }
 
         NetworkAdapterType_T mAdapterType;
@@ -139 +124 @@
     HRESULT saveSettings(settings::NetworkAdapter &data);
 
-    bool rollback();
+    bool isModified();
+    void rollback();
     void commit();
     void copyFrom (NetworkAdapter *aThat);

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

@@ -78 +78 @@
     HRESULT saveSettings(settings::ParallelPort &data);
 
-    bool rollback();
+    bool isModified();
+    void rollback();
     void commit();
     void copyFrom(ParallelPort *aThat);

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

@@ -84 +84 @@
     HRESULT saveSettings(settings::SerialPort &data);
 
-    bool rollback();
+    bool isModified();
+    void rollback();
     void commit();
     void copyFrom(SerialPort *aThat);

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

@@ -89 +89 @@
     ULONG getInstance() const;
 
-    bool rollback();
+    void rollback();
     void commit();
 

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

@@ -83 +83 @@
     HRESULT saveSettings(settings::USBController &data);
 
-    bool rollback();
+    void rollback();
     void commit();
     void copyFrom (USBController *aThat);

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

@@ -44 +44 @@
     struct Data
     {
-        bool operator== (const Data &that) const
-        {
-            return this == &that ||
-                   (mEnabled == that.mEnabled &&
-                    mVRDPPorts == that.mVRDPPorts &&
-                    mVRDPAddress == that.mVRDPAddress &&
-                    mAuthType == that.mAuthType &&
-                    mAuthTimeout == that.mAuthTimeout &&
-                    mAllowMultiConnection == that.mAllowMultiConnection &&
-                    mReuseSingleConnection == that.mReuseSingleConnection);
-        }
-
         BOOL mEnabled;
         Bstr mVRDPPorts;
@@ -111 +99 @@
     HRESULT saveSettings(settings::VRDPSettings &data);
 
-    bool rollback();
+    void rollback();
     void commit();
     void copyFrom (VRDPServer *aThat);

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

@@ -1680 +1680 @@
     }
 
-    bool hasActualChanges() const
-    {
-        AssertMsg(this->mData, ("data must not be NULL"));
-        return this->mData != NULL && mBackupData != NULL &&
-               !(*this->mData == *mBackupData);
-    }
-
     D *backedUpData() const
     {