Changeset 97679 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 25, 2022 10:04:21 AM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9898: Migrating to Qt6; A bit of rework for QIComboBox signals.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIComboBox.cpp (modified) (1 diff)
• extensions/QIComboBox.h (modified) (2 diffs)
• wizards/addcloudvm/UIWizardAddCloudVMPageExpert.cpp (modified) (1 diff)
• wizards/addcloudvm/UIWizardAddCloudVMPageSource.cpp (modified) (1 diff)
• wizards/importappliance/UIWizardImportAppPageExpert.cpp (modified) (1 diff)
• wizards/newcloudvm/UIWizardNewCloudVMPageExpert.cpp (modified) (1 diff)
• wizards/newcloudvm/UIWizardNewCloudVMPageSource.cpp (modified) (1 diff)

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

@@ -409 +409 @@
                     this, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::activated));
 #ifdef VBOX_IS_QT6_OR_LATER /** @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));
+            connect(m_pComboBox, &QComboBox::textActivated,
+                    this, &QIComboBox::textActivated);
 #else
             connect(m_pComboBox, static_cast<void(QComboBox::*)(const QString &)>(&QComboBox::activated),
-                    this, static_cast<void(QIComboBox::*)(const QString &)>(&QIComboBox::activated));
+                    this, static_cast<void(QIComboBox::*)(const QString &)>(&QIComboBox::textActivated));
 #endif
             connect(m_pComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
                     this, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged));
-#ifndef VBOX_IS_QT6_OR_LATER
-            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);
 #ifdef VBOX_IS_QT6_OR_LATER /** @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));
+            connect(m_pComboBox, &QComboBox::textHighlighted,
+                    this, &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));
+                    this, static_cast<void(QIComboBox::*)(const QString &)>(&QIComboBox::textHighlighted));
 #endif
             /* Add combo-box into layout: */

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

@@ -53 +53 @@
     void activated(int iIndex);
     /** Notifies listeners about user chooses an item with @a strText in the combo-box. */
-#ifdef VBOX_IS_QT6_OR_LATER /** @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);
-#ifndef VBOX_IS_QT6_OR_LATER
-    /** 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. */
@@ -74 +66 @@
     void highlighted(int iIndex);
     /** Notifies listeners about user highlighted an item with @a strText in the popup list-view. */
-#ifdef VBOX_IS_QT6_OR_LATER /** @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/wizards/addcloudvm/UIWizardAddCloudVMPageExpert.cpp

@@ -150 +150 @@
     connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigCloudProfileChanged,
             this, &UIWizardAddCloudVMPageExpert::sltHandleProviderComboChange);
-    connect(m_pProviderComboBox, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::activated),
+    connect(m_pProviderComboBox, &QIComboBox::activated,
             this, &UIWizardAddCloudVMPageExpert::sltHandleProviderComboChange);
     connect(m_pProfileComboBox, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged),

trunk/src/VBox/Frontends/VirtualBox/src/wizards/addcloudvm/UIWizardAddCloudVMPageSource.cpp

@@ -368 +368 @@
     connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigCloudProfileChanged,
             this, &UIWizardAddCloudVMPageSource::sltHandleProviderComboChange);
-    connect(m_pProviderComboBox, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::activated),
+    connect(m_pProviderComboBox, &QIComboBox::activated,
             this, &UIWizardAddCloudVMPageSource::sltHandleProviderComboChange);
     connect(m_pProfileComboBox, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged),

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.cpp

@@ -323 +323 @@
     connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigCloudProfileChanged,
             this, &UIWizardImportAppPageExpert::sltHandleSourceComboChange);
-    connect(m_pSourceComboBox, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::activated),
+    connect(m_pSourceComboBox, &QIComboBox::activated,
             this, &UIWizardImportAppPageExpert::sltHandleSourceComboChange);
     connect(m_pFileSelector, &UIEmptyFilePathSelector::pathChanged,

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageExpert.cpp

@@ -186 +186 @@
     connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigCloudProfileChanged,
             this, &UIWizardNewCloudVMPageExpert::sltHandleProviderComboChange);
-    connect(m_pProviderComboBox, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::activated),
+    connect(m_pProviderComboBox, &QIComboBox::activated,
             this, &UIWizardNewCloudVMPageExpert::sltHandleProviderComboChange);
     connect(m_pProfileComboBox, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged),

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageSource.cpp

@@ -430 +430 @@
     connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigCloudProfileChanged,
             this, &UIWizardNewCloudVMPageSource::sltHandleProviderComboChange);
-    connect(m_pProviderComboBox, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::activated),
+    connect(m_pProviderComboBox, &QIComboBox::activated,
             this, &UIWizardNewCloudVMPageSource::sltHandleProviderComboChange);
     connect(m_pProfileComboBox, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged),