Changeset 26088 in vbox for trunk/src/VBox/Main

Timestamp:

Jan 28, 2010 4:50:32 PM (15 years ago)

Author:

vboxsync

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

57051

Message:

Main: debugging notes, coding style

Location:

trunk/src/VBox/Main

Files:

• AudioAdapterImpl.cpp (modified) (3 diffs)
• MachineImpl.cpp (modified) (2 diffs)
• SnapshotImpl.cpp (modified) (1 diff)
• include/AudioAdapterImpl.h (modified) (2 diffs)
• include/AutoStateDep.h (modified) (1 diff)

trunk/src/VBox/Main/AudioAdapterImpl.cpp

@@ -414 +414 @@
 }
 
+bool AudioAdapter::isModified()
+{
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    return mData.isBackedUp();
+}
+
+bool AudioAdapter::isReallyModified()
+{
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    return mData.hasActualChanges();
+}
+
 /**
  *  @note Locks this object for writing.
@@ -471 +483 @@
  *  represented by @a aThat (locked for reading).
  */
-void AudioAdapter::copyFrom (AudioAdapter *aThat)
+void AudioAdapter::copyFrom(AudioAdapter *aThat)
 {
     AssertReturnVoid (aThat != NULL);
@@ -489 +501 @@
 
     /* this will back up current data */
-    mData.assignCopy (aThat->mData);
+    mData.assignCopy(aThat->mData);
 }
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

trunk/src/VBox/Main/MachineImpl.cpp

@@ -588 +588 @@
 
         /* commit all changes made during loading the settings file */
-        commit();
+        commit(); // @todo r=dj why do we need a commit during init?!? this is very expensive
     }
     else
@@ -9610 +9610 @@
      * This is copied from registeredInit(), and may or may not be the right
      * way to handle this.
+     *
+     * @todo r=dj review this, this gets called during machine power-down when
+     * we have already saved the machine settings, there's no need to do this
+     * twice.
      */
     Assert(mData->mRegistered);

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -1024 +1024 @@
     if (SUCCEEDED(rc))
         /* commit all changes made during the initialization */
-        commit();
+        commit();   // @todo r=dj why do we need a commit in init?!? this is very expensive
 
     /* Confirm a successful initialization when it's the case */

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

@@ -75 +75 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (Machine *aParent);
-    HRESULT init (Machine *aParent, AudioAdapter *aThat);
-    HRESULT initCopy (Machine *aParent, AudioAdapter *aThat);
+    HRESULT init(Machine *aParent);
+    HRESULT init(Machine *aParent, AudioAdapter *aThat);
+    HRESULT initCopy(Machine *aParent, AudioAdapter *aThat);
     void uninit();
 
     STDMETHOD(COMGETTER(Enabled))(BOOL *aEnabled);
     STDMETHOD(COMSETTER(Enabled))(BOOL aEnabled);
-    STDMETHOD(COMGETTER(AudioDriver)) (AudioDriverType_T *aAudioDriverType);
-    STDMETHOD(COMSETTER(AudioDriver)) (AudioDriverType_T aAudioDriverType);
-    STDMETHOD(COMGETTER(AudioController)) (AudioControllerType_T *aAudioControllerType);
-    STDMETHOD(COMSETTER(AudioController)) (AudioControllerType_T aAudioControllerType);
+    STDMETHOD(COMGETTER(AudioDriver))(AudioDriverType_T *aAudioDriverType);
+    STDMETHOD(COMSETTER(AudioDriver))(AudioDriverType_T aAudioDriverType);
+    STDMETHOD(COMGETTER(AudioController))(AudioControllerType_T *aAudioControllerType);
+    STDMETHOD(COMSETTER(AudioController))(AudioControllerType_T aAudioControllerType);
 
     // public methods only for internal purposes
@@ -92 +92 @@
     HRESULT saveSettings(settings::AudioAdapter &data);
 
-    bool isModified() { AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); return mData.isBackedUp(); }
-    bool isReallyModified() { AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); return mData.hasActualChanges(); }
+    bool isModified();
+    bool isReallyModified();
     bool rollback();
     void commit();
-    void copyFrom (AudioAdapter *aThat);
+    void copyFrom(AudioAdapter *aThat);
 
     // for VirtualBoxSupportErrorInfoImpl

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

@@ -57 +57 @@
 
         AutoStateDependency(Machine *aThat)
-            : mThat(aThat), mRC(S_OK)
-            , mMachineState(MachineState_Null)
-            , mRegistered(FALSE)
+            : mThat(aThat), mRC(S_OK),
+              mMachineState(MachineState_Null),
+              mRegistered(FALSE)
         {
             Assert(aThat);