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

Timestamp:

Oct 23, 2023 4:25:05 PM (16 months ago)

Author:

vboxsync

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

159639

Message:

FE/Qt: bugref:10450: Get rid of Qt5 stuff; This one is about position/globalPosition stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• activity/overview/UIVMActivityOverviewWidget.cpp (modified) (1 diff)
• activity/vmactivity/UIVMActivityMonitor.cpp (modified) (1 diff)
• extensions/QILabel.cpp (modified) (1 diff)
• extensions/QISplitter.cpp (modified) (1 diff)
• extensions/QIStatusBarIndicator.cpp (modified) (1 diff)
• helpbrowser/UIHelpBrowserWidget.cpp (modified) (1 diff)
• helpbrowser/UIHelpViewer.cpp (modified) (2 diffs)
• logviewer/UIVMLogViewerTextEdit.cpp (modified) (3 diffs)
• runtime/UIMachineView.cpp (modified) (3 diffs)
• runtime/UIMouseHandler.cpp (modified) (4 diffs)
• settings/editors/UIStatusBarEditor.cpp (modified) (3 diffs)
• settings/editors/UIStorageSettingsEditor.cpp (modified) (4 diffs)
• softkeyboard/UISoftKeyboard.cpp (modified) (1 diff)
• widgets/UISpecialControls.cpp (modified) (1 diff)
• widgets/UITabBar.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewWidget.cpp

@@ -760 +760 @@
 void UIVMActivityOverviewTableView::mousePressEvent(QMouseEvent *pEvent)
 {
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::pos was replaced with QSinglePointEvent::position in Qt6 */
-    if (!indexAt(pEvent->pos()).isValid())
-#else
     if (!indexAt(pEvent->position().toPoint()).isValid())
-#endif
         clearSelection();
     QTableView::mousePressEvent(pEvent);

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.cpp

@@ -361 +361 @@
 void UIChart::mouseMoveEvent(QMouseEvent *pEvent)
 {
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::pos, x, y were replaced with QSinglePointEvent::position in Qt6 */
-    int iX = width() - pEvent->x() - m_iMarginRight;
-#else
-    int iX = width() - pEvent->position().x() - m_iMarginRight;
-#endif
+    const int iX = width() - pEvent->position().x() - m_iMarginRight;
     m_iDataIndexUnderCursor = -1;
     if (iX > m_iMarginLeft && iX <= width() - m_iMarginRight)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILabel.cpp

@@ -169 +169 @@
 {
     /* Start dragging: */
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::pos was replaced with QSinglePointEvent::position in Qt6 */
-    if (pEvent->button() == Qt::LeftButton && geometry().contains(pEvent->pos()) && m_fFullSizeSelection)
-#else
     if (pEvent->button() == Qt::LeftButton && geometry().contains(pEvent->position().toPoint()) && m_fFullSizeSelection)
-#endif
         m_fStartDragging = true;
     /* Call to base-class: */

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QISplitter.cpp

@@ -316 +316 @@
                 const int margin = 3;
                 QMouseEvent *pMouseEvent = static_cast<QMouseEvent*>(pEvent);
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::globalPos was replaced with QSinglePointEvent::globalPosition in Qt6 */
-                const QPoint gPos = pMouseEvent->globalPos();
-#else
                 const QPoint gPos = pMouseEvent->globalPosition().toPoint();
-#endif
                 for (int i=1; i < count(); ++i)
                 {

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBarIndicator.cpp

@@ -66 +66 @@
     if (pEvent->button() == Qt::LeftButton)
     {
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::globalPos was replaced with QSinglePointEvent::globalPosition in Qt6 */
-        QContextMenuEvent cme(QContextMenuEvent::Mouse, pEvent->pos(), pEvent->globalPos());
-#else
         QContextMenuEvent cme(QContextMenuEvent::Mouse, pEvent->position().toPoint(), pEvent->globalPosition().toPoint());
-#endif
         emit sigContextMenuRequest(this, &cme);
         if (cme.isAccepted())

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.cpp

@@ -459 +459 @@
 void UIBookmarksListWidget::mousePressEvent(QMouseEvent *pEvent)
 {
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::pos was replaced with QSinglePointEvent::position in Qt6 */
-    if (!indexAt(pEvent->pos()).isValid())
-#else
     if (!indexAt(pEvent->position().toPoint()).isValid())
-#endif
     {
         clearSelection();

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpViewer.cpp

@@ -298 +298 @@
         {
             QMouseEvent *pMouseEvent = static_cast<QMouseEvent*>(pEvent);
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::globalPos was replaced with QSinglePointEvent::globalPosition in Qt6 */
-            const QPoint gPos = pMouseEvent->globalPos();
-#else
             const QPoint gPos = pMouseEvent->globalPosition().toPoint();
-#endif
             if (pMouseEvent->buttons() == Qt::LeftButton)
             {
@@ -681 +677 @@
     if (fOverlayMode)
         return;
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::pos was replaced with QSinglePointEvent::position in Qt6 */
-    QString strAnchor = anchorAt(pEvent->pos());
-#else
     QString strAnchor = anchorAt(pEvent->position().toPoint());
-#endif
 
     if (!strAnchor.isEmpty())

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerTextEdit.cpp

@@ -180 +180 @@
 {
     if (m_pTextEdit)
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::pos was replaced with QSinglePointEvent::position in Qt6 */
-        m_pTextEdit->setMouseCursorLine(m_pTextEdit->lineNumberForPos(pEvent->pos()));
-#else
         m_pTextEdit->setMouseCursorLine(m_pTextEdit->lineNumberForPos(pEvent->position().toPoint()));
-#endif
     update();
 }
@@ -191 +187 @@
 {
     if (m_pTextEdit)
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::pos was replaced with QSinglePointEvent::position in Qt6 */
-        m_pTextEdit->toggleBookmark(m_pTextEdit->bookmarkForPos(pEvent->pos()));
-#else
         m_pTextEdit->toggleBookmark(m_pTextEdit->bookmarkForPos(pEvent->position().toPoint()));
-#endif
 }
 
@@ -396 +388 @@
 void UIVMLogViewerTextEdit::mouseMoveEvent(QMouseEvent *pEvent)
 {
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::pos was replaced with QSinglePointEvent::position in Qt6 */
-    setMouseCursorLine(lineNumberForPos(pEvent->pos()));
-#else
     setMouseCursorLine(lineNumberForPos(pEvent->position().toPoint()));
-#endif
     if (m_pLineNumberArea)
         m_pLineNumberArea->update();

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

@@ -2011 +2011 @@
     {
         /* Get mouse-pointer location. */
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::pos was replaced with QSinglePointEvent::position in Qt6 */
-        const QPoint &cpnt = viewportToContents(pEvent->pos());
-#else
         const QPoint &cpnt = viewportToContents(pEvent->position().toPoint());
-#endif
 
         /* Ask the target for starting a DnD event. */
@@ -2041 +2037 @@
     {
         /* Get mouse-pointer location. */
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::pos was replaced with QSinglePointEvent::position in Qt6 */
-        const QPoint &cpnt = viewportToContents(pEvent->pos());
-#else
         const QPoint &cpnt = viewportToContents(pEvent->position().toPoint());
-#endif
 
         /* Ask the guest for moving the drop cursor. */
@@ -2086 +2078 @@
     {
         /* Get mouse-pointer location. */
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::pos was replaced with QSinglePointEvent::position in Qt6 */
-        const QPoint &cpnt = viewportToContents(pEvent->pos());
-#else
         const QPoint &cpnt = viewportToContents(pEvent->position().toPoint());
-#endif
 
         /* Ask the guest for dropping data. */

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

@@ -650 +650 @@
                     /* Get mouse-event: */
                     QMouseEvent *pOldMouseEvent = static_cast<QMouseEvent*>(pEvent);
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::globalPos was replaced with QSinglePointEvent::globalPosition in Qt6 */
-                    const QPoint gPos = pOldMouseEvent->globalPos();
-#else
                     const QPoint gPos = pOldMouseEvent->globalPosition().toPoint();
-#endif
 
                     /* Check which viewport(s) we *probably* hover: */
@@ -736 +732 @@
                         m_iLastMouseWheelDelta = 0;
 
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::globalPos was replaced with QSinglePointEvent::globalPosition in Qt6 */
-                    if (mouseEvent(pMouseEvent->type(), uScreenId,
-                                   pMouseEvent->pos(), pMouseEvent->globalPos(),
-                                   pMouseEvent->buttons(), 0, Qt::Horizontal))
-#else
                     if (mouseEvent(pMouseEvent->type(), uScreenId,
                                    pMouseEvent->position().toPoint(), pMouseEvent->globalPosition().toPoint(),
                                    pMouseEvent->buttons(), 0, Qt::Horizontal))
-#endif
                         return true;
                     break;
@@ -1258 +1248 @@
         {
             /* Get absolute touch-point origin: */
-#ifndef VBOX_IS_QT6_OR_LATER /* QEventPoint::pos was replaced with QEventPoint::position in Qt6 */
-            QPoint currentTouchPoint = touchPoint.pos().toPoint();
-#else
             QPoint currentTouchPoint = touchPoint.position().toPoint();
-#endif
 
             /* Pass absolute touch-point data: */
@@ -1274 +1260 @@
         } else {
             /* Get relative touch-point normalized position: */
-#ifndef VBOX_IS_QT6_OR_LATER /* QEventPoint::pos was replaced with QEventPoint::position in Qt6 */
-            QPointF rawTouchPoint = touchPoint.normalizedPos();
-#else
             QPointF rawTouchPoint = touchPoint.normalizedPosition();
-#endif
 
             /* Pass relative touch-point data as Normalized Integer: */

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

@@ -303 +303 @@
 
     /* Remember mouse-press position: */
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::globalPos was replaced with QSinglePointEvent::globalPosition in Qt6 */
-    const QPoint gPos = pEvent->globalPos();
-#else
     const QPoint gPos = pEvent->globalPosition().toPoint();
-#endif
     m_mousePressPosition = gPos;
 }
@@ -359 +355 @@
 
     /* Make sure item is really dragged: */
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::globalPos was replaced with QSinglePointEvent::globalPosition in Qt6 */
-    const QPoint gPos = pEvent->globalPos();
-#else
     const QPoint gPos = pEvent->globalPosition().toPoint();
-#endif
     if (QLineF(gPos, m_mousePressPosition).length() <
         QApplication::startDragDistance())
@@ -642 +634 @@
 
     /* Get event position: */
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::pos was replaced with QSinglePointEvent::position in Qt6 */
-    const QPoint lPos = pEvent->pos();
-#else
     const QPoint lPos = pEvent->position().toPoint();
-#endif
     /* Search for most suitable button: */
     foreach (const IndicatorType &enmType, m_order)

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

@@ -4062 +4062 @@
     /* Make sure event is valid: */
     AssertPtrReturnVoid(pEvent);
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::globalPos was replaced with QSinglePointEvent::globalPosition in Qt6 */
-    const QPoint gPos = pEvent->globalPos();
-    const QPoint lPos = pEvent->pos();
-#else
     const QPoint gPos = pEvent->globalPosition().toPoint();
     const QPoint lPos = pEvent->position().toPoint();
-#endif
 
     const QModelIndex index = m_pTreeViewStorage->indexAt(lPos);
@@ -4194 +4189 @@
     /* Make sure event is valid: */
     AssertPtrReturnVoid(pEvent);
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::globalPos was replaced with QSinglePointEvent::globalPosition in Qt6 */
-    const QPoint gPos = pEvent->globalPos();
-    const QPoint lPos = pEvent->pos();
-#else
     const QPoint gPos = pEvent->globalPosition().toPoint();
     const QPoint lPos = pEvent->position().toPoint();
-#endif
 
     /* Acquire indexes: */
@@ -4300 +4290 @@
 
     /* Check what item we are hovering currently: */
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::pos was replaced with QSinglePointEvent::position in Qt6 */
-    QModelIndex index = m_pTreeViewStorage->indexAt(pEvent->pos());
-#else
     QModelIndex index = m_pTreeViewStorage->indexAt(pEvent->position().toPoint());
-#endif
     AbstractItem *pItem = static_cast<AbstractItem*>(index.internalPointer());
     /* And make sure this is controller item, we are supporting dropping for this kind only: */
@@ -4332 +4318 @@
 
     /* Check what item we are hovering currently: */
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::pos was replaced with QSinglePointEvent::position in Qt6 */
-    QModelIndex index = m_pTreeViewStorage->indexAt(pEvent->pos());
-#else
     QModelIndex index = m_pTreeViewStorage->indexAt(pEvent->position().toPoint());
-#endif
     AbstractItem *pItem = static_cast<AbstractItem*>(index.internalPointer());
     /* And make sure this is controller item, we are supporting dropping for this kind only: */

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

@@ -2838 +2838 @@
 UISoftKeyboardKey *UISoftKeyboardWidget::keyUnderMouse(QMouseEvent *pEvent)
 {
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::pos was replaced with QSinglePointEvent::position in Qt6 */
-    const QPoint lPos = pEvent->pos();
-#else
     const QPoint lPos = pEvent->position().toPoint();
-#endif
     QPoint eventPosition(lPos.x() / m_fScaleFactorX, lPos.y() / m_fScaleFactorY);
     if (m_fHideMultimediaKeys)

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

@@ -174 +174 @@
 void UIHelpButton::mousePressEvent(QMouseEvent *pEvent)
 {
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::pos was replaced with QSinglePointEvent::position in Qt6 */
-    if (hitButton(pEvent->pos()))
-#else
     if (hitButton(pEvent->position().toPoint()))
-#endif
         m_pButtonPressed = true;
     QPushButton::mousePressEvent(pEvent);

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

@@ -544 +544 @@
 
     /* Remember mouse-press position: */
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::globalPos was replaced with QSinglePointEvent::globalPosition in Qt6 */
-    m_mousePressPosition = pEvent->globalPos();
-#else
     m_mousePressPosition = pEvent->globalPosition().toPoint();
-#endif
 }
 
@@ -571 +567 @@
 
     /* Make sure item is now being dragged: */
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::globalPos was replaced with QSinglePointEvent::globalPosition in Qt6 */
-    const QPoint gPos = pEvent->globalPos();
-#else
     const QPoint gPos = pEvent->globalPosition().toPoint();
-#endif
     if (QLineF(gPos, m_mousePressPosition).length() < QApplication::startDragDistance())
         return QWidget::mouseMoveEvent(pEvent);
@@ -907 +899 @@
     /* Make sure event is valid: */
     AssertPtrReturnVoid(pEvent);
-#ifndef VBOX_IS_QT6_OR_LATER /* QMouseEvent::pos was replaced with QSinglePointEvent::position in Qt6 */
-    const QPoint lPos = pEvent->pos();
-#else
     const QPoint lPos = pEvent->position().toPoint();
-#endif
 
     /* And mime-data is set: */