Changeset 27415 in vbox

Timestamp:

Mar 16, 2010 4:35:53 PM (15 years ago)

Author:

vboxsync

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

58889

Message:

FE/Qt4: New running VM core: renaming UIMachineView::availableGeometry() => UIMachineView::workingArea() to avoid name conflicts with Qt.

Location:

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

Files:

• UIMachineView.h (modified) (1 diff)
• fullscreen/UIMachineViewFullscreen.cpp (modified) (4 diffs)
• fullscreen/UIMachineViewFullscreen.h (modified) (1 diff)
• normal/UIMachineViewNormal.cpp (modified) (2 diffs)
• normal/UIMachineViewNormal.h (modified) (1 diff)
• seamless/UIMachineViewSeamless.cpp (modified) (3 diffs)
• seamless/UIMachineViewSeamless.h (modified) (1 diff)

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

@@ -128 +128 @@
     void updateMouseCursorClipping();
 #endif
-    virtual QRect availableGeometry() = 0;
+    virtual QRect workingArea() = 0;
     virtual void calculateDesktopGeometry() = 0;
     virtual void maybeRestrictMinimumSize() = 0;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp

@@ -137 +137 @@
     /* Check if we should resize guest to fullscreen, all the
      * required features will be tested in sltPerformGuestResize(...): */
-    if ((int)frameBuffer()->width() != availableGeometry().size().width() ||
-        (int)frameBuffer()->height() != availableGeometry().size().height())
-        sltPerformGuestResize(availableGeometry().size());
+    if ((int)frameBuffer()->width() != workingArea().size().width() ||
+        (int)frameBuffer()->height() != workingArea().size().height())
+        sltPerformGuestResize(workingArea().size());
 }
 
@@ -198 +198 @@
                 /* Send guest-resize hint only if top window resizing to required dimension: */
                 QResizeEvent *pResizeEvent = static_cast<QResizeEvent*>(pEvent);
-                if (pResizeEvent->size() != availableGeometry().size())
+                if (pResizeEvent->size() != workingArea().size())
                     break;
 
@@ -290 +290 @@
 }
 
-QRect UIMachineViewFullscreen::availableGeometry()
+QRect UIMachineViewFullscreen::workingArea()
 {
     return QApplication::desktop()->screenGeometry(this);
@@ -302 +302 @@
     if (desktopGeometryType() == DesktopGeo_Automatic)
     {
-        m_desktopGeometry = QSize(availableGeometry().width(), availableGeometry().height());
+        m_desktopGeometry = QSize(workingArea().width(), workingArea().height());
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.h

@@ -78 +78 @@
     /* Private helpers: */
     void normalizeGeometry(bool /* fAdjustPosition */) {}
-    QRect availableGeometry();
+    QRect workingArea();
     void calculateDesktopGeometry();
     void maybeRestrictMinimumSize();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp

@@ -317 +317 @@
 }
 
-QRect UIMachineViewNormal::availableGeometry()
+QRect UIMachineViewNormal::workingArea()
 {
     return QApplication::desktop()->availableGeometry(this);
@@ -335 +335 @@
         QRect centralWidgetGeo = static_cast<QMainWindow*>(machineWindowWrapper()->machineWindow())->centralWidget()->geometry();
         /* To work out how big we can make the console window while still fitting on the desktop,
-         * we calculate availableGeometry() - (windowGeo - centralWidgetGeo).
+         * we calculate workingArea() - (windowGeo - centralWidgetGeo).
          * This works because the difference between machine window and machine central widget
          * (or at least its width and height) is a constant. */
-        m_desktopGeometry = QSize(availableGeometry().width() - (windowGeo.width() - centralWidgetGeo.width()),
-                                  availableGeometry().height() - (windowGeo.height() - centralWidgetGeo.height()));
+        m_desktopGeometry = QSize(workingArea().width() - (windowGeo.width() - centralWidgetGeo.width()),
+                                  workingArea().height() - (windowGeo.height() - centralWidgetGeo.height()));
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.h

@@ -76 +76 @@
     /* Private helpers: */
     void normalizeGeometry(bool fAdjustPosition);
-    QRect availableGeometry();
+    QRect workingArea();
     void calculateDesktopGeometry();
     void maybeRestrictMinimumSize();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp

@@ -210 +210 @@
                 /* Send guest-resize hint only if top window resizing to required dimension: */
                 QResizeEvent *pResizeEvent = static_cast<QResizeEvent*>(pEvent);
-                if (pResizeEvent->size() != availableGeometry().size())
+                if (pResizeEvent->size() != workingArea().size())
                     break;
 
@@ -291 +291 @@
 }
 
-QRect UIMachineViewSeamless::availableGeometry()
-{
-//    return machineWindowWrapper()->machineLogic()->availableGeometry(screenId());
-
+QRect UIMachineViewSeamless::workingArea()
+{
     return QApplication::desktop()->availableGeometry(this);
 }
@@ -305 +303 @@
     if (desktopGeometryType() == DesktopGeo_Automatic)
     {
-        m_desktopGeometry = QSize(availableGeometry().width(), availableGeometry().height());
-    }
-}
-
+        m_desktopGeometry = QSize(workingArea().width(), workingArea().height());
+    }
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.h

@@ -75 +75 @@
     /* Private helpers: */
     void normalizeGeometry(bool /* fAdjustPosition */) {}
-    QRect availableGeometry();
+    QRect workingArea();
     void calculateDesktopGeometry();
     void maybeRestrictMinimumSize() {}