Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

4 files changed, 34 insertions, 33 deletions

diff --git a/examples/widgets/widgets/sliders/slidersgroup.cpp b/examples/widgets/widgets/sliders/slidersgroup.cpp
index 365a003047..b4eaf9bb3d 100644
--- a/examples/widgets/widgets/sliders/slidersgroup.cpp
+++ b/examples/widgets/widgets/sliders/slidersgroup.cpp
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "slidersgroup.h"
 
+#include <QtWidgets>
+
 //! [0]
 SlidersGroup::SlidersGroup(Qt::Orientation orientation, const QString &title,
                            QWidget *parent)
@@ -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/slidersgroup.h b/examples/widgets/widgets/sliders/slidersgroup.h
index 76dcbee0d8..7be8a3b4f8 100644
--- a/examples/widgets/widgets/sliders/slidersgroup.h
+++ b/examples/widgets/widgets/sliders/slidersgroup.h
@@ -66,7 +66,7 @@ class SlidersGroup : public QGroupBox
 
 public:
     SlidersGroup(Qt::Orientation orientation, const QString &title,
-                 QWidget *parent = 0);
+                 QWidget *parent = nullptr);
 
 signals:
     void valueChanged(int value);
diff --git a/examples/widgets/widgets/sliders/window.cpp b/examples/widgets/widgets/sliders/window.cpp
index 16b60dde49..d73fafec10 100644
--- a/examples/widgets/widgets/sliders/window.cpp
+++ b/examples/widgets/widgets/sliders/window.cpp
@@ -54,7 +54,8 @@
 #include "window.h"
 
 //! [0]
-Window::Window()
+Window::Window(QWidget *parent)
+    : QWidget(parent)
 {
     horizontalSliders = new SlidersGroup(Qt::Horizontal, tr("Horizontal"));
     verticalSliders = new SlidersGroup(Qt::Vertical, tr("Vertical"));
@@ -67,13 +68,13 @@ Window::Window()
 //! [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);
@@ -120,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);
diff --git a/examples/widgets/widgets/sliders/window.h b/examples/widgets/widgets/sliders/window.h
index 9c4c14fa37..4894781ac2 100644
--- a/examples/widgets/widgets/sliders/window.h
+++ b/examples/widgets/widgets/sliders/window.h
@@ -69,7 +69,7 @@ class Window : public QWidget
     Q_OBJECT
 
 public:
-    Window();
+    Window(QWidget *parent = nullptr);
 
 private:
     void createControls(const QString &title);