Changeset 8865 in vbox for trunk/src/VBox

Timestamp:

May 15, 2008 3:18:40 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Replaced deprecated topLevelWidget method by new window method.

Location:

trunk/src/VBox/Frontends/VirtualBox4/src

Files:

• VBoxConsoleView.cpp (modified) (5 diffs)
• VBoxDownloaderWgt.cpp (modified) (1 diff)
• VBoxGlobal.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleView.cpp

@@ -583 +583 @@
 #else
         /* Return the ID of the top-level console window. */
-        *winId = (ULONG64) mView->topLevelWidget()->winId();
+        *winId = (ULONG64) mView->window()->winId();
 #endif
 
@@ -916 +916 @@
         return;
 
-    QWidget *tlw = topLevelWidget();
+    QWidget *tlw = window();
 
     /* calculate client window offsets */
@@ -933 +933 @@
     fr.setRight (fr.right() + s.width());
     fr.setBottom (fr.bottom() + s.height());
+    printf ("bla %d %d %d %d\n", fr.x(), fr.y(), fr.width(), fr.height());
 
     if (adjustPosition)
@@ -1477 +1478 @@
                  *  make it get out of the dock when the user wishes to show a VM.
                  */
-                topLevelWidget()->show();
-                topLevelWidget()->activateWindow();
+                window()->show();
+                window()->activateWindow();
                 return true;
             }
@@ -3002 +3003 @@
         if (aCapture)
                 XGrabKey (QX11Info::display(), AnyKey, AnyModifier,
-                  topLevelWidget()->winId(), False,
+                  window()->winId(), False,
                   GrabModeAsync, GrabModeAsync);
         else
                 XUngrabKey (QX11Info::display(),  AnyKey, AnyModifier,
-                    topLevelWidget()->winId());
+                    window()->winId());
 #elif defined (Q_WS_MAC)
     if (aCapture)

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxDownloaderWgt.cpp

@@ -265 +265 @@
                 else
                 {
-                    vboxProblem().message (mStatusBar->topLevelWidget(),
+                    vboxProblem().message (mStatusBar->window(),
                         VBoxProblemReporter::Error,
                         tr ("<p>Failed to save the downloaded file as "

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp

@@ -2944 +2944 @@
     if (w)
     {
-        w = w->topLevelWidget();
+        w = w->window();
         deskGeo = QApplication::desktop()->availableGeometry (w);
         parentGeo = w->frameGeometry();
@@ -3336 +3336 @@
             QString result;
 
-            QWidget *topParent = mParent ? mParent->topLevelWidget() : qApp->mainWidget();
+            QWidget *topParent = mParent ? mParent->window() : qApp->mainWidget();
             QString title = mCaption.isNull() ? tr ("Select a directory") : mCaption;
 
@@ -3485 +3485 @@
             QString title = mCaption.isNull() ? tr ("Select a file") : mCaption;
 
-            QWidget *topParent = mParent ? mParent->topLevelWidget() : qApp->mainWidget();
+            QWidget *topParent = mParent ? mParent->window() : qApp->mainWidget();
             QString winFilters = winFilter (mFilters);
             AssertCompile (sizeof (TCHAR) == sizeof (QChar));