Changeset 8915 in vbox

Timestamp:

May 19, 2008 12:11:49 PM (17 years ago)

Author:

vboxsync

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

30970

Message:

FE/Qt4: set/mainWidget is deprecated so create our own place to store that bit of information.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxGlobal.h (modified) (2 diffs)
• src/VBoxFBQuartz2D.cpp (modified) (2 diffs)
• src/VBoxGlobal.cpp (modified) (5 diffs)
• src/darwin/DarwinCursor.cpp (modified) (1 diff)
• src/main.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxGlobal.h

@@ -166 +166 @@
     VBoxConsoleWnd &consoleWnd();
 
+    /* main window handle storage */
+    void setMainWindow (QWidget *aMainWindow) { mMainWindow = aMainWindow; }
+    QWidget *mainWindow() const { return mMainWindow; }
+
+
     bool isVMConsoleProcess() const { return !vmUuid.isNull(); }
     QUuid managedVMUuid() const { return vmUuid; }
@@ -623 +628 @@
     VBoxSelectorWnd *mSelectorWnd;
     VBoxConsoleWnd *mConsoleWnd;
+    QWidget* mMainWindow;
 
 #ifdef VBOX_WITH_REGISTRATION

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

@@ -157 +157 @@
     Assert (mImage);
 
-    QWidget *pMain = qApp->mainWidget();
-    Assert (VALID_PTR (pMain));
+    QWidget *main = vboxGlobal().mainWindow();
+    Assert (VALID_PTR (main));
     QWidget* viewport = mView->viewport();
     Assert (VALID_PTR (viewport));
@@ -171 +171 @@
     Assert (VALID_PTR (ctx));
     /* We handle the seamless mode as a special case. */
-    if (qobject_cast <VBoxConsoleWnd *> (pMain)->isTrueSeamless())
+    if (qobject_cast <VBoxConsoleWnd *> (main)->isTrueSeamless())
     {
         /* Here we paint the windows without any wallpaper.

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

@@ -222 +222 @@
                     {
                         if (sVal.isEmpty() ||
-                            sVal == QString ("%1").arg ((long)qApp->mainWidget()->winId()))
+                            sVal == QString ("%1").arg (static_cast<long> (vboxGlobal().mainWindow()->winId())))
                             *allowChange = TRUE;
                         else
@@ -272 +272 @@
                         QApplication::postEvent (&mGlobal, new VBoxCanShowRegDlgEvent (true));
                     }
-                    else if (sVal == QString ("%1").arg ((long) qApp->mainWidget()->winId()))
+                    else if (sVal == QString ("%1").arg (static_cast<long> (vboxGlobal().mainWindow()->winId())))
                     {
                         mIsRegDlgOwner = true;
@@ -3336 +3336 @@
             QString result;
 
-            QWidget *topParent = mParent ? mParent->window() : qApp->mainWidget();
+            QWidget *topParent = mParent ? mParent->window() : vboxGlobal()->mainWindow();
             QString title = mCaption.isNull() ? tr ("Select a directory") : mCaption;
 
@@ -3485 +3485 @@
             QString title = mCaption.isNull() ? tr ("Select a file") : mCaption;
 
-            QWidget *topParent = mParent ? mParent->window() : qApp->mainWidget();
+            QWidget *topParent = mParent ? mParent->window() : vboxGlobal()->mainWindow();
             QString winFilters = winFilter (mFilters);
             AssertCompile (sizeof (TCHAR) == sizeof (QChar));
@@ -3912 +3912 @@
          * the SetExtraData() call. */
         mVBox.SetExtraData (VBoxDefs::GUI_RegistrationDlgWinID,
-            QString ("%1").arg ((long) qApp->mainWidget()->winId()));
+            QString ("%1").arg (static_cast<long> (mMainWindow->winId())));
 
         if (mVBox.isOk())

trunk/src/VBox/Frontends/VirtualBox4/src/darwin/DarwinCursor.cpp

@@ -861 +861 @@
     CursorTestWindow wnd;
 
-    app.setMainWidget(&wnd);
     //wnd.showMaximized();
     wnd.show();

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

@@ -255 +255 @@
             if (vboxGlobal().isVMConsoleProcess())
             {
-                a.setMainWidget (&vboxGlobal().consoleWnd());
+                vboxGlobal().setMainWindow (&vboxGlobal().consoleWnd());
                 if (vboxGlobal().startMachine (vboxGlobal().managedVMUuid()))
                     rc = a.exec();
@@ -265 +265 @@
             else
             {
-                a.setMainWidget (&vboxGlobal().selectorWnd());
+                vboxGlobal().setMainWindow (&vboxGlobal().selectorWnd());
                 vboxGlobal().selectorWnd().show();
 #ifdef VBOX_WITH_REGISTRATION_REQUEST