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

Timestamp:

Mar 22, 2010 6:13:07 PM (15 years ago)

Author:

vboxsync

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

59148

Message:

Main: remove templates for 'weak' com pointers which do nothing anyway

Location:

trunk/src/VBox/Main

Files:

• ApplianceImpl.cpp (modified) (1 diff)
• AudioAdapterImpl.cpp (modified) (3 diffs)
• AudioSnifferInterface.cpp (modified) (1 diff)
• BIOSSettingsImpl.cpp (modified) (4 diffs)
• ConsoleVRDPServer.cpp (modified) (1 diff)
• DHCPServerImpl.cpp (modified) (2 diffs)
• DisplayImpl.cpp (modified) (2 diffs)
• GuestImpl.cpp (modified) (1 diff)
• HostImpl.cpp (modified) (1 diff)
• HostNetworkInterfaceImpl.cpp (modified) (2 diffs)
• KeyboardImpl.cpp (modified) (1 diff)
• MachineDebuggerImpl.cpp (modified) (2 diffs)
• MachineImpl.cpp (modified) (7 diffs)
• MediumAttachmentImpl.cpp (modified) (2 diffs)
• MediumImpl.cpp (modified) (3 diffs)
• MouseImpl.cpp (modified) (2 diffs)
• NetworkAdapterImpl.cpp (modified) (2 diffs)
• ParallelPortImpl.cpp (modified) (2 diffs)
• ProgressImpl.cpp (modified) (5 diffs)
• SerialPortImpl.cpp (modified) (2 diffs)
• SharedFolderImpl.cpp (modified) (2 diffs)
• SnapshotImpl.cpp (modified) (4 diffs)
• StorageControllerImpl.cpp (modified) (3 diffs)
• SystemPropertiesImpl.cpp (modified) (2 diffs)
• USBControllerImpl.cpp (modified) (2 diffs)
• VFSExplorerImpl.cpp (modified) (1 diff)
• VMMDevInterface.cpp (modified) (1 diff)
• VirtualBoxImpl.cpp (modified) (4 diffs)
• include/ApplianceImpl.h (modified) (1 diff)
• include/AudioAdapterImpl.h (modified) (1 diff)
• include/AudioSnifferInterface.h (modified) (1 diff)
• include/ConsoleVRDPServer.h (modified) (1 diff)
• include/DHCPServerImpl.h (modified) (1 diff)
• include/DisplayImpl.h (modified) (1 diff)
• include/GuestImpl.h (modified) (1 diff)
• include/HostNetworkInterfaceImpl.h (modified) (1 diff)
• include/HostPower.h (modified) (1 diff)
• include/KeyboardImpl.h (modified) (1 diff)
• include/MachineDebuggerImpl.h (modified) (1 diff)
• include/MachineImpl.h (modified) (4 diffs)
• include/MouseImpl.h (modified) (1 diff)
• include/NetworkAdapterImpl.h (modified) (1 diff)
• include/ProgressImpl.h (modified) (1 diff)
• include/SharedFolderImpl.h (modified) (1 diff)
• include/StorageControllerImpl.h (modified) (1 diff)
• include/SystemPropertiesImpl.h (modified) (1 diff)
• include/VFSExplorerImpl.h (modified) (1 diff)
• include/VMMDev.h (modified) (1 diff)
• include/VRDPServerImpl.h (modified) (1 diff)
• include/objectslist.h (modified) (1 diff)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -318 +318 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-DEFINE_EMPTY_CTOR_DTOR(Appliance)
+Appliance::Appliance()
+    : mVirtualBox(NULL)
+{
+}
+
+Appliance::~Appliance()
+{
+}
 
 /**

trunk/src/VBox/Main/AudioAdapterImpl.cpp

@@ -34 +34 @@
 /////////////////////////////////////////////////////////////////////////////
 
-DEFINE_EMPTY_CTOR_DTOR (AudioAdapter)
+AudioAdapter::AudioAdapter()
+    : mParent(NULL)
+{
+}
+
+AudioAdapter::~AudioAdapter()
+{
+}
 
 HRESULT AudioAdapter::FinalConstruct()
@@ -43 +50 @@
 void AudioAdapter::FinalRelease()
 {
-    uninit ();
+    uninit();
 }
 
@@ -169 +176 @@
     mData.free();
 
-    unconst(mPeer).setNull();
-    unconst(mParent).setNull();
+    unconst(mPeer) = NULL;
+    unconst(mParent) = NULL;
 }
 

trunk/src/VBox/Main/AudioSnifferInterface.cpp

@@ -68 +68 @@
 // constructor / destructor
 //
-AudioSniffer::AudioSniffer(Console *console) : mpDrv(NULL)
-{
-    mParent = console;
+AudioSniffer::AudioSniffer(Console *console)
+    : mpDrv(NULL),
+      mParent(console)
+{
 }
 

trunk/src/VBox/Main/BIOSSettingsImpl.cpp

@@ -40 +40 @@
 {
     Data()
+        : pMachine(NULL)
     { }
 
-    ComObjPtr<Machine, ComWeakRef>  pMachine;
-    ComObjPtr<BIOSSettings>         pPeer;
+    Machine * const             pMachine;
+    ComObjPtr<BIOSSettings>     pPeer;
 
     // use the XML settings structure in the members for simplicity
@@ -115 +116 @@
     m = new Data();
 
-    m->pMachine = aParent;
+    unconst(m->pMachine) = aParent;
     m->pPeer = that;
 
@@ -145 +146 @@
     m = new Data();
 
-    m->pMachine = aParent;
+    unconst(m->pMachine) = aParent;
     // mPeer is left null
 
@@ -172 +173 @@
     m->bd.free();
 
-    m->pPeer.setNull();
-    m->pMachine.setNull();
+    unconst(m->pPeer) = NULL;
+    unconst(m->pMachine) = NULL;
 
     delete m;

trunk/src/VBox/Main/ConsoleVRDPServer.cpp

@@ -2170 +2170 @@
         return;
 
-    unconst(mParent).setNull();
+    unconst(mParent) = NULL;
 }
 

trunk/src/VBox/Main/DHCPServerImpl.cpp

@@ -34 +34 @@
 /////////////////////////////////////////////////////////////////////////////
 
-DEFINE_EMPTY_CTOR_DTOR (DHCPServer)
+DHCPServer::DHCPServer()
+    : mVirtualBox(NULL)
+{
+}
+
+DHCPServer::~DHCPServer()
+{
+}
 
 HRESULT DHCPServer::FinalConstruct()
@@ -53 +60 @@
         return;
 
-    unconst(mVirtualBox).setNull();
+    unconst(mVirtualBox) = NULL;
 }
 

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -76 +76 @@
 /////////////////////////////////////////////////////////////////////////////
 
-DEFINE_EMPTY_CTOR_DTOR(Display)
+Display::Display()
+    : mParent(NULL)
+{
+}
+
+Display::~Display()
+{
+}
+
 
 HRESULT Display::FinalConstruct()
@@ -663 +671 @@
         mParent->UnregisterCallback (this);
 
-    unconst(mParent).setNull();
+    unconst(mParent) = NULL;
 
     if (mpDrv)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -111 +111 @@
         return;
 
-    unconst(mParent).setNull();
+    unconst(mParent) = NULL;
 }
 

trunk/src/VBox/Main/HostImpl.cpp

@@ -157 +157 @@
     {};
 
-    ComObjPtr<VirtualBox, ComWeakRef>
-                            pParent;
+    VirtualBox              *pParent;
 
 #ifdef VBOX_WITH_USB

trunk/src/VBox/Main/HostNetworkInterfaceImpl.cpp

@@ -34 +34 @@
 /////////////////////////////////////////////////////////////////////////////
 
-DEFINE_EMPTY_CTOR_DTOR (HostNetworkInterface)
+HostNetworkInterface::HostNetworkInterface()
+    : mVBox(NULL)
+{
+}
+
+HostNetworkInterface::~HostNetworkInterface()
+{
+}
 
 HRESULT HostNetworkInterface::FinalConstruct()
@@ -550 +557 @@
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
-    mVBox = pVBox;
+    unconst(mVBox) = pVBox;
 
     /* If IPv4 address hasn't been initialized */

trunk/src/VBox/Main/KeyboardImpl.cpp

@@ -120 +120 @@
     mfVMMDevInited = true;
 
-    unconst(mParent).setNull();
+    unconst(mParent) = NULL;
 }
 

trunk/src/VBox/Main/MachineDebuggerImpl.cpp

@@ -49 +49 @@
 /////////////////////////////////////////////////////////////////////////////
 
-DEFINE_EMPTY_CTOR_DTOR (MachineDebugger)
+MachineDebugger::MachineDebugger()
+    : mParent(NULL)
+{
+}
+
+MachineDebugger::~MachineDebugger()
+{
+}
 
 HRESULT MachineDebugger::FinalConstruct()
@@ -111 +118 @@
         return;
 
-    unconst(mParent).setNull();
+    unconst(mParent) = NULL;
     mFlushMode = false;
 }

trunk/src/VBox/Main/MachineImpl.cpp

@@ -238 +238 @@
 
 Machine::Machine()
+    : mPeer(NULL), mParent(NULL)
 {}
 
@@ -607 +608 @@
 
     /* mParent is constant during life time, no need to lock */
-    mParent.queryInterfaceTo(aParent);
+    ComObjPtr<VirtualBox> pVirtualBox(mParent);
+    pVirtualBox.queryInterfaceTo(aParent);
 
     return S_OK;
@@ -6050 +6052 @@
 
 /**
+ *  Returns a pointer to the Machine object for this machine that acts like a
+ *  parent for complex machine data objects such as shared folders, etc.
+ *
+ *  For primary Machine objects and for SnapshotMachine objects, returns this
+ *  object's pointer itself. For SessoinMachine objects, returns the peer
+ *  (primary) machine pointer.
+ */
+Machine* Machine::getMachine()
+{
+    if (getClassID() == clsidSessionMachine)
+        return (Machine*)mPeer;
+    return this;
+}
+
+/**
  * Makes sure that there are no machine state dependants. If necessary, waits
  * for the number of dependants to drop to zero.
@@ -9084 +9101 @@
         uninitDataAndChildObjects();
         mData.free();
-        unconst(mParent).setNull();
-        unconst(mPeer).setNull();
+        unconst(mParent) = NULL;
+        unconst(mPeer) = NULL;
         LogFlowThisFuncLeave();
         return;
@@ -9279 +9296 @@
     alock.leave();
 
-    unconst(mParent).setNull();
-    unconst(mPeer).setNull();
+    unconst(mParent) = NULL;
+    unconst(mPeer) = NULL;
 
     LogFlowThisFuncLeave();
@@ -9294 +9311 @@
 RWLockHandle *SessionMachine::lockHandle() const
 {
-    AssertReturn(!mPeer.isNull(), NULL);
+    AssertReturn(mPeer != NULL, NULL);
     return mPeer->lockHandle();
 }
@@ -9588 +9605 @@
         ComObjPtr<Progress> progress;
         progress.createObject();
-        progress->init(mParent, static_cast<IMachine *>(mPeer),
+        progress->init(mParent, mPeer,
                        Bstr(tr("Closing session")), FALSE /* aCancelable */);
         progress.queryInterfaceTo(aProgress);

trunk/src/VBox/Main/MediumAttachmentImpl.cpp

@@ -61 +61 @@
 {
     Data()
+        : pMachine(NULL)
     { }
 
     /** Reference to Machine object, for checking mutable state. */
-    const ComObjPtr<Machine, ComWeakRef> pMachine;
+    Machine * const pMachine;
     /* later: const ComObjPtr<MediumAttachment> mPeer; */
 
@@ -164 +165 @@
     m->bd.free();
 
-    unconst(m->pMachine).setNull();
+    unconst(m->pMachine) = NULL;
 
     delete m;

trunk/src/VBox/Main/MediumImpl.cpp

@@ -88 +88 @@
 {
     Data()
-        : state(MediumState_NotCreated),
+        : pVirtualBox(NULL),
+          state(MediumState_NotCreated),
           size(0),
           readers(0),
@@ -108 +109 @@
 
     /** weak VirtualBox parent */
-    const ComObjPtr<VirtualBox, ComWeakRef> pVirtualBox;
+    VirtualBox * const pVirtualBox;
 
     const Guid id;
@@ -1371 +1372 @@
     m->queryInfoSem = NIL_RTSEMEVENTMULTI;
 
-    unconst(m->pVirtualBox).setNull();
+    unconst(m->pVirtualBox) = NULL;
 }
 

trunk/src/VBox/Main/MouseImpl.cpp

@@ -63 +63 @@
 /////////////////////////////////////////////////////////////////////////////
 
-DEFINE_EMPTY_CTOR_DTOR (Mouse)
+Mouse::Mouse()
+    : mParent(NULL)
+{
+}
+
+Mouse::~Mouse()
+{
+}
+
 
 HRESULT Mouse::FinalConstruct()
@@ -138 +146 @@
     mParent = NULL;
 #else
-    unconst(mParent).setNull();
+    unconst(mParent) = NULL;
 #endif
 }

trunk/src/VBox/Main/NetworkAdapterImpl.cpp

@@ -37 +37 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-DEFINE_EMPTY_CTOR_DTOR (NetworkAdapter)
+NetworkAdapter::NetworkAdapter()
+    : mParent(NULL)
+{
+}
+
+NetworkAdapter::~NetworkAdapter()
+{
+}
 
 HRESULT NetworkAdapter::FinalConstruct()
@@ -174 +181 @@
     mData.free();
 
-    unconst(mPeer).setNull();
-    unconst(mParent).setNull();
+    unconst(mPeer) = NULL;
+    unconst(mParent) = NULL;
 }
 

trunk/src/VBox/Main/ParallelPortImpl.cpp

@@ -42 +42 @@
 {
     Data()
-        : fModified(false)
+        : fModified(false),
+          pMachine(NULL)
     { }
 
     bool                                    fModified;
 
-    const ComObjPtr<Machine, ComWeakRef>    pMachine;
+    Machine * const                         pMachine;
     const ComObjPtr<ParallelPort>           pPeer;
 
@@ -186 +187 @@
     m->bd.free();
 
-    unconst(m->pPeer).setNull();
-    unconst(m->pMachine).setNull();
+    unconst(m->pPeer) = NULL;
+    unconst(m->pMachine) = NULL;
 
     delete m;

trunk/src/VBox/Main/ProgressImpl.cpp

@@ -48 +48 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-DEFINE_EMPTY_CTOR_DTOR (ProgressBase)
+ProgressBase::ProgressBase()
+#if !defined (VBOX_COM_INPROC)
+    : mParent(NULL)
+#endif
+{
+}
+
+ProgressBase::~ProgressBase()
+{
+}
+
 
 /**
@@ -92 +102 @@
  *                      NULL which means initiator = parent, otherwise must not
  *                      be NULL).
- * @param aDescription  Task description.
+ * @param aDescription  ask description.
  * @param aID           Address of result GUID structure (optional).
  *
@@ -127 +137 @@
      * (to avoid cycling); otherwise mInitiator will remain null which means
      * that it is the same as the parent */
-    if (aInitiator && !mParent.equalsTo (aInitiator))
-        unconst(mInitiator) = aInitiator;
+    if (aInitiator)
+    {
+        ComObjPtr<VirtualBox> pVirtualBox(mParent);
+        if (!pVirtualBox.equalsTo(aInitiator))
+            unconst(mInitiator) = aInitiator;
+    }
 #else
     unconst(mInitiator) = aInitiator;
@@ -191 +205 @@
             mParent->removeProgress (mId);
 
-        unconst(mParent).setNull();
+        unconst(mParent) = NULL;
     }
 #endif
@@ -238 +252 @@
         mInitiator.queryInterfaceTo(aInitiator);
     else
-        mParent.queryInterfaceTo(aInitiator);
+    {
+        ComObjPtr<VirtualBox> pVirtualBox(mParent);
+        pVirtualBox.queryInterfaceTo(aInitiator);
+    }
 #else
     mInitiator.queryInterfaceTo(aInitiator);

trunk/src/VBox/Main/SerialPortImpl.cpp

@@ -43 +43 @@
 {
     Data()
-        : fModified(false)
+        : fModified(false),
+          pMachine(NULL)
     { }
 
-    bool                                    fModified;
-
-    const ComObjPtr<Machine, ComWeakRef>    pMachine;
-    const ComObjPtr<SerialPort>             pPeer;
-
-    Backupable<settings::SerialPort>        bd;
+    bool                                fModified;
+
+    Machine * const                     pMachine;
+    const ComObjPtr<SerialPort>         pPeer;
+
+    Backupable<settings::SerialPort>    bd;
 };
 
@@ -189 +190 @@
     m->bd.free();
 
-    unconst(m->pPeer).setNull();
-    unconst(m->pMachine).setNull();
+    unconst(m->pPeer) = NULL;
+    unconst(m->pMachine) = NULL;
 
     delete m;

trunk/src/VBox/Main/SharedFolderImpl.cpp

@@ -36 +36 @@
 
 SharedFolder::SharedFolder()
-    : mParent (NULL)
+    : mParent(NULL),
+      mMachine(NULL),
+      mConsole(NULL),
+      mVirtualBox(NULL)
 {
 }
@@ -248 +251 @@
     unconst(mParent) = NULL;
 
-    unconst(mMachine).setNull();
-    unconst(mConsole).setNull();
-    unconst(mVirtualBox).setNull();
+    unconst(mMachine) = NULL;
+    unconst(mConsole) = NULL;
+    unconst(mVirtualBox) = NULL;
 }
 

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -77 +77 @@
 {
     Data()
+        : pVirtualBox(NULL)
     {
         RTTimeSpecSetMilli(&timeStamp, 0);
@@ -91 +92 @@
 
     /** weak VirtualBox parent */
-    const ComObjPtr<VirtualBox, ComWeakRef> pVirtualBox;
+    VirtualBox * const          pVirtualBox;
 
     // pParent and llChildren are protected by Machine::snapshotsTreeLockHandle()
@@ -1049 +1050 @@
     mData.free();
 
-    unconst(mParent).setNull();
-    unconst(mPeer).setNull();
+    unconst(mParent) = NULL;
+    unconst(mPeer) = NULL;
 
     LogFlowThisFuncLeave();
@@ -1061 +1062 @@
 RWLockHandle *SnapshotMachine::lockHandle() const
 {
-    AssertReturn(!mPeer.isNull(), NULL);
+    AssertReturn(mPeer != NULL, NULL);
     return mPeer->lockHandle();
 }

trunk/src/VBox/Main/StorageControllerImpl.cpp

@@ -80 +80 @@
 {
     Data()
+        : pParent(NULL)
     { }
 
-    const ComObjPtr<Machine, ComWeakRef>    pParent;
-    const ComObjPtr<StorageController>      pPeer;
+    Machine * const                     pParent;
+    const ComObjPtr<StorageController>  pPeer;
 
     Backupable<BackupableStorageControllerData> bd;
@@ -290 +291 @@
     m->pParent->removeDependentChild(this);
 
-    unconst(m->pPeer).setNull();
-    unconst(m->pParent).setNull();
+    unconst(m->pPeer) = NULL;
+    unconst(m->pParent) = NULL;
 
     delete m;
@@ -775 +776 @@
     }
 
-    unconst(m->pPeer).setNull();
-}
-
-const ComObjPtr<Machine, ComWeakRef>& StorageController::getMachine()
+    unconst(m->pPeer) = NULL;
+}
+
+Machine* StorageController::getMachine()
 {
     return m->pParent;

trunk/src/VBox/Main/SystemPropertiesImpl.cpp

@@ -47 +47 @@
 /////////////////////////////////////////////////////////////////////////////
 
-DEFINE_EMPTY_CTOR_DTOR (SystemProperties)
+SystemProperties::SystemProperties()
+    : mParent(NULL)
+{
+}
+
+SystemProperties::~SystemProperties()
+{
+}
+
 
 HRESULT SystemProperties::FinalConstruct()
@@ -170 +178 @@
         return;
 
-    unconst(mParent).setNull();
+    unconst(mParent) = NULL;
 }
 

trunk/src/VBox/Main/USBControllerImpl.cpp

@@ -62 +62 @@
 struct USBController::Data
 {
-    Data() {};
-    ~Data() {};
+    Data()
+        : pParent(NULL)
+    {};
+
+    ~Data()
+    {};
 
     /** Parent object. */
-    const ComObjPtr<Machine, ComWeakRef> pParent;
+    Machine * const                 pParent;
     /** Peer object. */
-    const ComObjPtr<USBController> pPeer;
-
-    Backupable<BackupableUSBData>  bd;
+    const ComObjPtr<USBController>  pPeer;
+
+    Backupable<BackupableUSBData>   bd;
 #ifdef VBOX_WITH_USB
     // the following fields need special backup/rollback/commit handling,
@@ -250 +254 @@
     m->bd.free();
 
-    unconst(m->pPeer).setNull();
-    unconst(m->pParent).setNull();
+    unconst(m->pPeer) = NULL;
+    unconst(m->pParent) = NULL;
 
     delete m;

trunk/src/VBox/Main/VFSExplorerImpl.cpp

@@ -67 +67 @@
 };
 
-DEFINE_EMPTY_CTOR_DTOR(VFSExplorer)
+VFSExplorer::VFSExplorer()
+    : mVirtualBox(NULL)
+{
+}
+
+VFSExplorer::~VFSExplorer()
+{
+}
+
 
 /**

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -89 +89 @@
 // constructor / destructor
 //
-VMMDev::VMMDev(Console *console) : mpDrv(NULL)
-{
-    mParent = console;
+VMMDev::VMMDev(Console *console)
+    : mpDrv(NULL),
+      mParent(console)
+{
     int rc = RTSemEventCreate(&mCredentialsEvent);
     AssertRC(rc);

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -136 +136 @@
      *  is bound to the lifetime of the VirtualBox instance, so it's safe.
      */
-    ComObjPtr<VirtualBox, ComWeakRef> mVirtualBox;
+    VirtualBox        *mVirtualBox;
 };
 
@@ -4345 +4345 @@
 void *VirtualBox::CallbackEvent::handler()
 {
-    if (mVirtualBox.isNull())
+    if (!mVirtualBox)
         return NULL;
 
@@ -4355 +4355 @@
                          autoCaller.state()));
         /* We don't need mVirtualBox any more, so release it */
-        mVirtualBox.setNull();
+        mVirtualBox = NULL;
         return NULL;
     }
@@ -4365 +4365 @@
         callbacks = mVirtualBox->m->llCallbacks;
         /* We don't need mVirtualBox any more, so release it */
-        mVirtualBox.setNull();
+        mVirtualBox = NULL;
     }
 

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

@@ -85 +85 @@
 private:
     /** weak VirtualBox parent */
-    const ComObjPtr<VirtualBox, ComWeakRef> mVirtualBox;
+    VirtualBox* const   mVirtualBox;
 
     struct Data;            // opaque, defined in ApplianceImpl.cpp

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

@@ -93 +93 @@
 private:
 
-    const ComObjPtr<Machine, ComWeakRef> mParent;
+    Machine * const     mParent;
     const ComObjPtr<AudioAdapter> mPeer;
 
-    Backupable<Data> mData;
+    Backupable<Data>    mData;
 };
 

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

@@ -47 +47 @@
     static DECLCALLBACK(void)   drvDestruct(PPDMDRVINS pDrvIns);
 
-    ComObjPtr<Console, ComWeakRef> mParent;
+    Console * const     mParent;
 };
 

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

@@ -287 +287 @@
 private:
 
-    const ComObjPtr<Console, ComWeakRef> mParent;
+    Console * const         mParent;
 };
 

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

@@ -88 +88 @@
 private:
     /** weak VirtualBox parent */
-    const ComObjPtr<VirtualBox, ComWeakRef> mVirtualBox;
+    VirtualBox * const      mVirtualBox;
 
     const Bstr mName;

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

@@ -304 +304 @@
     static DECLCALLBACK(int)   displaySSMLoad(PSSMHANDLE pSSM, void *pvUser, uint32_t uVersion, uint32_t uPass);
 
-    const ComObjPtr<Console, ComWeakRef> mParent;
+    Console * const         mParent;
     /** Pointer to the associated display driver. */
     struct DRVMAINDISPLAY  *mpDrv;

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

@@ -104 +104 @@
     ULONG mCurrentGuestStat[GuestStatisticType_MaxVal];
 
-    ComObjPtr<Console, ComWeakRef> mParent;
+    Console *mParent;
     Data mData;
 };

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

@@ -95 +95 @@
     HostNetworkInterfaceType_T mIfType;
 
-    ComObjPtr<VirtualBox, ComWeakRef> mVBox;
+    VirtualBox * const  mVBox;
 
     struct Data

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

@@ -51 +51 @@
 protected:
 
-    ComObjPtr<VirtualBox, ComWeakRef> mVirtualBox;
+    VirtualBox              *mVirtualBox;
 
-    std::vector <ComPtr<IConsole> > mConsoles;
+    std::vector< ComPtr<IConsole> > mConsoles;
 };
 

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

@@ -96 +96 @@
     static DECLCALLBACK(void)   drvDestruct(PPDMDRVINS pDrvIns);
 
-    const ComObjPtr<Console, ComWeakRef> mParent;
+    Console * const         mParent;
     /** Pointer to the associated keyboard driver. */
     struct DRVMAINKEYBOARD *mpDrv;

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

@@ -96 +96 @@
     bool queueSettings() const;
 
-    const ComObjPtr<Console, ComWeakRef> mParent;
+    Console * const mParent;
     // flags whether settings have been queued because
     // they could not be sent to the VM (not up yet, etc.)

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

@@ -542 +542 @@
      * one) or after doing addCaller() manually.
      */
-    const ComObjPtr<VirtualBox, ComWeakRef>& getVirtualBox() const { return mParent; }
+    VirtualBox* getVirtualBox() const { return mParent; }
 
     /**
@@ -685 +685 @@
     HRESULT checkStateDependency(StateDependency aDepType);
 
-    inline Machine *getMachine();
+    Machine *getMachine();
 
     void ensureNoStateDependencies();
@@ -776 +776 @@
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
 
-    const ComObjPtr<Machine, ComWeakRef> mPeer;
-
-    const ComObjPtr<VirtualBox, ComWeakRef> mParent;
+    Machine* const          mPeer;
+
+    VirtualBox* const       mParent;
 
     uint32_t                m_flModifications;
@@ -1072 +1072 @@
 }
 
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- *  Returns a pointer to the Machine object for this machine that acts like a
- *  parent for complex machine data objects such as shared folders, etc.
- *
- *  For primary Machine objects and for SnapshotMachine objects, returns this
- *  object's pointer itself. For SessoinMachine objects, returns the peer
- *  (primary) machine pointer.
- */
-inline Machine *Machine::getMachine()
-{
-    if (getClassID() == clsidSessionMachine)
-        return mPeer;
-    return this;
-}
-
 
 #endif // ____H_MACHINEIMPL

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

@@ -138 +138 @@
     Console *mParent;
 #else
-    const ComObjPtr<Console, ComWeakRef> mParent;
+    Console * const         mParent;
 #endif
     /** Pointer to the associated mouse driver. */

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

@@ -138 +138 @@
     void generateMACAddress();
 
-    const ComObjPtr<Machine, ComWeakRef> mParent;
+    Machine * const     mParent;
     const ComObjPtr<NetworkAdapter> mPeer;
 
-    bool m_fModified;
-    Backupable<Data> mData;
+    bool                m_fModified;
+    Backupable<Data>    mData;
 };
 

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

@@ -99 +99 @@
 #if !defined (VBOX_COM_INPROC)
     /** Weak parent. */
-    const ComObjPtr<VirtualBox, ComWeakRef> mParent;
-#endif
-
-    const ComPtr<IUnknown> mInitiator;
+    VirtualBox * const      mParent;
+#endif
+
+    const ComPtr<IUnknown>  mInitiator;
 
     const Guid mId;

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

@@ -97 +97 @@
 private:
 
-    VirtualBoxBase *const mParent;
+    VirtualBoxBase * const  mParent;
 
     /* weak parents (only one of them is not null) */
-    const ComObjPtr<Machine, ComWeakRef> mMachine;
-    const ComObjPtr<Console, ComWeakRef> mConsole;
-    const ComObjPtr<VirtualBox, ComWeakRef> mVirtualBox;
+    Machine * const         mMachine;
+    Console * const         mConsole;
+    VirtualBox * const      mVirtualBox;
 
     Data m;

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

@@ -98 +98 @@
 
     /** @note this doesn't require a read lock since mParent is constant. */
-    const ComObjPtr<Machine, ComWeakRef>& getMachine();
+    Machine* getMachine();
 
     ComObjPtr<StorageController> getPeer();

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

@@ -124 +124 @@
     HRESULT setWebServiceAuthLibrary(const Utf8Str &aPath);
 
-    const ComObjPtr<VirtualBox, ComWeakRef> mParent;
+    VirtualBox * const  mParent;
 
-    Utf8Str m_strDefaultMachineFolder;
-    Utf8Str m_strDefaultMachineFolderFull;
-    Utf8Str m_strDefaultHardDiskFolder;
-    Utf8Str m_strDefaultHardDiskFolderFull;
-    Utf8Str m_strDefaultHardDiskFormat;
+    Utf8Str             m_strDefaultMachineFolder;
+    Utf8Str             m_strDefaultMachineFolderFull;
+    Utf8Str             m_strDefaultHardDiskFolder;
+    Utf8Str             m_strDefaultHardDiskFolderFull;
+    Utf8Str             m_strDefaultHardDiskFormat;
 
-    MediumFormatList mMediumFormats;
+    MediumFormatList    mMediumFormats;
 
-    Utf8Str m_strRemoteDisplayAuthLibrary;
-    Utf8Str m_strWebServiceAuthLibrary;
-    ULONG mLogHistoryCount;
-    AudioDriverType_T mDefaultAudioDriver;
+    Utf8Str             m_strRemoteDisplayAuthLibrary;
+    Utf8Str             m_strWebServiceAuthLibrary;
+    ULONG               mLogHistoryCount;
+    AudioDriverType_T   mDefaultAudioDriver;
 
     friend class VirtualBox;

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

@@ -75 +75 @@
 private:
     /* Private member vars */
-    const ComObjPtr<VirtualBox, ComWeakRef> mVirtualBox;
+    VirtualBox * const  mVirtualBox;
 
     struct TaskVFSExplorer;  /* Worker thread helper */

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

@@ -64 +64 @@
     static DECLCALLBACK(void)   drvReset(PPDMDRVINS pDrvIns);
 
-    ComObjPtr<Console, ComWeakRef> mParent;
+    Console * const         mParent;
 
     RTSEMEVENT mCredentialsEvent;

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

@@ -108 +108 @@
 private:
 
-    const ComObjPtr<Machine, ComWeakRef> mParent;
+    Machine * const     mParent;
     const ComObjPtr<VRDPServer> mPeer;
 
-    Backupable<Data> mData;
+    Backupable<Data>    mData;
 };
 

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

@@ -50 +50 @@
 {
 public:
-    typedef ComObjPtr<T, ComStrongRef> MyType;
+    typedef ComObjPtr<T> MyType;
     typedef std::list<MyType> MyList;