Changeset 80445 in vbox for trunk/src/VBox

Timestamp:

Aug 27, 2019 5:51:09 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Committed a bit too much, reverted.

Location:

trunk/src/VBox

Files:

• Devices/USB/VUSBDevice.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/logviewer/UIVMLogPage.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/net/UINetworkManagerIndicator.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/widgets/UIMediaComboBox.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/USB/VUSBDevice.cpp

@@ -1666 +1666 @@
     PRTREQ hReq = NULL;
 
-//    Assert(pDev->hUrbIoThread != NIL_RTTHREAD);
+    Assert(pDev->hUrbIoThread != NIL_RTTHREAD);
     if (RT_LIKELY(pDev->hUrbIoThread != NIL_RTTHREAD))
     {

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogPage.cpp

@@ -193 +193 @@
     if (m_bookmarkVector.size() <= index)
          return;
-    //m_bookmarkVector.remove(index, 1);
+    m_bookmarkVector.remove(index, 1);
     updateTextEditBookmarkLineSet();
 }

trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerIndicator.cpp

@@ -117 +117 @@
 
     /* Delete corresponding network-request: */
-    RT_NOREF(iIndexOfRequiredElement);
-    //m_ids.remove(iIndexOfRequiredElement);
-    //m_data.remove(iIndexOfRequiredElement);
+    m_ids.remove(iIndexOfRequiredElement);
+    m_data.remove(iIndexOfRequiredElement);
 
     /* Update appearance: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediaComboBox.cpp

@@ -49 +49 @@
     {
         removeItem(0);
-        //m_media.erase(m_media.begin());
+        m_media.erase(m_media.begin());
     }
 
@@ -165 +165 @@
     /* Replace medium from combo-box: */
     removeItem(iIndex);
-    //m_media.erase(m_media.begin() + iIndex);
+    m_media.erase(m_media.begin() + iIndex);
 
     /* If no real medium left, add the NULL medium: */