Changeset 59031 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Dec 7, 2015 4:17:48 PM (9 years ago)

Author:

vboxsync

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

104575

Message:

FE/Qt: Qt5 migration (part 30): Rename Q_WS_WIN32 => Q_WS_WIN, there will be no former with Qt5.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/COMWrappers.xsl (modified) (1 diff)
• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (4 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• selector/UIVMItem.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/COMWrappers.xsl

@@ -109 +109 @@
 <xsl:template match="if" mode="begin">
   <xsl:if test="@target='xpidl'">
-    <xsl:text>#if !defined(Q_WS_WIN32)&#x0A;</xsl:text>
+    <xsl:text>#if !defined(Q_WS_WIN)&#x0A;</xsl:text>
   </xsl:if>
   <xsl:if test="@target='midl'">
-    <xsl:text>#if defined(Q_WS_WIN32)&#x0A;</xsl:text>
+    <xsl:text>#if defined(Q_WS_WIN)&#x0A;</xsl:text>
   </xsl:if>
 </xsl:template>

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

@@ -2674 +2674 @@
 void UIMessageCenter::sltShowUserManual(const QString &strLocation)
 {
-#if defined (Q_WS_WIN32)
+#if defined (Q_WS_WIN)
     HtmlHelp(GetDesktopWindow(), strLocation.utf16(), HH_DISPLAY_TOPIC, NULL);
 #elif defined (Q_WS_X11)

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

@@ -2416 +2416 @@
 QString VBoxGlobal::helpFile() const
 {
-#if defined (Q_WS_WIN32)
+#if defined (Q_WS_WIN)
     const QString name = "VirtualBox";
     const QString suffix = "chm";
@@ -3236 +3236 @@
     bool result = true;
 
-#if defined (Q_WS_WIN32)
+#if defined (Q_WS_WIN)
 
     if (IsIconic (aWId))
@@ -4715 +4715 @@
         return true;
 
-#if defined (Q_WS_WIN32) || defined (Q_WS_X11)
+#if defined (Q_WS_WIN) || defined (Q_WS_X11)
 
     return vboxGlobal().activateWindow(id, true);
@@ -4746 +4746 @@
         return false;
 
-#if defined (Q_WS_WIN32)
+#if defined (Q_WS_WIN)
 
     HWND hwnd = mWinId;

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

@@ -630 +630 @@
 #endif
 
-#if defined (Q_WS_WIN32)
+#if defined (Q_WS_WIN)
     DWORD dwHTMLHelpCookie;
 #endif

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp

@@ -45 +45 @@
 #if 0
 
-#if defined (Q_WS_WIN32)
+#if defined (Q_WS_WIN)
 
 struct EnumWindowsProcData
@@ -112 +112 @@
 static WId FindWindowIdFromPid(ULONG aPid)
 {
-#if defined (Q_WS_WIN32)
+#if defined (Q_WS_WIN)
 
     EnumWindowsProcData d = { aPid, (WId) ~0 };
@@ -335 +335 @@
         return true;
 
-#if defined (Q_WS_WIN32) || defined (Q_WS_X11)
+#if defined (Q_WS_WIN) || defined (Q_WS_X11)
 
     return vboxGlobal().activateWindow(id, true);
@@ -366 +366 @@
         return false;
 
-#if defined (Q_WS_WIN32)
+#if defined (Q_WS_WIN)
 
     HWND hwnd = mWinId;