Changeset 63315 in vbox for trunk/src/VBox

Timestamp:

Aug 11, 2016 10:17:35 AM (8 years ago)

Author:

vboxsync

Message:

QtGui: warnings

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• medium/UIMediumManager.h (modified) (1 diff)
• platform/win/VBoxUtils-win.h (modified) (3 diffs)
• platform/win/WinKeyboard.cpp (modified) (3 diffs)
• platform/win/WinKeyboard.h (modified) (2 diffs)
• selector/graphics/chooser/UIGChooserModel.cpp (modified) (1 diff)
• settings/UISettingsDefs.h (modified) (1 diff)
• widgets/UIPopupStack.cpp (modified) (1 diff)
• wizards/UIWizardPage.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h

@@ -43 +43 @@
 {
 public:
+    virtual ~CheckIfSuitableBy() { /* Makes MSC happy. */ }
+
     /** Determines whether passed @a pItem is suitable. */
     virtual bool isItSuitable(UIMediumItem *pItem) const = 0;

trunk/src/VBox/Frontends/VirtualBox/src/platform/win/VBoxUtils-win.h

@@ -16 +16 @@
  */
 
-#ifndef __VBoxUtils_WIN_h__
-#define __VBoxUtils_WIN_h__
+#ifndef ___VBoxUtils_WIN_h___
+#define ___VBoxUtils_WIN_h___
 
 /* Qt includes: */
@@ -23 +23 @@
 
 /* Platform includes: */
-#include "Windows.h"
+#include <iprt/win/windows.h>
 
 /* Namespace for native window sub-system functions: */
@@ -32 +32 @@
 }
 
-#endif /* __VBoxUtils_WIN_h__ */
+#endif
 

trunk/src/VBox/Frontends/VirtualBox/src/platform/win/WinKeyboard.cpp

@@ -192 +192 @@
 static bool doesCurrentLayoutHaveAltGr()
 {
-    /** Keyboard state array with VK_CONTROL and VK_MENU depressed. */
-    const BYTE auKeyStates[256] =
-        { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x80, 0x80 };
+    /* Keyboard state array with VK_CONTROL and VK_MENU depressed. */
+    static const BYTE s_auKeyStates[256] =
+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x80, 0x80 };
     WORD ach;
     unsigned i;
@@ -200 +200 @@
     for (i = '0'; i <= VK_OEM_102; ++i)
     {
-        if (ToAscii(i, 0, auKeyStates, &ach, 0))
+        if (ToAscii(i, 0, s_auKeyStates, &ach, 0))
             break;
         /* Skip ranges of virtual keys which are undefined or not relevant. */
@@ -269 +269 @@
                                                    bool fExtendedKey) const
 {
+    if (iDownScanCode != 0x1d /* scan code: Control */ || fExtendedKey)
+        return false;
+
+    LONG messageTime = GetMessageTime();
     MSG peekMsg;
-    LONG messageTime = GetMessageTime();
-
-    if (   iDownScanCode != 0x1d /* scan code: Control */ || fExtendedKey)
-        return false;
     if (!PeekMessage(&peekMsg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_NOREMOVE))
         return false;
-
-        if (messageTime != peekMsg.time)
-            return false;
-        if (   fKeyDown
-        && (peekMsg.message != WM_KEYDOWN && peekMsg.message != WM_SYSKEYDOWN))
+    if (messageTime != (LONG)peekMsg.time)
+        return false;
+
+    if (   fKeyDown
+        && peekMsg.message != WM_KEYDOWN
+        && peekMsg.message != WM_SYSKEYDOWN)
         return false;
     if (   !fKeyDown
-        && (peekMsg.message != WM_KEYUP && peekMsg.message != WM_SYSKEYUP))
-        return false;
-    if (   ((RT_HIWORD(peekMsg.lParam) & 0xFF) != 0x38 /* scan code: Alt */)
+        && peekMsg.message != WM_KEYUP
+        && peekMsg.message != WM_SYSKEYUP)
+        return false;
+    if (   (RT_HIWORD(peekMsg.lParam) & 0xFF) != 0x38 /* scan code: Alt */
         || !(RT_HIWORD(peekMsg.lParam) & KF_EXTENDED))
         return false;

trunk/src/VBox/Frontends/VirtualBox/src/platform/win/WinKeyboard.h

@@ -16 +16 @@
  */
 
-#ifndef __WinKeyboard_h__
-#define __WinKeyboard_h__
+#ifndef ___WinKeyboard_h___
+#define ___WinKeyboard_h___
 
 /* Platform includes: */
-#include "Windows.h"
+#include <iprt/win/windows.h>
 
 void * WinHidDevicesKeepLedsState(void);
@@ -80 +80 @@
         FAKE_CONTROL_DOWN
     } m_enmFakeControlDetectionState;
-    DWORD m_timeOfLastKeyEvent;
+    LONG m_timeOfLastKeyEvent;
 };
-#endif /* __WinKeyboard_h__ */
 
+#endif
+

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -1387 +1387 @@
         case QEvent::GraphicsSceneDragLeave:
             return processDragLeaveEvent(static_cast<QGraphicsSceneDragDropEvent*>(pEvent));
+        default: break; /* Shut up MSC */
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDefs.h

@@ -56 +56 @@
     /* Creates empty cache item: */
     UISettingsCache() { m_value = qMakePair(CacheData(), CacheData()); }
+
+    virtual ~UISettingsCache() { /* Makes MSC happy */ }
 
     /* Returns the NON-modifiable REFERENCE to the initial cached data: */

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

@@ -271 +271 @@
             break;
         }
+        default: break; /* Shuts up MSC.  */
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizardPage.h

@@ -16 +16 @@
  */
 
-#ifndef __UIWizardPage_h__
-#define __UIWizardPage_h__
+#ifndef ___UIWizardPage_h___
+#define ___UIWizardPage_h___
 
 /* Global includes: */
@@ -34 +34 @@
 class UIWizardPageBase
 {
+public:
+    virtual ~UIWizardPageBase() { /* Makes MSC happy. */ }
+
 protected:
 
@@ -74 +77 @@
 };
 
-#endif // __UIWizardPage_h__
+#endif