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

Timestamp:

Mar 28, 2016 5:00:26 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: ​​​bugref:8308: Event handlers rework/cleanup (part 05): Some obsolete junk.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIConsoleEventHandler.cpp (modified) (1 diff)
• UISession.cpp (modified) (2 diffs)
• UISession.h (modified) (3 diffs)

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

@@ -224 +224 @@
 #else /* !Q_WS_MAC */
     /* Return the ID of the top-level machine-window. */
-    winId = (ULONG64)m_pSession->winId();
+    winId = (ULONG64)m_pSession->mainMachineWindowId();
 #endif /* !Q_WS_MAC */
 }

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

@@ -484 +484 @@
 {
     return machineLogic() ? machineLogic()->mainMachineWindow() : 0;
+}
+
+WId UISession::mainMachineWindowId() const
+{
+    return mainMachineWindow()->winId();
 }
 
@@ -1476 +1481 @@
 #endif /* Q_WS_MAC */
 
-WId UISession::winId() const
-{
-    return mainMachineWindow()->winId();
-}
-
 /** Generate a BGRA bitmap which approximates a XOR/AND mouse pointer.
  *

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

@@ -124 +124 @@
     UIMachineLogic* machineLogic() const;
     QWidget* mainMachineWindow() const;
+    WId mainMachineWindowId() const;
     QCursor cursor() const { return m_cursor; }
 
@@ -393 +394 @@
 
     /* Common helpers: */
-    WId winId() const;
     void setPointerShape(const uchar *pShapeData, bool fHasAlpha, uint uXHot, uint uYHot, uint uWidth, uint uHeight);
     bool preprocessInitialization();
@@ -540 +540 @@
     /** Holds VM's effective paravirtualization provider. */
     KParavirtProvider m_paraVirtProvider;
-
-    /* Friend classes: */
-    friend class UIConsoleEventHandler;
 };