Changeset 94042 in vbox for trunk

Timestamp:

Mar 1, 2022 2:49:29 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: qt6: The signal QComboBox::activated(const QString &) was renamed QComboBox::textActivated (5.14), and similarly highlighted() to textHighlighted (5.14). The QComboBox::currentIndexChanged(const QString &) signal was removed (replaced by already existing currentTextChanged(), I think). bugref:9898

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIComboBox.cpp (modified) (1 diff)
• extensions/QIComboBox.h (modified) (2 diffs)
• guestctrl/UIFileManagerTable.cpp (modified) (3 diffs)
• settings/machine/UIMachineSettingsSerial.cpp (modified) (1 diff)

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

@@ -398 +398 @@
             connect(m_pComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
                     this, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::activated));
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) /** @todo qt6: textActivated was added in 5.14 actually */
+            connect(m_pComboBox, static_cast<void(QComboBox::*)(const QString &)>(&QComboBox::textActivated),
+                    this, static_cast<void(QIComboBox::*)(const QString &)>(&QIComboBox::textActivated));
+#else
             connect(m_pComboBox, static_cast<void(QComboBox::*)(const QString &)>(&QComboBox::activated),
                     this, static_cast<void(QIComboBox::*)(const QString &)>(&QIComboBox::activated));
+#endif
             connect(m_pComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
                     this, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged));
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
             connect(m_pComboBox, static_cast<void(QComboBox::*)(const QString &)>(&QComboBox::currentIndexChanged),
                     this, static_cast<void(QIComboBox::*)(const QString &)>(&QIComboBox::currentIndexChanged));
+#endif
             connect(m_pComboBox, &QComboBox::currentTextChanged, this, &QIComboBox::currentTextChanged);
             connect(m_pComboBox, &QComboBox::editTextChanged, this, &QIComboBox::editTextChanged);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) /** @todo qt6: textHighlighted was added in 5.14 actually */
+            connect(m_pComboBox, static_cast<void(QComboBox::*)(const QString &)>(&QComboBox::textHighlighted),
+                    this, static_cast<void(QIComboBox::*)(const QString &)>(&QIComboBox::textHighlighted));
+#else
             connect(m_pComboBox, static_cast<void(QComboBox::*)(const QString &)>(&QComboBox::highlighted),
                     this, static_cast<void(QIComboBox::*)(const QString &)>(&QIComboBox::highlighted));
             connect(m_pComboBox, static_cast<void(QComboBox::*)(const QString &)>(&QComboBox::highlighted),
                     this, static_cast<void(QIComboBox::*)(const QString &)>(&QIComboBox::highlighted));
+#endif
             /* Add combo-box into layout: */
             pLayout->addWidget(m_pComboBox);

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIComboBox.h

@@ -43 +43 @@
     void activated(int iIndex);
     /** Notifies listeners about user chooses an item with @a strText in the combo-box. */
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) /** @todo qt6: textHighlighted was added in 5.14 actually */
+    void textActivated(const QString &strText);
+#else
     void activated(const QString &strText);
+#endif
 
     /** Notifies listeners about current item changed to item with @a iIndex. */
     void currentIndexChanged(int iIndex);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     /** Notifies listeners about current item changed to item with @a strText. */
     void currentIndexChanged(const QString &strText);
+#endif
 
     /** Notifies listeners about current combo-box text is changed to @a strText. */
@@ -58 +64 @@
     void highlighted(int iIndex);
     /** Notifies listeners about user highlighted an item with @a strText in the popup list-view. */
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) /** @todo qt6: textHighlighted was added in 5.14 actually */
+    void textHighlighted(const QString &strText);
+#else
     void highlighted(const QString &strText);
+#endif
 
 public:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.cpp

@@ -291 +291 @@
     if (m_pHistoryComboBox)
     {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+        disconnect(m_pHistoryComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentTextChanged),
+                   this, &UIFileManagerNavigationWidget::sltHandlePathChange);
+        m_pHistoryComboBox->clear();
+        connect(m_pHistoryComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentTextChanged),
+                this, &UIFileManagerNavigationWidget::sltHandlePathChange);
+#else
         disconnect(m_pHistoryComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged),
                    this, &UIFileManagerNavigationWidget::sltHandlePathChange);
@@ -296 +303 @@
         connect(m_pHistoryComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged),
                 this, &UIFileManagerNavigationWidget::sltHandlePathChange);
+#endif
     }
 
@@ -330 +338 @@
             connect(m_pHistoryComboBox, &UIFileManagerHistoryComboBox::sigHidePopup,
                     this, &UIFileManagerNavigationWidget::sltHandleHidePopup);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+            connect(m_pHistoryComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentTextChanged),
+                    this, &UIFileManagerNavigationWidget::sltHandlePathChange);
+#else
             connect(m_pHistoryComboBox, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged),
                     this, &UIFileManagerNavigationWidget::sltHandlePathChange);
+#endif
 
             m_pContainer->addWidget(m_pBreadCrumbs);

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp

@@ -506 +506 @@
 {
     connect(m_pCheckBoxPort, &QCheckBox::toggled, this, &UIMachineSettingsSerial::sltGbSerialToggled);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+    connect(m_pComboNumber, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::textActivated),
+            this, &UIMachineSettingsSerial::sltCbNumberActivated);
+#else
     connect(m_pComboNumber, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::activated),
             this, &UIMachineSettingsSerial::sltCbNumberActivated);
+#endif
     connect(m_pLineEditIRQ, &QLineEdit::textChanged, m_pParent, &UIMachineSettingsSerialPage::revalidate);
     connect(m_pLineEditIOPort, &QLineEdit::textChanged, m_pParent, &UIMachineSettingsSerialPage::revalidate);