Changeset 63323 in vbox

Timestamp:

Aug 11, 2016 11:18:01 AM (9 years ago)

Author:

vboxsync

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

109957

Message:

QtGui: warnings

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• runtime/information/Makefile.kup (added)
• runtime/information/UIInformationDataItem.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -4675 +4675 @@
         return true;
 
-#if defined (VBOX_WS_WIN) || defined (VBOX_WS_X11)
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
 
     return vboxGlobal().activateWindow(id, true);
 
-#elif defined (VBOX_WS_MAC)
+#elif defined(VBOX_WS_MAC)
     /*
      * This is just for the case were the other process cannot steal
@@ -4694 +4694 @@
     return !rc;
 
+#else
+
+    return false;
+
 #endif
 
-    return false;
 
     /// @todo Below is the old method of switching to the console window

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationDataItem.cpp

@@ -58 +58 @@
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+
 
 UIInformationDataItem::UIInformationDataItem(InformationElementType type, const CMachine &machine, const CConsole &console, UIInformationModel *pModel)
@@ -1082 +1083 @@
 }
 
+#ifdef _MSC_VER
+# pragma warning(push)
+# pragma warning(disable:4702) /* Something about the foreach (const CStorageController &controller, controllers) statement... */
+#endif
+
 QVariant UIInformationDataStorageStatistics::data(const QModelIndex &index, int role) const
 {
@@ -1194 +1200 @@
 }
 
+#ifdef _MSC_VER
+# pragma warning(pop)
+#endif
+
 QString UIInformationDataStorageStatistics::parseStatistics(const QString &strText)
 {