From 158edcc09366a7bde71ad709f262155ff204e07e Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 8 Jul 2020 11:29:40 +0300 Subject: [PATCH] Use of QButtonGroup::buttonClicked has been deprecated since Qt 5.15. --- src/libs/vmisc/dialogs/dialogexporttocsv.cpp | 4 ++++ src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp | 6 ++++++ .../vtools/dialogs/tools/piece/dialogseamallowance.cpp | 7 +++++++ 3 files changed, 17 insertions(+) diff --git a/src/libs/vmisc/dialogs/dialogexporttocsv.cpp b/src/libs/vmisc/dialogs/dialogexporttocsv.cpp index 2dbf2fb81..afe54328d 100644 --- a/src/libs/vmisc/dialogs/dialogexporttocsv.cpp +++ b/src/libs/vmisc/dialogs/dialogexporttocsv.cpp @@ -83,7 +83,11 @@ DialogExportToCSV::DialogExportToCSV(QWidget *parent) connect(ui->comboBoxCodec, QOverload::of(&QComboBox::currentIndexChanged), this, [this](){ShowPreview();}); connect(ui->checkBoxWithHeader, &QCheckBox::stateChanged, this, [this](){ShowPreview();}); +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) connect(ui->buttonGroup, QOverload::of(&QButtonGroup::buttonClicked), this, [this](){ShowPreview();}); +#else + connect(ui->buttonGroup, &QButtonGroup::idClicked, this, [this](){ShowPreview();}); +#endif } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp index c5332b4b5..d87813835 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp @@ -1154,10 +1154,16 @@ void DialogPiecePath::InitPassmarksTab() connect(ui->comboBoxPassmarks, QOverload::of(&QComboBox::currentIndexChanged), this, &DialogPiecePath::PassmarkChanged); +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) connect(ui->buttonGroupMarkType, QOverload::of(&QButtonGroup::buttonClicked), this, &DialogPiecePath::PassmarkLineTypeChanged); connect(ui->buttonGroupAngleType, QOverload::of(&QButtonGroup::buttonClicked), this, &DialogPiecePath::PassmarkAngleTypeChanged); +#else + connect(ui->buttonGroupMarkType, &QButtonGroup::idClicked, this, &DialogPiecePath::PassmarkLineTypeChanged); + connect(ui->buttonGroupAngleType, &QButtonGroup::idClicked, this, &DialogPiecePath::PassmarkAngleTypeChanged); +#endif + connect(ui->checkBoxShowSecondPassmark, &QCheckBox::stateChanged, this, &DialogPiecePath::PassmarkShowSecondChanged); connect(ui->toolButtonExprLength, &QPushButton::clicked, this, &DialogPiecePath::FXPassmarkLength); diff --git a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp index 86db51444..7ae853261 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp @@ -3190,10 +3190,17 @@ void DialogSeamAllowance::InitPassmarksTab() connect(uiTabPassmarks->comboBoxPassmarks, QOverload::of(&QComboBox::currentIndexChanged), this, &DialogSeamAllowance::PassmarkChanged); +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) connect(uiTabPassmarks->buttonGroupLineType, QOverload::of(&QButtonGroup::buttonClicked), this, &DialogSeamAllowance::PassmarkLineTypeChanged); connect(uiTabPassmarks->buttonGroupAngleType, QOverload::of(&QButtonGroup::buttonClicked), this, &DialogSeamAllowance::PassmarkAngleTypeChanged); +#else + connect(uiTabPassmarks->buttonGroupLineType, &QButtonGroup::idClicked, + this, &DialogSeamAllowance::PassmarkLineTypeChanged); + connect(uiTabPassmarks->buttonGroupAngleType, &QButtonGroup::idClicked, + this, &DialogSeamAllowance::PassmarkAngleTypeChanged); +#endif connect(uiTabPassmarks->checkBoxShowSecondPassmark, &QCheckBox::stateChanged, this, &DialogSeamAllowance::PassmarkShowSecondChanged); connect(uiTabPassmarks->toolButtonExprLength, &QPushButton::clicked, this, &DialogSeamAllowance::FXPassmarkLength);