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

Timestamp:

Dec 4, 2009 3:59:34 PM (15 years ago)

Author:

vboxsync

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

55674

Message:

Main: stop USBController from being a VirtualBoxBaseWithChildren; make its instance data private

Location:

trunk/src/VBox/Main/include

Files:

• USBControllerImpl.h (modified) (3 diffs)
• objectslist.h (modified) (3 diffs)

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

@@ -48 +48 @@
 
 class ATL_NO_VTABLE USBController :
-    public VirtualBoxBaseWithChildrenNEXT,
+    public VirtualBoxBase,
     public VirtualBoxSupportErrorInfoImpl<USBController, IUSBController>,
     public VirtualBoxSupportTranslation<USBController>,
     VBOX_SCRIPTABLE_IMPL(IUSBController)
 {
-private:
-
-    struct Data
-    {
-        /* Constructor. */
-        Data() : mEnabled (FALSE), mEnabledEhci (FALSE) { }
-
-        bool operator== (const Data &that) const
-        {
-            return this == &that || (mEnabled == that.mEnabled && mEnabledEhci == that.mEnabledEhci);
-        }
-
-        /** Enabled indicator. */
-        BOOL mEnabled;
-
-        /** Enabled indicator for EHCI. */
-        BOOL mEnabledEhci;
-    };
-
 public:
-
     VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT (USBController)
 
@@ -133 +113 @@
     // public methods for internal purposes only
     // (ensure there is a caller and a read lock before calling them!)
-
-    /** @note this doesn't require a read lock since mParent is constant. */
-    const ComObjPtr<Machine, ComWeakRef> &parent() { return mParent; };
-
-    const Backupable<Data>& getData() { return mData; }
+    Machine* getMachine();
 
     // for VirtualBoxSupportErrorInfoImpl
@@ -144 +120 @@
 private:
 
-#ifdef VBOX_WITH_USB
-    /** specialization for IUSBDeviceFilter */
-    ComObjPtr<USBDeviceFilter> getDependentChild (IUSBDeviceFilter *aFilter)
-    {
-        VirtualBoxBase *child = VirtualBoxBaseWithChildrenNEXT::
-                                getDependentChild (ComPtr<IUnknown> (aFilter));
-        return child ? static_cast <USBDeviceFilter *> (child)
-                     : NULL;
-    }
-#endif /* VBOX_WITH_USB */
-
     void printList();
 
-    /** Parent object. */
-    const ComObjPtr<Machine, ComWeakRef> mParent;
-    /** Peer object. */
-    const ComObjPtr<USBController> mPeer;
-    /** Data. */
-    Backupable<Data> mData;
-
-#ifdef VBOX_WITH_USB
-    // the following fields need special backup/rollback/commit handling,
-    // so they cannot be a part of Data
-
-    typedef std::list <ComObjPtr<USBDeviceFilter> > DeviceFilterList;
-    Backupable <DeviceFilterList> mDeviceFilters;
-#endif /* VBOX_WITH_USB */
+    struct Data;
+    Data *m;
 };
 

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

@@ -67 +67 @@
     }
 
+private:
+    // prohibit copying and assignment
+    ObjectsList(const ObjectsList &d);
+    ObjectsList& operator=(const ObjectsList &d);
+
+public:
+
     /**
      * Returns the lock handle which protects this list, for use with
@@ -113 +120 @@
             m_ll.push_back(*it);
         }
-    }
-
-    /**
-     * Returns the no. of objects on the list (std::list compatibility)
-     * with locking.
-     */
-    size_t size()
-    {
-        AutoReadLock al(m_lock);
-        return m_ll.size();
-    }
-
-    /**
-     * Returns the first object on the list (std::list compatibility)
-     * with locking.
-     */
-    MyType front()
-    {
-        AutoReadLock al(m_lock);
-        return m_ll.front();
-    }
-
-    /**
-     * Returns a raw pointer to the member list of objects.
-     * Does not lock!
-     * @return
-     */
-    MyList& getList()
-    {
-        return m_ll;
-    }
-
-    /**
-     * Returns the begin iterator from the list (std::list compatibility).
-     * Does not lock!
-     * @return
-     */
-    iterator begin()
-    {
-        return m_ll.begin();
-    }
-
-    /**
-     * Returns the end iterator from the list (std::list compatibility).
-     * Does not lock!
-     */
-    iterator end()
-    {
-        return m_ll.end();
     }
 
@@ -181 +139 @@
     }
 
+    /**
+     * Returns the no. of objects on the list (std::list compatibility)
+     * with locking.
+     */
+    size_t size()
+    {
+        AutoReadLock al(m_lock);
+        return m_ll.size();
+    }
+
+    /**
+     * Returns a raw pointer to the member list of objects.
+     * Does not lock!
+     * @return
+     */
+    MyList& getList()
+    {
+        return m_ll;
+    }
+
+    /**
+     * Returns the first object on the list (std::list compatibility)
+     * with locking.
+     */
+    MyType front()
+    {
+        AutoReadLock al(m_lock);
+        return m_ll.front();
+    }
+
+    /**
+     * Returns the begin iterator from the list (std::list compatibility).
+     * Does not lock!
+     * @return
+     */
+    iterator begin()
+    {
+        return m_ll.begin();
+    }
+
+    /**
+     * Returns the end iterator from the list (std::list compatibility).
+     * Does not lock!
+     */
+    iterator end()
+    {
+        return m_ll.end();
+    }
+
+    void insert(iterator it, MyType &p)
+    {
+        m_ll.insert(it, p);
+    }
+
+    void erase(iterator it)
+    {
+        m_ll.erase(it);
+    }
+
 private:
     MyList          m_ll;