Changeset 101562 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 23, 2023 4:55:58 PM (16 months ago)

Author:

vboxsync

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

159640

Message:

FE/Qt: bugref:10450: Get rid of Qt5 stuff; This one is about touch/enter events related stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/graphics/QIGraphicsView.cpp (modified) (3 diffs)
• runtime/UIMouseHandler.cpp (modified) (3 diffs)
• settings/editors/UIStatusBarEditor.cpp (modified) (2 diffs)
• widgets/UIMiniToolBar.cpp (modified) (1 diff)
• widgets/UIMiniToolBar.h (modified) (1 diff)
• widgets/UITabBar.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/graphics/QIGraphicsView.cpp

@@ -57 +57 @@
             AssertPtrReturn(pTouchEvent, QGraphicsView::event(pEvent));
             /* For touch-screen event we have something special: */
-#ifdef VBOX_IS_QT6_OR_LATER /* QTouchDevice was consumed by QInputDevice in 6.0 */
             if (pTouchEvent->device()->type() == QInputDevice::DeviceType::TouchScreen)
-#else
-            if (pTouchEvent->device()->type() == QTouchDevice::TouchScreen)
-#endif
             {
                 /* Remember where the scrolling was started: */
@@ -78 +74 @@
             AssertPtrReturn(pTouchEvent, QGraphicsView::event(pEvent));
             /* For touch-screen event we have something special: */
-#ifdef VBOX_IS_QT6_OR_LATER /* QTouchDevice was consumed by QInputDevice in 6.0 */
             if (pTouchEvent->device()->type() == QInputDevice::DeviceType::TouchScreen)
-#else
-            if (pTouchEvent->device()->type() == QTouchDevice::TouchScreen)
-#endif
             {
                 /* Determine vertical shift (inverted): */
@@ -105 +97 @@
             AssertPtrReturn(pTouchEvent, QGraphicsView::event(pEvent));
             /* For touch-screen event we have something special: */
-#ifdef VBOX_IS_QT6_OR_LATER /* QTouchDevice was consumed by QInputDevice in 6.0 */
             if (pTouchEvent->device()->type() == QInputDevice::DeviceType::TouchScreen)
-#else
-            if (pTouchEvent->device()->type() == QTouchDevice::TouchScreen)
-#endif
             {
                 /* Reset the scrolling start position: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp

@@ -1192 +1192 @@
         return true;
 
-#ifndef VBOX_IS_QT6_OR_LATER /* QTouchEvent::TouchPoint was replaced by QEventPoint in 6.0 */
-    QVector<LONG64> contacts(pTouchEvent->touchPoints().size());
-#else
     QVector<LONG64> contacts(pTouchEvent->points().size());
-#endif
 
     long xShift = 0, yShift = 0;
 
-#ifdef VBOX_IS_QT6_OR_LATER /* QTouchDevice was consumed by QInputDevice in 6.0 */
     bool fTouchScreen = (pTouchEvent->device()->type() == QInputDevice::DeviceType::TouchScreen);
-#else
-    bool fTouchScreen = (pTouchEvent->device()->type() == QTouchDevice::TouchScreen);
-#endif
     /* Compatibility with previous behavior. If there is no touchpad configured
      * then treat all multitouch events as touchscreen ones: */
@@ -1218 +1210 @@
     /* Pass all multi-touch events into guest: */
     int iTouchPointIndex = 0;
-#ifdef VBOX_IS_QT6_OR_LATER /* QTouchEvent::TouchPoint was replaced by QEventPoint in 6.0 */
     foreach (const QEventPoint &touchPoint, pTouchEvent->points())
-#else
-    foreach (const QTouchEvent::TouchPoint &touchPoint, pTouchEvent->touchPoints())
-#endif
     {
         /* Get touch-point state: */
@@ -1228 +1216 @@
         switch (touchPoint.state())
         {
-#ifdef VBOX_IS_QT6_OR_LATER /* QTouchEvent::TouchPoint was replaced by QEventPoint in 6.0 */
             case QEventPoint::Pressed:
             case QEventPoint::Updated:
             case QEventPoint::Stationary:
-#else
-            case Qt::TouchPointPressed:
-            case Qt::TouchPointMoved:
-            case Qt::TouchPointStationary:
-#endif
                 iTouchPointState = KTouchContactState_InContact;
                 if (fTouchScreen)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStatusBarEditor.cpp

@@ -103 +103 @@
 
     /** Handles mouse-press @a pEvent. */
-    virtual void mousePressEvent(QMouseEvent *pEvent);
+    virtual void mousePressEvent(QMouseEvent *pEvent) RT_OVERRIDE;
     /** Handles mouse-release @a pEvent. */
-    virtual void mouseReleaseEvent(QMouseEvent *pEvent);
+    virtual void mouseReleaseEvent(QMouseEvent *pEvent) RT_OVERRIDE;
     /** Handles mouse-enter @a pEvent. */
-#ifdef VBOX_IS_QT6_OR_LATER /* QWidget::enterEvent uses QEnterEvent since qt6 */
     virtual void enterEvent(QEnterEvent *pEvent) RT_OVERRIDE;
-#else
-    virtual void enterEvent(QEvent *pEvent) RT_OVERRIDE;
-#endif
     /** Handles mouse-leave @a pEvent. */
-    virtual void leaveEvent(QEvent *pEvent);
+    virtual void leaveEvent(QEvent *pEvent) RT_OVERRIDE;
     /** Handles mouse-move @a pEvent. */
-    virtual void mouseMoveEvent(QMouseEvent *pEvent);
+    virtual void mouseMoveEvent(QMouseEvent *pEvent) RT_OVERRIDE;
 
 private:
@@ -320 +316 @@
 }
 
-#ifdef VBOX_IS_QT6_OR_LATER /* QWidget::enterEvent uses QEnterEvent since qt6 */
 void UIStatusBarEditorButton::enterEvent(QEnterEvent*)
-#else
-void UIStatusBarEditorButton::enterEvent(QEvent*)
-#endif
 {
     /* Make sure button isn't hovered: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp

@@ -710 +710 @@
 }
 
-#ifdef VBOX_IS_QT6_OR_LATER /* QWidget::enterEvent uses QEnterEvent since qt6 */
 void UIMiniToolBar::enterEvent(QEnterEvent*)
-#else
-void UIMiniToolBar::enterEvent(QEvent*)
-#endif
 {
     /* Stop the hover-leave timer if necessary: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.h

@@ -127 +127 @@
 
     /** Mouse enter @a pEvent handler. */
-#ifdef VBOX_IS_QT6_OR_LATER /* QWidget::enterEvent uses QEnterEvent since qt6 */
     virtual void enterEvent(QEnterEvent *pEvent) RT_OVERRIDE;
-#else
-    virtual void enterEvent(QEvent *pEvent) RT_OVERRIDE;
-#endif
     /** Mouse leave @a pEvent handler. */
     virtual void leaveEvent(QEvent *pEvent) RT_OVERRIDE;

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp

@@ -125 +125 @@
     virtual void mouseMoveEvent(QMouseEvent *pEvent) RT_OVERRIDE;
     /** Handles mouse-enter @a pEvent. */
-#ifdef VBOX_IS_QT6_OR_LATER /* QWidget::enterEvent uses QEnterEvent since qt6 */
     virtual void enterEvent(QEnterEvent *pEvent) RT_OVERRIDE;
-#else
-    virtual void enterEvent(QEvent *pEvent) RT_OVERRIDE;
-#endif
     /** Handles mouse-leave @a pEvent. */
     virtual void leaveEvent(QEvent *pEvent) RT_OVERRIDE;
@@ -592 +588 @@
 }
 
-#ifdef VBOX_IS_QT6_OR_LATER /* QWidget::enterEvent uses QEnterEvent since qt6 */
 void UITabBarItem::enterEvent(QEnterEvent *pEvent)
-#else
-void UITabBarItem::enterEvent(QEvent *pEvent)
-#endif
 {
     /* Make sure button isn't hovered: */