diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2018-12-02 14:16:47 +0100 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-01-26 10:37:06 +0000 |
commit | bf4bf3a58360d4f7907895096b452cb3821ea593 (patch) | |
tree | 0a784f40986afb9c73aed2f5d13a2f554a09ce2e /examples/widgets/widgets/sliders | |
parent | e81acde7d0cf5fb44a3fb2cf0bf7aaa2c65f807e (diff) |
Cleanup Widgets examples - signals/slots
Cleanup the widgets examples - use new signal/slot syntax where possible
Change-Id: I6bc8953534d8b1efca0de4ee6a9fe4a6aa79fda9
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
Reviewed-by: Konstantin Shegunov <kshegunov@gmail.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'examples/widgets/widgets/sliders')
-rw-r--r-- | examples/widgets/widgets/sliders/slidersgroup.cpp | 8 | ||||
-rw-r--r-- | examples/widgets/widgets/sliders/window.cpp | 48 |
2 files changed, 28 insertions, 28 deletions
diff --git a/examples/widgets/widgets/sliders/slidersgroup.cpp b/examples/widgets/widgets/sliders/slidersgroup.cpp index 365a003047..3bccdd687a 100644 --- a/examples/widgets/widgets/sliders/slidersgroup.cpp +++ b/examples/widgets/widgets/sliders/slidersgroup.cpp @@ -69,11 +69,11 @@ SlidersGroup::SlidersGroup(Qt::Orientation orientation, const QString &title, dial = new QDial; dial->setFocusPolicy(Qt::StrongFocus); - connect(slider, SIGNAL(valueChanged(int)), scrollBar, SLOT(setValue(int))); - connect(scrollBar, SIGNAL(valueChanged(int)), dial, SLOT(setValue(int))); - connect(dial, SIGNAL(valueChanged(int)), slider, SLOT(setValue(int))); + connect(slider, &QSlider::valueChanged, scrollBar, &QScrollBar::setValue); + connect(scrollBar, &QScrollBar::valueChanged, dial, &QDial::setValue); + connect(dial, &QDial::valueChanged, slider, &QSlider::setValue); //! [0] //! [1] - connect(dial, SIGNAL(valueChanged(int)), this, SIGNAL(valueChanged(int))); + connect(dial, &QDial::valueChanged, this, &SlidersGroup::valueChanged); //! [1] //! [2] //! [2] //! [3] diff --git a/examples/widgets/widgets/sliders/window.cpp b/examples/widgets/widgets/sliders/window.cpp index 16467e71be..d73fafec10 100644 --- a/examples/widgets/widgets/sliders/window.cpp +++ b/examples/widgets/widgets/sliders/window.cpp @@ -68,13 +68,13 @@ Window::Window(QWidget *parent) //! [0] //! [1] - connect(horizontalSliders, SIGNAL(valueChanged(int)), + connect(horizontalSliders, &SlidersGroup::valueChanged, //! [1] //! [2] - verticalSliders, SLOT(setValue(int))); - connect(verticalSliders, SIGNAL(valueChanged(int)), - valueSpinBox, SLOT(setValue(int))); - connect(valueSpinBox, SIGNAL(valueChanged(int)), - horizontalSliders, SLOT(setValue(int))); + verticalSliders, &SlidersGroup::setValue); + connect(verticalSliders, &SlidersGroup::valueChanged, + valueSpinBox, &QSpinBox::setValue); + connect(valueSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), + horizontalSliders, &SlidersGroup::setValue); QHBoxLayout *layout = new QHBoxLayout; layout->addWidget(controlsGroup); @@ -121,25 +121,25 @@ void Window::createControls(const QString &title) orientationCombo->addItem(tr("Vertical slider-like widgets")); //! [6] //! [7] - connect(orientationCombo, SIGNAL(activated(int)), + connect(orientationCombo, QOverload<int>::of(&QComboBox::activated), //! [7] //! [8] - stackedWidget, SLOT(setCurrentIndex(int))); - connect(minimumSpinBox, SIGNAL(valueChanged(int)), - horizontalSliders, SLOT(setMinimum(int))); - connect(minimumSpinBox, SIGNAL(valueChanged(int)), - verticalSliders, SLOT(setMinimum(int))); - connect(maximumSpinBox, SIGNAL(valueChanged(int)), - horizontalSliders, SLOT(setMaximum(int))); - connect(maximumSpinBox, SIGNAL(valueChanged(int)), - verticalSliders, SLOT(setMaximum(int))); - connect(invertedAppearance, SIGNAL(toggled(bool)), - horizontalSliders, SLOT(invertAppearance(bool))); - connect(invertedAppearance, SIGNAL(toggled(bool)), - verticalSliders, SLOT(invertAppearance(bool))); - connect(invertedKeyBindings, SIGNAL(toggled(bool)), - horizontalSliders, SLOT(invertKeyBindings(bool))); - connect(invertedKeyBindings, SIGNAL(toggled(bool)), - verticalSliders, SLOT(invertKeyBindings(bool))); + stackedWidget, &QStackedWidget::setCurrentIndex); + connect(minimumSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), + horizontalSliders, &SlidersGroup::setMinimum); + connect(minimumSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), + verticalSliders, &SlidersGroup::setMinimum); + connect(maximumSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), + horizontalSliders, &SlidersGroup::setMaximum); + connect(maximumSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), + verticalSliders, &SlidersGroup::setMaximum); + connect(invertedAppearance, &QCheckBox::toggled, + horizontalSliders, &SlidersGroup::invertAppearance); + connect(invertedAppearance, &QCheckBox::toggled, + verticalSliders, &SlidersGroup::invertAppearance); + connect(invertedKeyBindings, &QCheckBox::toggled, + horizontalSliders, &SlidersGroup::invertKeyBindings); + connect(invertedKeyBindings, &QCheckBox::toggled, + verticalSliders, &SlidersGroup::invertKeyBindings); QGridLayout *controlsLayout = new QGridLayout; controlsLayout->addWidget(minimumLabel, 0, 0); |