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

Timestamp:

Dec 2, 2015 12:41:53 PM (9 years ago)

Author:

vboxsync

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

104457

Message:

FE/Qt: Qt5 migration (part 26): Qt5 vs LONG64 conflict.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMainEventListener.cpp (modified) (1 diff)
• globals/UIMainEventListener.h (modified) (1 diff)
• runtime/UIConsoleEventHandler.cpp (modified) (2 diffs)
• runtime/UIConsoleEventHandler.h (modified) (1 diff)

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

@@ -262 +262 @@
             CShowWindowEvent es(pEvent);
             /* Has to be done in place to give an answer: */
-            LONG64 winId = es.GetWinId();
+            qint64 winId = es.GetWinId();
             if (winId != 0)
                 break; /* Already set by some listener. */

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

@@ -112 +112 @@
     void sigCanShowWindow(bool &fVeto, QString &strReason); /* use Qt::DirectConnection */
     /** Notifies about VM window with specified @a winId should be shown. */
-    void sigShowWindow(LONG64 &winId); /* use Qt::DirectConnection */
+    void sigShowWindow(qint64 &winId); /* use Qt::DirectConnection */
 
 public:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp

@@ -65 +65 @@
 }
 
-void UIConsoleEventHandler::sltShowWindow(LONG64 &winId)
+void UIConsoleEventHandler::sltShowWindow(qint64 &winId)
 {
 #ifdef Q_WS_MAC
@@ -192 +192 @@
     /* This returns a winId, so we have to respond to the event and have to use
      * a direct connection therefor. */
-    connect(pListener->getWrapped(), SIGNAL(sigShowWindow(LONG64&)),
-            this, SLOT(sltShowWindow(LONG64&)),
+    connect(pListener->getWrapped(), SIGNAL(sigShowWindow(qint64&)),
+            this, SLOT(sltShowWindow(qint64&)),
             Qt::DirectConnection);
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.h

@@ -92 +92 @@
     void sltCanShowWindow(bool &fVeto, QString &strReason);
     /** Shows VM window if possible. */
-    void sltShowWindow(LONG64 &winId);
+    void sltShowWindow(qint64 &winId);
 
 private: