Changeset 101571 in vbox for trunk/src

Timestamp:

Oct 24, 2023 12:48:20 AM (16 months ago)

Author:

vboxsync

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

159652

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• globals/UIIconPool.cpp (modified) (1 diff)
• globals/UITranslator.cpp (modified) (1 diff)
• helpbrowser/UIHelpViewer.cpp (modified) (1 diff)
• helpbrowser/UIHelpViewer.h (modified) (2 diffs)
• main.cpp (modified) (2 diffs)
• manager/UIVirtualBoxManagerWidget.cpp (modified) (3 diffs)
• manager/chooser/UIChooserAbstractModel.cpp (modified) (1 diff)
• manager/chooser/UIChooserModel.cpp (modified) (1 diff)
• manager/chooser/UIChooserNodeMachine.cpp (modified) (2 diffs)
• medium/UIMediumSearchWidget.cpp (modified) (2 diffs)
• platform/nix/UIDesktopServices_nix.cpp (modified) (1 diff)
• platform/nix/VBoxUtils-nix.cpp (modified) (7 diffs)
• runtime/UIMachineView.cpp (modified) (1 diff)
• widgets/UIPopupStack.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -4698 +4698 @@
     if (!fOk)
         iFontSize = 9;
-#ifndef VBOX_IS_QT6_OR_LATER /* QFontDatabase is now more like a namespace .. */
-    QFontDatabase dataBase;
-    return dataBase.font(strFamily, strStyleName, iFontSize);
-#else
     return QFontDatabase::font(strFamily, strStyleName, iFontSize);
-#endif
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp

@@ -276 +276 @@
     /* Add pixmap: */
     icon.addPixmap(pixmap, mode, state);
-
-#if defined(VBOX_WS_MAC) && !defined(VBOX_IS_QT6_OR_LATER)
-    /* Test if HiDPI icons are enabled on macOS @ Qt5 only: */
-    if (!qApp->testAttribute(Qt::AA_UseHighDpiPixmaps))
-        return;
-#endif /* VBOX_WS_MAC */
 
     /* Parse name to prefix and suffix: */

trunk/src/VBox/Frontends/VirtualBox/src/globals/UITranslator.cpp

@@ -190 +190 @@
         // We use system installations of Qt on Linux systems, so first, try
         // to load the Qt translation from the system location.
-# ifndef VBOX_IS_QT6_OR_LATER /* QLibraryInfo::location replaced by QLibraryInfo::path in Qt6 */
-        strLanguageFileName = QLibraryInfo::location(QLibraryInfo::TranslationsPath) + "/qt_" +
-                              languageId() + vboxLanguageFileExtension();
-# else
         strLanguageFileName = QLibraryInfo::path(QLibraryInfo::TranslationsPath) + "/qt_" +
                               languageId() + vboxLanguageFileExtension();
-# endif
         QTranslator *pQtSysTr = new QTranslator(s_pTranslator);
         Assert(pQtSysTr);

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

@@ -458 +458 @@
 }
 
-#ifdef VBOX_IS_QT6_OR_LATER /* it was setSource before 6.0 */
 void UIHelpViewer::doSetSource(const QUrl &url, QTextDocument::ResourceType type)
-#else
-void UIHelpViewer::setSource(const QUrl &url)
-#endif
 {
     clearOverlay();
     if (url.scheme() != "qthelp")
         return;
-#ifdef VBOX_IS_QT6_OR_LATER /* it was setSource before 6.0 */
     QTextBrowser::doSetSource(url, type);
-#else
-    QTextBrowser::setSource(url);
-#endif
     QTextDocument *pDocument = document();
     if (!pDocument || pDocument->isEmpty())

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

@@ -81 +81 @@
     virtual QVariant loadResource(int type, const QUrl &name) RT_OVERRIDE;
     void emitHistoryChangedSignal();
-#ifndef VBOX_IS_QT6_OR_LATER /* must override doSetSource since 6.0 */
-    virtual void setSource(const QUrl &url) RT_OVERRIDE;
-#endif
     void setFont(const QFont &);
     bool isFindInPageWidgetVisible() const;
@@ -110 +107 @@
     virtual bool eventFilter(QObject *pObject, QEvent *pEvent) RT_OVERRIDE;
     virtual void keyPressEvent(QKeyEvent *pEvent) RT_OVERRIDE;
-#ifdef VBOX_IS_QT6_OR_LATER /* it was setSource before 6.0 */
     virtual void doSetSource(const QUrl &url, QTextDocument::ResourceType type = QTextDocument::UnknownResource) RT_OVERRIDE;
-#endif
 
 private slots:

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

@@ -469 +469 @@
         qInstallMessageHandler(QtMessageOutput);
 
-        /* Enable HiDPI support: */
-#ifndef VBOX_IS_QT6_OR_LATER
-        QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-# if (!defined(DEBUG_bird) || defined(RT_OS_DARWIN))
-#  ifndef VBOX_GUI_WITH_CUSTOMIZATIONS1
-        /* This shouldn't be enabled for customer WM, since Qt has conflicts in that case. */
-        QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#  endif
-# endif
-#else
-# ifdef VBOX_WS_NIX
+#ifdef VBOX_WS_NIX
         // WORKAROUND:
         // Some Desktop Environments forcing this variable which was useful in Qt5 case.
@@ -487 +477 @@
         // setting it to be always equal to 1.
         qputenv("QT_SCALE_FACTOR", "1");
-# endif
-#endif
+#endif /* VBOX_WS_NIX */
 
         /* Create application: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -50 +50 @@
 #include "UIVirtualMachineItemLocal.h"
 #include "UITools.h"
+#ifdef VBOX_WS_MAC
+# include "UIIconPool.h"
+#endif
 #ifndef VBOX_WS_MAC
 # include "UIMenuBar.h"
-#endif
-#ifdef VBOX_WS_MAC
-# ifdef VBOX_IS_QT6_OR_LATER /* we are branding as Dev Preview since 6.0 */
-#  include "UIIconPool.h"
-# endif
 #endif
 
@@ -654 +652 @@
 #ifdef VBOX_WS_MAC
                         m_pToolBar->emulateMacToolbar();
-# ifdef VBOX_IS_QT6_OR_LATER /* we are branding as Dev Preview since 6.0 */
                         /* Branding stuff for Qt6 beta: */
                         if (uiCommon().showBetaLabel())
@@ -661 +658 @@
                                                        QColor(246, 179, 0),
                                                        74 /* width of BETA label */);
-# endif
 #endif /* VBOX_WS_MAC */
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserAbstractModel.cpp

@@ -752 +752 @@
 
     /* Re-register VM if required: */
-#ifdef VBOX_IS_QT6_OR_LATER /* we have to use range constructors since 6.0 */
     QSet<QString> newGroupSet(newGroupList.begin(), newGroupList.end());
     QSet<QString> oldGroupSet(oldGroupList.begin(), oldGroupList.end());
     if (newGroupSet != oldGroupSet)
-#else
-    if (newGroupList.toSet() != oldGroupList.toSet())
-#endif
     {
         sltLocalMachineRegistrationChanged(uMachineId, false);

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp

@@ -439 +439 @@
 
     /* If we have at least one of those items currently selected: */
-#ifdef VBOX_IS_QT6_OR_LATER /* we have to use range constructors since 6.0 */
-    {
-        QList<UIChooserItem *> selectedItemsList = selectedItems();
-        QSet<UIChooserItem *> selectedItemsSet(selectedItemsList.begin(), selectedItemsList.end());
-        if (selectedItemsSet.intersects(matchedItems))
-            setSelectedItem(findClosestUnselectedItem());
-    }
-#else
-    if (selectedItems().toSet().intersects(matchedItems))
+    const QList<UIChooserItem*> selectedItemsList = selectedItems();
+    const QSet<UIChooserItem*> selectedItemsSet(selectedItemsList.begin(), selectedItemsList.end());
+    if (selectedItemsSet.intersects(matchedItems))
         setSelectedItem(findClosestUnselectedItem());
-#endif
 
     /* If global item is currently chosen, selection should be invalidated: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserNodeMachine.cpp

@@ -27 +27 @@
 
 /* Qt includes: */
-#include <qglobal.h>
-#ifdef VBOX_IS_QT6_OR_LATER /* fromWildcard is available since 6.0 */
-# include <QRegularExpression>
-#else
-# include <QRegExp>
-#endif
+#include <QRegularExpression>
 
 /* GUI includes: */
@@ -241 +236 @@
         else
         {
-#ifdef VBOX_IS_QT6_OR_LATER /* fromWildcard is available since 6.0 */
-            QRegularExpression searchRegEx = QRegularExpression::fromWildcard(strSearchTerm, Qt::CaseInsensitive, QRegularExpression::UnanchoredWildcardConversion);
-#else
-            QRegExp searchRegEx(strSearchTerm, Qt::CaseInsensitive, QRegExp::WildcardUnix);
-#endif
+            QRegularExpression searchRegEx = QRegularExpression::fromWildcard(strSearchTerm, Qt::CaseInsensitive,
+                                                                              QRegularExpression::UnanchoredWildcardConversion);
             if (name().contains(searchRegEx))
                 matchedItems << this;

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSearchWidget.cpp

@@ -32 +32 @@
 #include <QPushButton>
 #include <QPainter>
-#ifdef VBOX_IS_QT6_OR_LATER /* fromWildcard is available since 6.0 */
-# include <QRegularExpression>
-#else
-# include <QRegExp>
-#endif
+#include <QRegularExpression>
 
 /* GUI includes: */
@@ -81 +77 @@
         else
             return false;
-#ifdef VBOX_IS_QT6_OR_LATER /* fromWildcard is available since 6.0 */
         QRegularExpression searchRegEx = QRegularExpression::fromWildcard(m_strSearchTerm, Qt::CaseInsensitive,
                                                                           QRegularExpression::UnanchoredWildcardConversion);
-#else
-        QRegExp searchRegEx(m_strSearchTerm, Qt::CaseInsensitive, QRegExp::Wildcard);
-#endif
         if (strValue.contains(searchRegEx))
             return true;

trunk/src/VBox/Frontends/VirtualBox/src/platform/nix/UIDesktopServices_nix.cpp

@@ -45 +45 @@
         const QString strVBox = QDir::toNativeSeparators(QCoreApplication::applicationDirPath() + "/" + VBOX_GUI_VMRUNNER_IMAGE);
         QTextStream out(&link);
-#ifndef VBOX_IS_QT6_OR_LATER /* QTextStream defaults to UTF-8 only since qt6 */
-        out.setCodec("UTF-8");
-#endif
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-# define QT_ENDL Qt::endl
-#else
-# define QT_ENDL endl
-#endif
         /* Create a link which starts VirtualBox with the machine uuid. */
-        out << "[Desktop Entry]" << QT_ENDL
-            << "Encoding=UTF-8" << QT_ENDL
-            << "Version=1.0" << QT_ENDL
-            << "Name=" << strName << QT_ENDL
-            << "Comment=Starts the VirtualBox machine " << strName << QT_ENDL
-            << "Type=Application" << QT_ENDL
-            << "Exec=" << strVBox << " --comment \"" << strName << "\" --startvm \"" << uUuid.toString() << "\"" << QT_ENDL
-            << "Icon=virtualbox-vbox.png" << QT_ENDL;
+        out << "[Desktop Entry]" << Qt::endl
+            << "Encoding=UTF-8" << Qt::endl
+            << "Version=1.0" << Qt::endl
+            << "Name=" << strName << Qt::endl
+            << "Comment=Starts the VirtualBox machine " << strName << Qt::endl
+            << "Type=Application" << Qt::endl
+            << "Exec=" << strVBox << " --comment \"" << strName << "\" --startvm \"" << uUuid.toString() << "\"" << Qt::endl
+            << "Icon=virtualbox-vbox.png" << Qt::endl;
         /* This would be a real file link entry, but then we could also simply
          * use a soft link (on most UNIX fs):
-        out << "[Desktop Entry]" << QT_ENDL
-            << "Encoding=UTF-8" << QT_ENDL
-            << "Version=1.0" << QT_ENDL
-            << "Name=" << strName << QT_ENDL
-            << "Type=Link" << QT_ENDL
-            << "Icon=virtualbox-vbox.png" << QT_ENDL
+        out << "[Desktop Entry]" << Qt::endl
+            << "Encoding=UTF-8" << Qt::endl
+            << "Version=1.0" << Qt::endl
+            << "Name=" << strName << Qt::endl
+            << "Type=Link" << Qt::endl
+            << "Icon=virtualbox-vbox.png" << Qt::endl
         */
         link.setPermissions(link.permissions() | QFile::ExeOwner);

trunk/src/VBox/Frontends/VirtualBox/src/platform/nix/VBoxUtils-nix.cpp

@@ -36 +36 @@
 #endif /* VBOX_WITH_SCREENSAVER_CONTROL */
 #include <QWidget>
-#ifdef VBOX_IS_QT6_OR_LATER /** @todo qt6: ... */
-# include <QGuiApplication>
-#else
-# include <QX11Info>
-#endif
+#include <QGuiApplication>
 
 /* GUI includes: */
@@ -708 +704 @@
 Display *NativeWindowSubsystem::X11GetDisplay()
 {
-#ifdef VBOX_IS_QT6_OR_LATER /** QX11Info is replaced with QNativeInterface::QX11Application since qt6 */
     Display *pDisplay = 0;
     if (qApp)
@@ -716 +711 @@
             pDisplay = pX11App->display();
     }
-#else
-    Display *pDisplay = QX11Info::display();
-#endif
     Assert(pDisplay);
     return pDisplay;
@@ -725 +717 @@
 xcb_connection_t *NativeWindowSubsystem::X11GetConnection()
 {
-#ifdef VBOX_IS_QT6_OR_LATER /** QX11Info is replaced with QNativeInterface::QX11Application since qt6 */
     xcb_connection_t *pConnection = 0;
     if (qApp)
@@ -733 +724 @@
             pConnection = pX11App->connection();
     }
-#else
-    xcb_connection_t *pConnection = QX11Info::connection();
-#endif
     Assert(pConnection);
     return pConnection;
@@ -742 +730 @@
 uint32_t NativeWindowSubsystem::X11GetAppRootWindow()
 {
-#ifdef VBOX_IS_QT6_OR_LATER /** QX11Info is replaced with QNativeInterface::QX11Application since qt6 */
     Window idWindow = 0;
     Display *pDisplay = NativeWindowSubsystem::X11GetDisplay();
@@ -748 +735 @@
         idWindow = DefaultRootWindow(pDisplay);
     return idWindow;
-#else
-    return QX11Info::appRootWindow();
-#endif
-}
-
+}

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

@@ -1128 +1128 @@
         updateMousePointerPixmapScaling(pixmapShape, uXHot, uYHot);
         /// @todo updateMousePointerPixmapScaling(pixmapMask, uXHot, uYHot);
-#ifdef VBOX_IS_QT6_OR_LATER /* since qt6 explicit constructor is replaced with QBitmap::fromPixmap static method */
         m_cursor = QCursor(QBitmap::fromPixmap(pixmapShape), QBitmap::fromPixmap(pixmapMask), uXHot, uYHot);
-#else
-        m_cursor = QCursor(pixmapShape, pixmapMask, uXHot, uYHot);
-#endif
     }
 

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

@@ -265 +265 @@
             //m_pScrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
             QPalette pal = m_pScrollArea->palette();
-#ifndef VBOX_IS_QT6_OR_LATER /** @todo Qt::transparent glitches in qt6? */
-            pal.setColor(QPalette::Window, QColor(Qt::transparent));
-#endif
             m_pScrollArea->setPalette(pal);
             /* Create scroll-viewport: */