diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2014-12-17 14:02:29 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2014-12-22 15:13:14 +0100 |
commit | 90f0b3bf752c03393a62dae04db9d536453fb97c (patch) | |
tree | b3cea785c54d3a780fec76b054c23b435c601b9d /tools | |
parent | dd224e5abf924e7e3927110a2a903bb496366d1e (diff) | |
download | qtactiveqt-90f0b3bf752c03393a62dae04db9d536453fb97c.tar.gz |
Use Qt 5 signals & slots syntax.
Change-Id: I92c4df2ca8a75d6caafa1900db0730d2e0abaf07
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/testcon/ambientproperties.cpp | 2 | ||||
-rw-r--r-- | tools/testcon/mainwindow.cpp | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/tools/testcon/ambientproperties.cpp b/tools/testcon/ambientproperties.cpp index 449faa9..1972803 100644 --- a/tools/testcon/ambientproperties.cpp +++ b/tools/testcon/ambientproperties.cpp @@ -45,7 +45,7 @@ AmbientProperties::AmbientProperties(QWidget *parent) { setupUi(this); - connect(buttonClose, SIGNAL(clicked()), this, SLOT(close())); + connect(buttonClose, &QAbstractButton::clicked, this, &QWidget::close); } void AmbientProperties::setControl(QWidget *widget) diff --git a/tools/testcon/mainwindow.cpp b/tools/testcon/mainwindow.cpp index 9af2693..b96a468 100644 --- a/tools/testcon/mainwindow.cpp +++ b/tools/testcon/mainwindow.cpp @@ -85,8 +85,8 @@ MainWindow::MainWindow(QWidget *parent) layout->addWidget(mdiArea); layout->setMargin(0); - connect(mdiArea, SIGNAL(subWindowActivated(QMdiSubWindow*)), this, SLOT(updateGUI())); - connect(actionFileExit, SIGNAL(triggered()), qApp, SLOT(quit())); + connect(mdiArea, &QMdiArea::subWindowActivated, this, &MainWindow::updateGUI); + connect(actionFileExit, &QAction::triggered, QCoreApplication::quit); } MainWindow::~MainWindow() @@ -340,8 +340,7 @@ void MainWindow::on_actionScriptingLoad_triggered() QAxScript *script = scripts->load(file, file); if (script) { - connect(script, SIGNAL(error(int,QString,int,QString)), - this, SLOT(logMacro(int,QString,int,QString))); + connect(script, &QAxScript::error, this, &MainWindow::logMacro); actionScriptingRun->setEnabled(true); } #else |