Qt Designer Examples: Introduce Qt 5 connect syntax.

Change-Id: I6f0f1fad45412ab3dd7b5ff82f9cab789b805080
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>

6 files changed, 19 insertions, 13 deletions

diff --git a/examples/designer/containerextension/multipagewidget.cpp b/examples/designer/containerextension/multipagewidget.cpp
index 330f1779e..767397a94 100644
--- a/examples/designer/containerextension/multipagewidget.cpp
+++ b/examples/designer/containerextension/multipagewidget.cpp
@@ -47,12 +47,14 @@
 MultiPageWidget::MultiPageWidget(QWidget *parent)
     : QWidget(parent)
 {
+    typedef void (QComboBox::*ComboBoxActivatedIntSignal)(int);
+
     comboBox = new QComboBox();
     comboBox->setObjectName("__qt__passive_comboBox");
     stackWidget = new QStackedWidget();
 
-    connect(comboBox, SIGNAL(activated(int)),
-            this, SLOT(setCurrentIndex(int)));
+    connect(comboBox, static_cast<ComboBoxActivatedIntSignal>(&QComboBox::activated),
+            this, &MultiPageWidget::setCurrentIndex);
 
     layout = new QVBoxLayout();
     layout->addWidget(comboBox);
diff --git a/examples/designer/containerextension/multipagewidgetplugin.cpp b/examples/designer/containerextension/multipagewidgetplugin.cpp
index bb4b4efb8..950f2ed04 100644
--- a/examples/designer/containerextension/multipagewidgetplugin.cpp
+++ b/examples/designer/containerextension/multipagewidgetplugin.cpp
@@ -99,10 +99,10 @@ bool MultiPageWidgetPlugin::isContainer() const
 QWidget *MultiPageWidgetPlugin::createWidget(QWidget *parent)
 {
     MultiPageWidget *widget = new MultiPageWidget(parent);
-    connect(widget, SIGNAL(currentIndexChanged(int)),
-            this, SLOT(currentIndexChanged(int)));
-    connect(widget, SIGNAL(pageTitleChanged(QString)),
-            this, SLOT(pageTitleChanged(QString)));
+    connect(widget, &MultiPageWidget::currentIndexChanged,
+            this, &MultiPageWidgetPlugin::currentIndexChanged);
+    connect(widget, &MultiPageWidget::pageTitleChanged,
+            this, &MultiPageWidgetPlugin::pageTitleChanged);
     return widget;
 }
 
diff --git a/examples/designer/customwidgetplugin/analogclock.cpp b/examples/designer/customwidgetplugin/analogclock.cpp
index 325bc428a..dec16b904 100644
--- a/examples/designer/customwidgetplugin/analogclock.cpp
+++ b/examples/designer/customwidgetplugin/analogclock.cpp
@@ -45,8 +45,10 @@
 AnalogClock::AnalogClock(QWidget *parent)
     : QWidget(parent)
 {
+    typedef void (QWidget::*WidgetUpdateSlot)();
+
     QTimer *timer = new QTimer(this);
-    connect(timer, SIGNAL(timeout()), this, SLOT(update()));
+    connect(timer, &QTimer::timeout, this, static_cast<WidgetUpdateSlot>(&QWidget::update));
     timer->start(1000);
 
     setWindowTitle(tr("Analog Clock"));
diff --git a/examples/designer/taskmenuextension/tictactoedialog.cpp b/examples/designer/taskmenuextension/tictactoedialog.cpp
index 7da36dc6b..f9923cc21 100644
--- a/examples/designer/taskmenuextension/tictactoedialog.cpp
+++ b/examples/designer/taskmenuextension/tictactoedialog.cpp
@@ -58,10 +58,10 @@ TicTacToeDialog::TicTacToeDialog(TicTacToe *tic, QWidget *parent)
                                      | QDialogButtonBox::Cancel
                                      | QDialogButtonBox::Reset);
 
-    connect(buttonBox->button(QDialogButtonBox::Reset), SIGNAL(clicked()),
-            this, SLOT(resetState()));
-    connect(buttonBox, SIGNAL(accepted()), this, SLOT(saveState()));
-    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+    connect(buttonBox->button(QDialogButtonBox::Reset), &QAbstractButton::clicked,
+            this, &TicTacToeDialog::resetState);
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &TicTacToeDialog::saveState);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
 
     QVBoxLayout *mainLayout = new QVBoxLayout;
     mainLayout->addWidget(editor);
diff --git a/examples/designer/taskmenuextension/tictactoetaskmenu.cpp b/examples/designer/taskmenuextension/tictactoetaskmenu.cpp
index d66462128..41a2ffcce 100644
--- a/examples/designer/taskmenuextension/tictactoetaskmenu.cpp
+++ b/examples/designer/taskmenuextension/tictactoetaskmenu.cpp
@@ -52,7 +52,7 @@ TicTacToeTaskMenu::TicTacToeTaskMenu(TicTacToe *tic, QObject *parent)
     ticTacToe = tic;
 
     editStateAction = new QAction(tr("Edit State..."), this);
-    connect(editStateAction, SIGNAL(triggered()), this, SLOT(editState()));
+    connect(editStateAction, &QAction::triggered, this, &TicTacToeTaskMenu::editState);
 }
 //! [0]
 
diff --git a/examples/designer/worldtimeclockplugin/worldtimeclock.cpp b/examples/designer/worldtimeclockplugin/worldtimeclock.cpp
index 9b36d27a4..bad16c82a 100644
--- a/examples/designer/worldtimeclockplugin/worldtimeclock.cpp
+++ b/examples/designer/worldtimeclockplugin/worldtimeclock.cpp
@@ -45,10 +45,12 @@
 WorldTimeClock::WorldTimeClock(QWidget *parent)
     : QWidget(parent)
 {
+    typedef void (QWidget::*WidgetUpdateSlot)();
+
     timeZoneOffset = 0;
 
     QTimer *timer = new QTimer(this);
-    connect(timer, SIGNAL(timeout()), this, SLOT(update()));
+    connect(timer, &QTimer::timeout, this, static_cast<WidgetUpdateSlot>(&QWidget::update));
     timer->start(1000);
 
     setWindowTitle(tr("World Time Clock"));