Changeset 31539 in vbox for trunk/src/VBox/Main/USBControllerImpl.cpp

Timestamp:

Aug 10, 2010 3:40:18 PM (14 years ago)

Author:

vboxsync

Message:

Main: use settings struct for machine user data; remove iprt::MiniString::raw() and change all occurences to c_str()

File:

• trunk/src/VBox/Main/USBControllerImpl.cpp (modified) (9 diffs)

trunk/src/VBox/Main/USBControllerImpl.cpp

@@ -59 +59 @@
 struct USBController::Data
 {
-    Data()
-        : pParent(NULL)
-    {};
+    Data(Machine *pMachine)
+        : pParent(pMachine),
+          pHost(pMachine->getVirtualBox()->host())
+    { }
 
     ~Data()
     {};
 
-    /** Parent object. */
     Machine * const                 pParent;
-    /** Peer object. */
+    Host * const                    pHost;
+
+    // peer machine's USB controller
     const ComObjPtr<USBController>  pPeer;
 
@@ -115 +117 @@
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
-    m = new Data();
-
-    unconst(m->pParent) = aParent;
+    m = new Data(aParent);
+
     /* mPeer is left null */
 
@@ -153 +154 @@
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
-    m = new Data();
-
-    unconst(m->pParent) = aParent;
+    m = new Data(aParent);
+
     unconst(m->pPeer) = aPeer;
 
@@ -197 +197 @@
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
-    m = new Data();
-
-    unconst(m->pParent) = aParent;
+    m = new Data(aParent);
+
     /* mPeer is left null */
 
@@ -537 +536 @@
     if (filter->getData().mActive && Global::IsOnline(adep.machineState()))
     {
-        USBProxyService *service = m->pParent->getVirtualBox()->host()->usbProxyService();
+        USBProxyService *service = m->pHost->usbProxyService();
         ComAssertRet(service, E_FAIL);
 
@@ -608 +607 @@
     if (filter->getData().mActive && Global::IsOnline(adep.machineState()))
     {
-        USBProxyService *service = m->pParent->getVirtualBox()->host()->usbProxyService();
+        USBProxyService *service = m->pHost->usbProxyService();
         ComAssertRet(service, E_FAIL);
 
@@ -756 +755 @@
     if (m->llDeviceFilters.isBackedUp())
     {
-        USBProxyService *service = m->pParent->getVirtualBox()->host()->usbProxyService();
+        USBProxyService *service = m->pHost->usbProxyService();
         Assert(service);
 
@@ -1007 +1006 @@
     /* we don't modify our data fields -- no need to lock */
 
-    if (aFilter->mInList && m->pParent->isRegistered())
-    {
-        USBProxyService *service = m->pParent->getVirtualBox()->host()->usbProxyService();
+    if (    aFilter->mInList
+         && m->pParent->isRegistered())
+    {
+        USBProxyService *service = m->pHost->usbProxyService();
         ComAssertRet(service, E_FAIL);
 
@@ -1201 +1201 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    USBProxyService *service = m->pParent->getVirtualBox()->host()->usbProxyService();
+    USBProxyService *service = m->pHost->usbProxyService();
     AssertReturn(service, E_FAIL);