summaryrefslogtreecommitdiff
path: root/examples/blockingmaster/masterthread.cpp
diff options
context:
space:
mode:
authorLaszlo Papp <lpapp@kde.org>2013-01-27 00:51:31 +0000
committerLaszlo Papp <lpapp@kde.org>2013-01-27 13:01:22 +0100
commitd5b47055d0ae2b171bb07f27366d4d9c882f732a (patch)
tree0a2958b3ac27233c3bf259a6a51dce588f061560 /examples/blockingmaster/masterthread.cpp
parent6f5d68fdec2b3b35b995f9ecc2f4844ec4ae9183 (diff)
downloadqtserialport-d5b47055d0ae2b171bb07f27366d4d9c882f732a.tar.gz
Rename the SerialPort* classes to QSerialPort* including the internals.
Unfortunately, the rename has to happen in a separate commit because of the limitations of "git": "git does not track renames of files in history, git only records tree snapshots. It can try to guess whether a change was a rename, or just unrelated removal+addition, when asked. You can help this by making the rename in a different commit from a modification. See man git-log -C and -M" ... so the rename will happen in the next change. Change-Id: Ibe56eba0a0d2c7489db48a6c519d60d3315c00de Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'examples/blockingmaster/masterthread.cpp')
-rw-r--r--examples/blockingmaster/masterthread.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/blockingmaster/masterthread.cpp b/examples/blockingmaster/masterthread.cpp
index 92bf6ac..6cee93b 100644
--- a/examples/blockingmaster/masterthread.cpp
+++ b/examples/blockingmaster/masterthread.cpp
@@ -96,7 +96,7 @@ void MasterThread::run()
QString currentRequest = request;
mutex.unlock();
//! [5] //! [6]
- SerialPort serial;
+ QSerialPort serial;
while (!quit) {
//![6] //! [7]
@@ -110,31 +110,31 @@ void MasterThread::run()
return;
}
- if (!serial.setBaudRate(SerialPort::Baud9600)) {
+ if (!serial.setBaudRate(QSerialPort::Baud9600)) {
emit error(tr("Can't set baud rate 9600 baud to port %1, error code %2")
.arg(portName).arg(serial.error()));
return;
}
- if (!serial.setDataBits(SerialPort::Data8)) {
+ if (!serial.setDataBits(QSerialPort::Data8)) {
emit error(tr("Can't set 8 data bits to port %1, error code %2")
.arg(portName).arg(serial.error()));
return;
}
- if (!serial.setParity(SerialPort::NoParity)) {
+ if (!serial.setParity(QSerialPort::NoParity)) {
emit error(tr("Can't set no patity to port %1, error code %2")
.arg(portName).arg(serial.error()));
return;
}
- if (!serial.setStopBits(SerialPort::OneStop)) {
+ if (!serial.setStopBits(QSerialPort::OneStop)) {
emit error(tr("Can't set 1 stop bit to port %1, error code %2")
.arg(portName).arg(serial.error()));
return;
}
- if (!serial.setFlowControl(SerialPort::NoFlowControl)) {
+ if (!serial.setFlowControl(QSerialPort::NoFlowControl)) {
emit error(tr("Can't set no flow control to port %1, error code %2")
.arg(portName).arg(serial.error()));
return;