From fa5335ba68df7f667cfe06dd3f07d43e4fdf3c86 Mon Sep 17 00:00:00 2001 From: Ernie Pasveer Date: Mon, 2 May 2022 19:57:17 -0500 Subject: [PATCH] Improve some compile warnings. Remove "-Wdeprecated-copy". Some compilers don't support. Support both QButtonGroup::buttonClicked() and QButtonGroup::idClicked(), depending on which vesion of QT is installed. --- src/CMakeLists.txt | 2 +- src/SeerArrayVisualizerWidget.cpp | 6 ++++++ src/SeerDebugDialog.cpp | 6 ++++++ src/SeerGdbConfigPage.cpp | 6 ++++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f3e851b..da41d6e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -172,7 +172,7 @@ endif() # for Linux, BSD, Solaris, Minix if(UNIX AND NOT APPLE) - add_compile_options(-Wall -Wextra -Wunused-result -Wdeprecated-copy -pedantic) # -Werror + add_compile_options(-Wall -Wextra -Wunused-result -pedantic) # -Werror -Wdeprecated-copy endif() add_compile_definitions(QT_DEPRECATED_WARNINGS) diff --git a/src/SeerArrayVisualizerWidget.cpp b/src/SeerArrayVisualizerWidget.cpp index 4049273..3d4e7c0 100644 --- a/src/SeerArrayVisualizerWidget.cpp +++ b/src/SeerArrayVisualizerWidget.cpp @@ -13,6 +13,7 @@ #include #include #include +#include SeerArrayVisualizerWidget::SeerArrayVisualizerWidget (QWidget* parent) : QWidget(parent) { @@ -59,7 +60,12 @@ SeerArrayVisualizerWidget::SeerArrayVisualizerWidget (QWidget* parent) : QWidget QObject::connect(titleLineEdit, &QLineEdit::returnPressed, this, &SeerArrayVisualizerWidget::handleTitleLineEdit); QObject::connect(pointsCheckBox, &QCheckBox::clicked, this, &SeerArrayVisualizerWidget::handlePointsCheckBox); QObject::connect(labelsCheckBox, &QCheckBox::clicked, this, &SeerArrayVisualizerWidget::handleLabelsCheckBox); + +#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)) QObject::connect(lineTypeButtonGroup, QOverload::of(&QButtonGroup::idClicked), this, &SeerArrayVisualizerWidget::handleLineTypeButtonGroup); +#else + QObject::connect(lineTypeButtonGroup, QOverload::of(&QButtonGroup::buttonClicked), this, &SeerArrayVisualizerWidget::handleLineTypeButtonGroup); +#endif // Restore window settings. readSettings(); diff --git a/src/SeerDebugDialog.cpp b/src/SeerDebugDialog.cpp index 43d6bbb..94aeba2 100644 --- a/src/SeerDebugDialog.cpp +++ b/src/SeerDebugDialog.cpp @@ -5,6 +5,7 @@ #include #include #include +#include SeerDebugDialog::SeerDebugDialog (QWidget* parent) : QDialog(parent) { @@ -33,7 +34,12 @@ SeerDebugDialog::SeerDebugDialog (QWidget* parent) : QDialog(parent) { QObject::connect(loadBreakpointsFilenameToolButton, &QToolButton::clicked, this, &SeerDebugDialog::handleLoadBreakpointsFilenameToolButton); QObject::connect(loadCoreFilenameToolButton, &QToolButton::clicked, this, &SeerDebugDialog::handleLoadCoreFilenameToolButton); QObject::connect(attachProgramPidToolButton, &QToolButton::clicked, this, &SeerDebugDialog::handleProgramPidToolButton); + +#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)) QObject::connect(_runModeButtonGroup, QOverload::of(&QButtonGroup::idClicked), this, &SeerDebugDialog::handleRunModeChanged); +#else + QObject::connect(_runModeButtonGroup, QOverload::of(&QButtonGroup::buttonClicked), this, &SeerDebugDialog::handleRunModeChanged); +#endif // Set initial run mode. handleRunModeChanged(-1); diff --git a/src/SeerGdbConfigPage.cpp b/src/SeerGdbConfigPage.cpp index 70716ea..654a650 100644 --- a/src/SeerGdbConfigPage.cpp +++ b/src/SeerGdbConfigPage.cpp @@ -1,6 +1,7 @@ #include "SeerGdbConfigPage.h" #include #include +#include SeerGdbConfigPage::SeerGdbConfigPage(QWidget* parent) : QWidget(parent) { @@ -11,7 +12,12 @@ SeerGdbConfigPage::SeerGdbConfigPage(QWidget* parent) : QWidget(parent) { // Connect things. QObject::connect(gdbProgramToolButton, &QToolButton::clicked, this, &SeerGdbConfigPage::handleGdbProgramToolButton); + +#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)) QObject::connect(styleButtonGroup, QOverload::of(&QButtonGroup::idClicked), this, &SeerGdbConfigPage::handleDprintfButtonGroup); +#else + QObject::connect(styleButtonGroup, QOverload::of(&QButtonGroup::buttonClicked), this, &SeerGdbConfigPage::handleDprintfButtonGroup); +#endif } SeerGdbConfigPage::~SeerGdbConfigPage() {