diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2015-07-03 13:05:18 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2015-09-02 10:32:58 +0000 |
commit | 14d8b2a3994adf8f2f94b065288980d5e61e0ba0 (patch) | |
tree | 2fcada303f662cb14a33f2ca84ca58d5ab720062 /examples/serialport/terminal | |
parent | 2610d81ead1fc755606e2bcd1418235bc0051d80 (diff) | |
download | qtserialport-14d8b2a3994adf8f2f94b065288980d5e61e0ba0.tar.gz |
Use the new signal/slot syntax everywherev5.6.0-alpha1
Change-Id: Ia9868d010106abbfeb8f8d24e84adf37de879991
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'examples/serialport/terminal')
-rw-r--r-- | examples/serialport/terminal/mainwindow.cpp | 22 | ||||
-rw-r--r-- | examples/serialport/terminal/settingsdialog.cpp | 16 |
2 files changed, 19 insertions, 19 deletions
diff --git a/examples/serialport/terminal/mainwindow.cpp b/examples/serialport/terminal/mainwindow.cpp index 3630b1f..b26b884 100644 --- a/examples/serialport/terminal/mainwindow.cpp +++ b/examples/serialport/terminal/mainwindow.cpp @@ -66,13 +66,13 @@ MainWindow::MainWindow(QWidget *parent) : initActionsConnections(); - connect(serial, SIGNAL(error(QSerialPort::SerialPortError)), this, - SLOT(handleError(QSerialPort::SerialPortError))); + connect(serial, static_cast<void (QSerialPort::*)(QSerialPort::SerialPortError)>(&QSerialPort::error), + this, &MainWindow::handleError); //! [2] - connect(serial, SIGNAL(readyRead()), this, SLOT(readData())); + connect(serial, &QSerialPort::readyRead, this, &MainWindow::readData); //! [2] - connect(console, SIGNAL(getData(QByteArray)), this, SLOT(writeData(QByteArray))); + connect(console, &Console::getData, this, &MainWindow::writeData); //! [3] } //! [3] @@ -158,13 +158,13 @@ void MainWindow::handleError(QSerialPort::SerialPortError error) void MainWindow::initActionsConnections() { - connect(ui->actionConnect, SIGNAL(triggered()), this, SLOT(openSerialPort())); - connect(ui->actionDisconnect, SIGNAL(triggered()), this, SLOT(closeSerialPort())); - connect(ui->actionQuit, SIGNAL(triggered()), this, SLOT(close())); - connect(ui->actionConfigure, SIGNAL(triggered()), settings, SLOT(show())); - connect(ui->actionClear, SIGNAL(triggered()), console, SLOT(clear())); - connect(ui->actionAbout, SIGNAL(triggered()), this, SLOT(about())); - connect(ui->actionAboutQt, SIGNAL(triggered()), qApp, SLOT(aboutQt())); + connect(ui->actionConnect, &QAction::triggered, this, &MainWindow::openSerialPort); + connect(ui->actionDisconnect, &QAction::triggered, this, &MainWindow::closeSerialPort); + connect(ui->actionQuit, &QAction::triggered, this, &MainWindow::close); + connect(ui->actionConfigure, &QAction::triggered, settings, &MainWindow::show); + connect(ui->actionClear, &QAction::triggered, console, &Console::clear); + connect(ui->actionAbout, &QAction::triggered, this, &MainWindow::about); + connect(ui->actionAboutQt, &QAction::triggered, qApp, &QApplication::aboutQt); } void MainWindow::showStatusMessage(const QString &message) diff --git a/examples/serialport/terminal/settingsdialog.cpp b/examples/serialport/terminal/settingsdialog.cpp index 900d2fe..cd7211d 100644 --- a/examples/serialport/terminal/settingsdialog.cpp +++ b/examples/serialport/terminal/settingsdialog.cpp @@ -53,14 +53,14 @@ SettingsDialog::SettingsDialog(QWidget *parent) : ui->baudRateBox->setInsertPolicy(QComboBox::NoInsert); - connect(ui->applyButton, SIGNAL(clicked()), - this, SLOT(apply())); - connect(ui->serialPortInfoListBox, SIGNAL(currentIndexChanged(int)), - this, SLOT(showPortInfo(int))); - connect(ui->baudRateBox, SIGNAL(currentIndexChanged(int)), - this, SLOT(checkCustomBaudRatePolicy(int))); - connect(ui->serialPortInfoListBox, SIGNAL(currentIndexChanged(int)), - this, SLOT(checkCustomDevicePathPolicy(int))); + connect(ui->applyButton, &QPushButton::clicked, + this, &SettingsDialog::apply); + connect(ui->serialPortInfoListBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), + this, &SettingsDialog::showPortInfo); + connect(ui->baudRateBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), + this, &SettingsDialog::checkCustomBaudRatePolicy); + connect(ui->serialPortInfoListBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), + this, &SettingsDialog::checkCustomDevicePathPolicy); fillPortsParameters(); fillPortsInfo(); |