summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaszlo Papp <lpapp@kde.org>2014-02-08 07:50:51 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-10 12:02:26 +0100
commit27cb087a6af00f4bdbfcbd1a8e064b504f593f21 (patch)
treebd3c2a7912a556d62c8499854ae39421dfc999a0
parent558efaa9e7827b652a1902c96dc5a275ebd5419a (diff)
downloadqtserialport-27cb087a6af00f4bdbfcbd1a8e064b504f593f21.tar.gz
Rename the writeSequenceStarted variable to writeStarted
Conflicts: src/serialport/qserialport_win.cpp Change-Id: I786879a485e78e3637d8cb474f86e3bd406bd237 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
-rw-r--r--src/serialport/qserialport_win.cpp14
-rw-r--r--src/serialport/qserialport_win_p.h2
2 files changed, 8 insertions, 8 deletions
diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp
index 4dc2fe6..3bd0076 100644
--- a/src/serialport/qserialport_win.cpp
+++ b/src/serialport/qserialport_win.cpp
@@ -102,7 +102,7 @@ QSerialPortPrivate::QSerialPortPrivate(QSerialPort *q)
, parityErrorOccurred(false)
, readChunkBuffer(ReadChunkSize, 0)
, readyReadEmitted(0)
- , writeSequenceStarted(false)
+ , writeStarted(false)
, communicationNotifier(new QWinEventNotifier(q))
, readCompletionNotifier(new QWinEventNotifier(q))
, writeCompletionNotifier(new QWinEventNotifier(q))
@@ -219,7 +219,7 @@ void QSerialPortPrivate::close()
readBuffer.clear();
- writeSequenceStarted = false;
+ writeStarted = false;
writeBuffer.clear();
readyReadEmitted = false;
@@ -318,7 +318,7 @@ bool QSerialPortPrivate::clear(QSerialPort::Directions directions)
flags |= PURGE_RXABORT | PURGE_RXCLEAR;
if (directions & QSerialPort::Output) {
flags |= PURGE_TXABORT | PURGE_TXCLEAR;
- writeSequenceStarted = false;
+ writeStarted = false;
}
if (!::PurgeComm(handle, flags)) {
q->setError(decodeSystemError());
@@ -359,7 +359,7 @@ bool QSerialPortPrivate::setBreakEnabled(bool set)
void QSerialPortPrivate::startWriting()
{
- if (!writeSequenceStarted)
+ if (!writeStarted)
startAsyncWrite();
}
@@ -603,7 +603,7 @@ void QSerialPortPrivate::_q_completeAsyncWrite()
emit q->bytesWritten(numberOfBytesTransferred);
}
- writeSequenceStarted = false;
+ writeStarted = false;
startAsyncWrite();
}
@@ -657,7 +657,7 @@ bool QSerialPortPrivate::startAsyncWrite()
{
Q_Q(QSerialPort);
- if (writeBuffer.isEmpty() || writeSequenceStarted)
+ if (writeBuffer.isEmpty() || writeStarted)
return true;
initializeOverlappedStructure(writeCompletionOverlapped);
@@ -674,7 +674,7 @@ bool QSerialPortPrivate::startAsyncWrite()
}
}
- writeSequenceStarted = true;
+ writeStarted = true;
return true;
}
diff --git a/src/serialport/qserialport_win_p.h b/src/serialport/qserialport_win_p.h
index 0ece047..ad5f267 100644
--- a/src/serialport/qserialport_win_p.h
+++ b/src/serialport/qserialport_win_p.h
@@ -126,7 +126,7 @@ public:
#ifndef Q_OS_WINCE
QByteArray readChunkBuffer;
bool readyReadEmitted;
- bool writeSequenceStarted;
+ bool writeStarted;
QWinEventNotifier *communicationNotifier;
QWinEventNotifier *readCompletionNotifier;
QWinEventNotifier *writeCompletionNotifier;