Changeset 10112 in vbox for trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleView.cpp

Timestamp:

Jul 2, 2008 3:00:14 PM (17 years ago)

Author:

vboxsync

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

32622

Message:

FE/Qt4: Make it compile without the Qt3Support library at least on Linux & OS X.

File:

• trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleView.cpp (modified) (4 diffs)

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

@@ -1516 +1516 @@
                 QMouseEvent *me = (QMouseEvent *) e;
                 if (mouseEvent (me->type(), me->pos(), me->globalPos(),
-                                me->button(), me->buttons(), me->modifiers(),
+                                me->buttons(), me->modifiers(),
                                 0, Qt::Horizontal))
                     return true; /* stop further event handling */
@@ -1525 +1525 @@
                 QWheelEvent *we = (QWheelEvent *) e;
                 if (mouseEvent (we->type(), we->pos(), we->globalPos(),
-                                Qt::NoButton, we->buttons(), we->modifiers(),
+                                we->buttons(), we->modifiers(),
                                 we->delta(), we->orientation()))
                     return true; /* stop further event handling */
@@ -2651 +2651 @@
  *  @return     true to consume the event and false to pass it to Qt
  */
-bool VBoxConsoleView::mouseEvent (int aType, const QPoint &aPos,
-                                  const QPoint &aGlobalPos, Qt::ButtonState aButton,
+bool VBoxConsoleView::mouseEvent (int aType, const QPoint &aPos, const QPoint &aGlobalPos,
                                   Qt::MouseButtons aButtons, Qt::KeyboardModifiers aModifiers,
                                   int aWheelDelta, Qt::Orientation aWheelDir)
@@ -2661 +2660 @@
              "MOUSE: type=%03d x=%03d y=%03d btn=%03d btns=%08X mod=%08X "
              "wdelta=%03d wdir=%03d",
-             aType, aPos.x(), aPos.y(), aButton, aButtons, aModifiers,
+             aType, aPos.x(), aPos.y(), aButtons, aModifiers,
              aWheelDelta, aWheelDir);
     mMainWnd->statusBar()->message (buf);
 #else
-    Q_UNUSED (aButton);
     Q_UNUSED (aModifiers);
 #endif