From 3d8923978b004b3690fc04f55c7e2473fc7f1be5 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 10 Apr 2015 11:18:01 +0200 Subject: [PATCH] Qt Designer Examples: Introduce Qt 5 connect syntax. Change-Id: I6f0f1fad45412ab3dd7b5ff82f9cab789b805080 Reviewed-by: Jarek Kobus --- examples/designer/containerextension/multipagewidget.cpp | 6 ++++-- examples/designer/containerextension/multipagewidgetplugin.cpp | 8 ++++---- examples/designer/customwidgetplugin/analogclock.cpp | 4 +++- examples/designer/taskmenuextension/tictactoedialog.cpp | 8 ++++---- examples/designer/taskmenuextension/tictactoetaskmenu.cpp | 2 +- examples/designer/worldtimeclockplugin/worldtimeclock.cpp | 4 +++- 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/examples/designer/containerextension/multipagewidget.cpp b/examples/designer/containerextension/multipagewidget.cpp index 330f177..767397a 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(&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 bb4b4ef..950f2ed 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 325bc42..dec16b9 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(&QWidget::update)); timer->start(1000); setWindowTitle(tr("Analog Clock")); diff --git a/examples/designer/taskmenuextension/tictactoedialog.cpp b/examples/designer/taskmenuextension/tictactoedialog.cpp index 7da36dc..f9923cc 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 d664621..41a2ffc 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 9b36d27..bad16c8 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(&QWidget::update)); timer->start(1000); setWindowTitle(tr("World Time Clock")); -- 2.7.4