儲存庫 vbox 的更動 30792

時間撮記:

2010-7-12 下午12:43:02 (14 年 以前)

作者:

vboxsync

訊息:

FE/Qt: Keyboard-handler: Some code simplification.

檔案:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp (修改) (4 筆差異)

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

@@ -32 +32 @@
 #include "UISession.h"
 #include "UIMachineLogic.h"
-#include "UIMachineWindowNormal.h"
-#include "UIMachineWindowFullscreen.h"
-#include "UIMachineWindowSeamless.h"
-#include "UIMachineWindowScale.h"
+#include "UIMachineWindow.h"
 #include "UIMachineView.h"
 
@@ -122 +119 @@
         m_windows.insert(uIndex, pMachineWindow);
         /* Install event-filter for window: */
-        switch (machineLogic()->visualStateType())
-        {
-            case UIVisualStateType_Normal:
-                static_cast<UIMachineWindowNormal*>(m_windows[uIndex])->installEventFilter(this);
-                break;
-            case UIVisualStateType_Fullscreen:
-                static_cast<UIMachineWindowFullscreen*>(m_windows[uIndex])->installEventFilter(this);
-                break;
-            case UIVisualStateType_Seamless:
-                static_cast<UIMachineWindowSeamless*>(m_windows[uIndex])->installEventFilter(this);
-                break;
-            case UIVisualStateType_Scale:
-                static_cast<UIMachineWindowScale*>(m_windows[uIndex])->installEventFilter(this);
-                break;
-            default:
-                break;
-        }
+        m_windows[uIndex]->machineWindow()->installEventFilter(this);
     }
 
@@ -1467 +1448 @@
     while (!pResultWindow && i != m_windows.constEnd())
     {
-        switch (machineLogic()->visualStateType())
-        {
-            case UIVisualStateType_Normal:
-            {
-                UIMachineWindowNormal *pIteratedWindow = static_cast<UIMachineWindowNormal*>(i.value());
-                if (pIteratedWindow == pWatchedObject)
-                {
-                    pResultWindow = pIteratedWindow;
-                    continue;
-                }
-                break;
-            }
-            case UIVisualStateType_Fullscreen:
-            {
-                UIMachineWindowFullscreen *pIteratedWindow = static_cast<UIMachineWindowFullscreen*>(i.value());
-                if (pIteratedWindow == pWatchedObject)
-                {
-                    pResultWindow = pIteratedWindow;
-                    continue;
-                }
-                break;
-            }
-            case UIVisualStateType_Seamless:
-            {
-                UIMachineWindowSeamless *pIteratedWindow = static_cast<UIMachineWindowSeamless*>(i.value());
-                if (pIteratedWindow == pWatchedObject)
-                {
-                    pResultWindow = pIteratedWindow;
-                    continue;
-                }
-                break;
-            }
-            case UIVisualStateType_Scale:
-            {
-                UIMachineWindowScale *pIteratedWindow = static_cast<UIMachineWindowScale*>(i.value());
-                if (pIteratedWindow == pWatchedObject)
-                {
-                    pResultWindow = pIteratedWindow;
-                    continue;
-                }
-                break;
-            }
-            default:
-                break;
+        UIMachineWindow *pIteratedWindow = i.value();
+        if (pIteratedWindow->machineWindow() == pWatchedObject)
+        {
+            pResultWindow = pIteratedWindow;
+            continue;
         }
         ++i;
@@ -1523 +1465 @@
     while (!pResultView && i != m_views.constEnd())
     {
-        UIMachineView *pIteratedView = qobject_cast<UIMachineView*>(i.value());
+        UIMachineView *pIteratedView = i.value();
         if (pIteratedView == pWatchedObject)
         {