Changeset 103795 in vbox

Timestamp:

Mar 11, 2024 7:36:59 PM (14 months ago)

Author:

vboxsync

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

162164

Message:

FE/Qt: bugref:10450: Get rid of old Qt hack for versions less than 5.11.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/extensions/QISplitter.cpp (modified) (1 diff)
• src/globals/UICursor.cpp (deleted)
• src/globals/UICursor.h (deleted)
• src/helpbrowser/UIHelpViewer.cpp (modified) (4 diffs)
• src/manager/details/UIDetailsElement.cpp (modified) (2 diffs)
• src/runtime/UIMouseHandler.cpp (modified) (4 diffs)
• src/snapshots/UISnapshotDetailsWidget.cpp (modified) (2 diffs)
• src/widgets/UIPopupStack.cpp (modified) (3 diffs)
• src/widgets/graphics/UIGraphicsTextPane.cpp (modified) (2 diffs)
• src/wizards/editors/UIUserNamePasswordEditor.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -1388 +1388 @@
         src/globals/UICloudNetworkingStuff.cpp \
         src/globals/UICommon.cpp \
-        src/globals/UICursor.cpp \
         src/globals/UIFileSystemModel.cpp \
         src/globals/UIDefs.cpp \

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

@@ -34 +34 @@
 /* GUI includes: */
 #include "QISplitter.h"
-#ifdef VBOX_WS_MAC
-# include "UICursor.h"
-#endif
 
 

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

@@ -51 +51 @@
 /* GUI includes: */
 #include "QIToolButton.h"
-#include "UICursor.h"
 #include "UICommon.h"
 #include "UIHelpViewer.h"
@@ -289 +288 @@
     {
         if (pEvent->type() == QEvent::Enter)
-            UICursor::setCursor(m_pDragMoveLabel, Qt::CrossCursor);
+            m_pDragMoveLabel->setCursor(Qt::CrossCursor);
         else if (pEvent->type() == QEvent::Leave)
         {
             if (parentWidget())
-                UICursor::setCursor(m_pDragMoveLabel, parentWidget()->cursor());
+                m_pDragMoveLabel->setCursor(parentWidget()->cursor());
         }
         else if (pEvent->type() == QEvent::MouseMove)
@@ -304 +303 @@
                     emit sigDragging(gPos - m_previousMousePosition);
                 m_previousMousePosition = gPos;
-                UICursor::setCursor(m_pDragMoveLabel, Qt::ClosedHandCursor);
+                m_pDragMoveLabel->setCursor(Qt::ClosedHandCursor);
             }
         }
@@ -310 +309 @@
         {
             m_previousMousePosition = QPoint(-1, -1);
-            UICursor::setCursor(m_pDragMoveLabel, Qt::CrossCursor);
+            m_pDragMoveLabel->setCursor(Qt::CrossCursor);
         }
     }

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp

@@ -48 +48 @@
 #include "UICommon.h"
 #include "UIConverter.h"
-#include "UICursor.h"
 #include "UIDetailsElement.h"
 #include "UIDetailsGenerator.h"
@@ -859 +858 @@
 {
     if (m_fNameHovered)
-        UICursor::setCursor(this, Qt::PointingHandCursor);
+        setCursor(Qt::PointingHandCursor);
     else
-        UICursor::unsetCursor(this);
+        unsetCursor();
     update();
 }

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

@@ -34 +34 @@
 /* GUI includes: */
 #include "UICommon.h"
-#include "UICursor.h"
 #include "UIDesktopWidgetWatchdog.h"
 #include "UIExtraDataManager.h"
@@ -473 +472 @@
         QList<ulong> screenIds = m_viewports.keys();
         for (int i = 0; i < screenIds.size(); ++i)
-            UICursor::setCursor(m_viewports[screenIds[i]], Qt::BlankCursor);
+            m_viewports[screenIds[i]]->setCursor(Qt::BlankCursor);
     }
 
@@ -487 +486 @@
         QList<ulong> screenIds = m_viewports.keys();
         for (int i = 0; i < screenIds.size(); ++i)
-            UICursor::setCursor(m_viewports[screenIds[i]], m_views[screenIds[i]]->cursor());
+            m_viewports[screenIds[i]]->setCursor(m_views[screenIds[i]]->cursor());
     }
 
@@ -500 +499 @@
         QList<ulong> screenIds = m_viewports.keys();
         for (int i = 0; i < screenIds.size(); ++i)
-            UICursor::unsetCursor(m_viewports[screenIds[i]]);
+            m_viewports[screenIds[i]]->unsetCursor();
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.cpp

@@ -49 +49 @@
 #include "UICommon.h"
 #include "UIConverter.h"
-#include "UICursor.h"
 #include "UIDesktopWidgetWatchdog.h"
 #include "UIDetailsGenerator.h"
@@ -549 +548 @@
     setWindowModality(Qt::ApplicationModal);
     /* With the pointing-hand cursor: */
-    UICursor::setCursor(this, Qt::PointingHandCursor);
+    setCursor(Qt::PointingHandCursor);
     /* And it's being deleted when closed: */
     setAttribute(Qt::WA_DeleteOnClose);

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

@@ -35 +35 @@
 
 /* GUI includes: */
-#include "UICursor.h"
 #include "UIDesktopWidgetWatchdog.h"
 #include "UIPopupStack.h"
@@ -258 +257 @@
         {
             /* Configure scroll-area: */
-            UICursor::setCursor(m_pScrollArea, Qt::ArrowCursor);
+            m_pScrollArea->setCursor(Qt::ArrowCursor);
             m_pScrollArea->setWidgetResizable(true);
             m_pScrollArea->setFrameStyle(QFrame::NoFrame | QFrame::Plain);
@@ -269 +268 @@
             {
                 /* Configure scroll-viewport: */
-                UICursor::setCursor(m_pScrollViewport, Qt::ArrowCursor);
+                m_pScrollViewport->setCursor(Qt::ArrowCursor);
                 /* Connect scroll-viewport: */
                 connect(this, &UIPopupStack::sigProposeStackViewportSize,

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsTextPane.cpp

@@ -36 +36 @@
 
 /* GUI includes: */
-#include "UICursor.h"
 #include "UIGraphicsTextPane.h"
 #include "UIRichTextString.h"
@@ -399 +398 @@
     /* Update mouse-cursor: */
     if (m_strHoveredAnchor.isNull())
-        UICursor::unsetCursor(this);
+        unsetCursor();
     else
-        UICursor::setCursor(this, Qt::PointingHandCursor);
+        setCursor(Qt::PointingHandCursor);
 
     /* Update text-layout: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIUserNamePasswordEditor.cpp

@@ -37 +37 @@
 #include "QIRichTextLabel.h"
 #include "QIToolButton.h"
-#include "UICursor.h"
 #include "UIIconPool.h"
 #include "UIUserNamePasswordEditor.h"
@@ -118 +117 @@
         m_pTextVisibilityButton->setIconSize(QSize(10, 10));
         m_pTextVisibilityButton->setFocusPolicy(Qt::ClickFocus);
-        UICursor::setCursor(m_pTextVisibilityButton, Qt::ArrowCursor);
+        m_pTextVisibilityButton->setCursor(Qt::ArrowCursor);
         m_pTextVisibilityButton->show();
         connect(m_pTextVisibilityButton, &QToolButton::clicked, this, &UIPasswordLineEdit::sltHandleTextVisibilityChange);