diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-23 18:06:51 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-01-23 21:20:42 +0000 |
commit | 81a7ba345cfde7862e61a2a482324cf5b391d6f0 (patch) | |
tree | 49cf77a58bfe3e92fa8c1a84025b1f97bf301ff3 /examples/designer/calculatorform | |
parent | 159a62f184828ef36f076f2caa286e8beb67e0d4 (diff) |
Qt Designer/calculatorform example: Remove autoconnected slots
The autoconnection feature is considered error-prone and is warned
about by clazy.
As a drive-by, fix the documentation of the project files.
Task-number: QTBUG-110447
Change-Id: I7ba1bf47487abadfeaf02fd573eb01d0519a2ffd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit d3a36cf82e2b7f64eb2e096a87e589479d8ac1df)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples/designer/calculatorform')
-rw-r--r-- | examples/designer/calculatorform/CMakeLists.txt | 4 | ||||
-rw-r--r-- | examples/designer/calculatorform/calculatorform.cpp | 14 | ||||
-rw-r--r-- | examples/designer/calculatorform/calculatorform.h | 3 |
3 files changed, 10 insertions, 11 deletions
diff --git a/examples/designer/calculatorform/CMakeLists.txt b/examples/designer/calculatorform/CMakeLists.txt index d68752b6a..27856f091 100644 --- a/examples/designer/calculatorform/CMakeLists.txt +++ b/examples/designer/calculatorform/CMakeLists.txt @@ -2,7 +2,9 @@ cmake_minimum_required(VERSION 3.16) project(calculatorform LANGUAGES CXX) set(CMAKE_AUTOMOC ON) +#! [0] set(CMAKE_AUTOUIC ON) +#! [0] if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") @@ -12,10 +14,12 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/designer/calculatorform") find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) +#! [1] qt_add_executable(calculatorform calculatorform.cpp calculatorform.h calculatorform.ui main.cpp ) +#! [1] set_target_properties(calculatorform PROPERTIES WIN32_EXECUTABLE TRUE diff --git a/examples/designer/calculatorform/calculatorform.cpp b/examples/designer/calculatorform/calculatorform.cpp index 8d5fc88d3..24ce24a61 100644 --- a/examples/designer/calculatorform/calculatorform.cpp +++ b/examples/designer/calculatorform/calculatorform.cpp @@ -8,19 +8,15 @@ CalculatorForm::CalculatorForm(QWidget *parent) : QWidget(parent) { ui.setupUi(this); + connect(ui.inputSpinBox1, &QSpinBox::valueChanged, this, &CalculatorForm::updateResult); + connect(ui.inputSpinBox2, &QSpinBox::valueChanged, this, &CalculatorForm::updateResult); } //! [0] //! [1] -void CalculatorForm::on_inputSpinBox1_valueChanged(int value) +void CalculatorForm::updateResult() { - ui.outputWidget->setText(QString::number(value + ui.inputSpinBox2->value())); + const int sum = ui.inputSpinBox1->value() + ui.inputSpinBox2->value(); + ui.outputWidget->setText(QString::number(sum)); } //! [1] - -//! [2] -void CalculatorForm::on_inputSpinBox2_valueChanged(int value) -{ - ui.outputWidget->setText(QString::number(value + ui.inputSpinBox1->value())); -} -//! [2] diff --git a/examples/designer/calculatorform/calculatorform.h b/examples/designer/calculatorform/calculatorform.h index bb301ceaa..9224ba027 100644 --- a/examples/designer/calculatorform/calculatorform.h +++ b/examples/designer/calculatorform/calculatorform.h @@ -17,8 +17,7 @@ public: explicit CalculatorForm(QWidget *parent = nullptr); private slots: - void on_inputSpinBox1_valueChanged(int value); - void on_inputSpinBox2_valueChanged(int value); + void updateResult(); private: Ui::CalculatorForm ui; |