Changeset 59032 in vbox

Timestamp:

Dec 7, 2015 4:29:19 PM (9 years ago)

Author:

vboxsync

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

104576

Message:

FE/Qt: Qt5 migration (part 31): Adjusting Windows native stuff to Qt5: No more implicit cast from WId to HWND.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (1 diff)
• runtime/UIKeyboardHandler.cpp (modified) (3 diffs)
• runtime/UIMouseHandler.cpp (modified) (1 diff)

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

@@ -3238 +3238 @@
 #if defined (Q_WS_WIN)
 
-    if (IsIconic (aWId))
-        result &= !!ShowWindow (aWId, SW_RESTORE);
-    else if (!IsWindowVisible (aWId))
-        result &= !!ShowWindow (aWId, SW_SHOW);
-
-    result &= !!SetForegroundWindow (aWId);
+    HWND handle = (HWND)aWId;
+
+    if (IsIconic (handle))
+        result &= !!ShowWindow (handle, SW_RESTORE);
+    else if (!IsWindowVisible (handle))
+        result &= !!ShowWindow (handle, SW_SHOW);
+
+    result &= !!SetForegroundWindow (handle);
 
 #elif defined (Q_WS_X11)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp ¶

@@ -848 +848 @@
 #ifdef Q_WS_WIN
                     if (!isAutoCaptureDisabled() && autoCaptureSetGlobally() &&
-                        GetAncestor(m_views[theListOfViewIds[i]]->winId(), GA_ROOT) == GetForegroundWindow())
+                        GetAncestor((HWND)m_views[theListOfViewIds[i]]->winId(), GA_ROOT) == GetForegroundWindow())
 #else /* Q_WS_WIN */
                     if (!isAutoCaptureDisabled() && autoCaptureSetGlobally())
@@ -1079 +1079 @@
 #ifdef Q_WS_WIN
                     if (!isAutoCaptureDisabled() && autoCaptureSetGlobally() &&
-                        GetAncestor(pWatchedView->winId(), GA_ROOT) == GetForegroundWindow())
+                        GetAncestor((HWND)pWatchedView->winId(), GA_ROOT) == GetForegroundWindow())
 #else /* Q_WS_WIN */
                     if (!isAutoCaptureDisabled() && autoCaptureSetGlobally())
@@ -1200 +1200 @@
 
     MSG message;
-    message.hwnd = m_views[m_iKeyboardHookViewIndex]->winId();
+    message.hwnd = (HWND)m_views[m_iKeyboardHookViewIndex]->winId();
     message.message = msg;
     message.wParam = event.vkCode;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp ¶

@@ -841 +841 @@
 #ifdef Q_WS_WIN
         /* Send pending WM_PAINT events: */
-        ::UpdateWindow(m_viewports[uScreenId]->winId());
+        ::UpdateWindow((HWND)m_viewports[uScreenId]->winId());
 #endif
         mouse().PutMouseEvent(globalPos.x() - m_lastMousePos.x(),