diff options
author | Karsten Heimrich <karsten.heimrich@qt.io> | 2021-02-08 14:36:24 +0100 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2021-02-10 09:49:40 +0100 |
commit | e655ed23511e22306a17c901370ad9ab8e435694 (patch) | |
tree | 8473d661c6a575429eb75c728338de609fc16cb1 /tests | |
parent | 0fe69bca7e4e71af580672aa63dd61e0a632cc17 (diff) |
Qt SerialPort: dump 'master' and 'slave' terminology
Task-number: QTBUG-89882
Change-Id: I9fe2048e3aa6572af8556d58afc11ff4c4929f28
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qserialport/tst_qserialport.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/auto/qserialport/tst_qserialport.cpp b/tests/auto/qserialport/tst_qserialport.cpp index 84bb7a56..268b8475 100644 --- a/tests/auto/qserialport/tst_qserialport.cpp +++ b/tests/auto/qserialport/tst_qserialport.cpp @@ -1050,11 +1050,11 @@ void tst_QSerialPort::readAfterInputClear() QVERIFY(receiverPort.bytesAvailable() == 0); } -class MasterTransactor : public QObject +class SenderTransactor : public QObject { Q_OBJECT public: - explicit MasterTransactor(const QString &name) + explicit SenderTransactor(const QString &name) : serialPort(name) { } @@ -1087,7 +1087,7 @@ private slots: private: void createAsynchronousConnection() { - connect(&serialPort, &QSerialPort::readyRead, this, &MasterTransactor::transaction); + connect(&serialPort, &QSerialPort::readyRead, this, &SenderTransactor::transaction); } void deleteAsyncronousConnection() @@ -1098,14 +1098,14 @@ private: QSerialPort serialPort; }; -class SlaveTransactor : public QObject +class ReceiverTransactor : public QObject { Q_OBJECT public: - explicit SlaveTransactor(const QString &name) + explicit ReceiverTransactor(const QString &name) : serialPort(new QSerialPort(name, this)) { - connect(serialPort, &QSerialPort::readyRead, this, &SlaveTransactor::transaction); + connect(serialPort, &QSerialPort::readyRead, this, &ReceiverTransactor::transaction); } public slots: @@ -1130,17 +1130,17 @@ private: void tst_QSerialPort::synchronousReadWriteAfterAsynchronousReadWrite() { - MasterTransactor master(m_senderPortName); - auto slave = new SlaveTransactor(m_receiverPortName); + SenderTransactor sender(m_senderPortName); + auto receiver = new ReceiverTransactor(m_receiverPortName); QThread thread; - slave->moveToThread(&thread); + receiver->moveToThread(&thread); thread.start(); - QObject::connect(&thread, &QThread::finished, slave, &SlaveTransactor::deleteLater); - QObject::connect(slave, &SlaveTransactor::ready, &master, &MasterTransactor::open); + QObject::connect(&thread, &QThread::finished, receiver, &ReceiverTransactor::deleteLater); + QObject::connect(receiver, &ReceiverTransactor::ready, &sender, &SenderTransactor::open); - QMetaObject::invokeMethod(slave, "open", Qt::QueuedConnection); + QMetaObject::invokeMethod(receiver, "open", Qt::QueuedConnection); tst_QSerialPort::enterLoopMsecs(2000); |