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 /src | |
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 'src')
-rw-r--r-- | src/serialport/qserialport_win.cpp | 6 | ||||
-rw-r--r-- | src/serialport/qserialport_wince.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp index ce95e41..1a407ec 100644 --- a/src/serialport/qserialport_win.cpp +++ b/src/serialport/qserialport_win.cpp @@ -595,7 +595,7 @@ qint64 QSerialPortPrivate::writeData(const char *data, qint64 maxSize) if (!writeBuffer.isEmpty() && !writeStarted) { if (!startAsyncWriteTimer) { startAsyncWriteTimer = new QTimer(q); - q->connect(startAsyncWriteTimer, SIGNAL(timeout()), q, SLOT(_q_startAsyncWrite())); + QObjectPrivate::connect(startAsyncWriteTimer, &QTimer::timeout, this, &QSerialPortPrivate::_q_startAsyncWrite); startAsyncWriteTimer->setSingleShot(true); } startAsyncWriteTimer->start(0); @@ -678,8 +678,8 @@ inline bool QSerialPortPrivate::initialize() } notifier = new QWinOverlappedIoNotifier(q); - q->connect(notifier, SIGNAL(notified(quint32, quint32, OVERLAPPED*)), - q, SLOT(_q_notified(quint32, quint32, OVERLAPPED*))); + QObjectPrivate::connect(notifier, &QWinOverlappedIoNotifier::notified, + this, &QSerialPortPrivate::_q_notified); notifier->setHandle(handle); notifier->setEnabled(true); diff --git a/src/serialport/qserialport_wince.cpp b/src/serialport/qserialport_wince.cpp index 7e019b3..4f475d6 100644 --- a/src/serialport/qserialport_wince.cpp +++ b/src/serialport/qserialport_wince.cpp @@ -84,7 +84,7 @@ signals: public: CommEventNotifier(DWORD mask, QSerialPortPrivate *d, QObject *parent) : QThread(parent), dptr(d) { - connect(this, SIGNAL(eventMask(quint32)), this, SLOT(processNotification(quint32))); + connect(this, &CommEventNotifier::eventMask, this, &CommEventNotifier::processNotification); ::SetCommMask(dptr->handle, mask); } @@ -156,7 +156,7 @@ public: protected: void run() { QTimer timer; - QObject::connect(&timer, SIGNAL(timeout()), this, SLOT(processTimeout()), Qt::DirectConnection); + QObject::connect(&timer, &QTimer::timeout, this, &WaitCommEventBreaker::processTimeout, Qt::DirectConnection); timer.start(timeout); exec(); worked = true; |