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

Timestamp:

Mar 1, 2022 3:01:06 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: qt6: The QButtonGroup::buttonClicked(int) signal was removed in qt6, leaving only the variant taking a QAbstractButton pointer (present in 5.0, possibly older). bugref:9898

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• logviewer/UIVMLogViewerFilterPanel.cpp (modified) (2 diffs)
• logviewer/UIVMLogViewerFilterPanel.h (modified) (2 diffs)
• wizards/editors/UIWizardDiskEditors.cpp (modified) (1 diff)

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

@@ -413 +413 @@
 }
 
-void UIVMLogViewerFilterPanel::sltOperatorButtonChanged(int buttonId)
-{
+void UIVMLogViewerFilterPanel::sltOperatorButtonChanged(QAbstractButton *pButton)
+{
+    int buttonId = m_pButtonGroup->id(pButton);
     if (buttonId < 0 || buttonId >= ButtonEnd)
         return;
@@ -553 +554 @@
 {
     connect(m_pAddFilterTermButton, &QIToolButton::clicked, this,  &UIVMLogViewerFilterPanel::sltAddFilterTerm);
-    connect(m_pButtonGroup, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked),
+    connect(m_pButtonGroup, static_cast<void (QButtonGroup::*)(QAbstractButton *)>(&QButtonGroup::buttonClicked),
             this, &UIVMLogViewerFilterPanel::sltOperatorButtonChanged);
     connect(m_pFilterComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerFilterPanel.h

@@ -29 +29 @@
 
 /* Forward declarations: */
+class QAbstractButton;
 class QButtonGroup;
 class QComboBox;
@@ -79 +80 @@
     void sltClearFilterTerms();
     /** Executes the necessary code to handle filter's boolean operator change ('And', 'Or'). */
-    void sltOperatorButtonChanged(int buttonId);
+    void sltOperatorButtonChanged(QAbstractButton *pButton);
     void sltRemoveFilterTerm(const QString &termString);
 

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

@@ -626 +626 @@
 
     setMediumFormat(m_formatList[0].m_comFormat);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    connect(m_pFormatButtonGroup, static_cast<void(QButtonGroup::*)(QAbstractButton *)>(&QButtonGroup::buttonClicked),
+            this, &UIDiskFormatsGroupBox::sigMediumFormatChanged);
+#else
     connect(m_pFormatButtonGroup, static_cast<void(QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked),
             this, &UIDiskFormatsGroupBox::sigMediumFormatChanged);
-}
+#endif
+}
+
 
 /*********************************************************************************************************************************
-*   UIDiskFormatsGroupBox implementation.                                                                                   *
+*   UIDiskFormatsGroupBox implementation.                                                                                        *
 *********************************************************************************************************************************/