Changeset 26796 in vbox

Timestamp:

Feb 25, 2010 1:40:52 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: don't depend on VBoxConsoleView

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxConsoleView.cpp (modified) (1 diff)
• VBoxFBOverlay.cpp (modified) (4 diffs)
• VBoxFBOverlay.h (modified) (2 diffs)

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

@@ -761 +761 @@
     {
         case VBoxDefs::QGLMode:
-            pViewport = new VBoxGLWidget (this, this, NULL);
+            pViewport = new VBoxGLWidget (mConsole, this, NULL);
             break;
         default:

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -1917 +1917 @@
 };
 
-VBoxGLWidget::VBoxGLWidget (VBoxConsoleView *aView, QWidget *aParent, VBoxVHWASettings *aSettings)
+VBoxGLWidget::VBoxGLWidget (CConsole& console, QWidget *aParent, VBoxVHWASettings *aSettings)
     : QGLWidget (new VBoxGLContext(VBoxGLWidget::vboxGLFormat()), aParent),
     mSurfHandleTable(128), /* 128 should be enough */
@@ -1926 +1926 @@
     mRepaintNeeded(false),
 //    mbVGASurfCreated(false),
-    mView(aView),
+    m_console(console),
     mConstructingList(NULL),
     mcRemaining2Contruct(0),
@@ -2120 +2120 @@
     vboxDoVHWACmdExec(cmd);
 
-    CDisplay display = mView->console().GetDisplay();
+    CDisplay display = m_console.GetDisplay();
     Assert (!display.isNull());
 
@@ -4142 +4142 @@
         return;
 
-    mpOverlayWidget = new VBoxGLWidget (mView, mView->viewport(), &mSettings);
+    mpOverlayWidget = new VBoxGLWidget (mView->console(), mView->viewport(), &mSettings);
 
     VBoxGLContext *pc = (VBoxGLContext*)mpOverlayWidget->context();

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h

@@ -1338 +1338 @@
 {
 public:
-    VBoxGLWidget (class VBoxConsoleView *aView, QWidget *aParent, VBoxVHWASettings *aSettings);
+    VBoxGLWidget (CConsole &console, QWidget *aParent, VBoxVHWASettings *aSettings);
     ~VBoxGLWidget();
 
@@ -1535 +1535 @@
     QRect mViewport;
 
-    class VBoxConsoleView *mView;
+    CConsole &m_console;
 
     VBoxVHWASurfList *mConstructingList;