summaryrefslogtreecommitdiffstats
path: root/src/serialport/qserialport_wince.cpp
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2015-08-27 12:26:01 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2015-08-28 13:53:54 +0000
commit2610d81ead1fc755606e2bcd1418235bc0051d80 (patch)
treeecb50ad909f02b8ac2cb6b23c0fe740c8cc2777b /src/serialport/qserialport_wince.cpp
parent462f074efbf6ac2cf03b818fa4103f5529be0291 (diff)
Unify common error strings in QSerialPortErrorInfo
Change-Id: I1275e80988274e2409455217d5ffb03014962604 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'src/serialport/qserialport_wince.cpp')
-rw-r--r--src/serialport/qserialport_wince.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/serialport/qserialport_wince.cpp b/src/serialport/qserialport_wince.cpp
index b49dd75f..7e019b36 100644
--- a/src/serialport/qserialport_wince.cpp
+++ b/src/serialport/qserialport_wince.cpp
@@ -491,7 +491,7 @@ bool QSerialPortPrivate::notifyRead()
if (!sucessResult) {
buffer.chop(bytesToRead);
- setError(QSerialPortErrorInfo(QSerialPort::ReadError, QSerialPort::tr("Error reading from device")));
+ setError(QSerialPortErrorInfo(QSerialPort::ReadError));
return false;
}
@@ -534,7 +534,7 @@ bool QSerialPortPrivate::notifyWrite()
DWORD bytesWritten = 0;
if (!::WriteFile(handle, ptr, nextSize, &bytesWritten, Q_NULLPTR)) {
- setError(QSerialPortErrorInfo(QSerialPort::WriteError, QSerialPort::tr("Error writing to device")));
+ setError(QSerialPortErrorInfo(QSerialPort::WriteError));
return false;
}
@@ -557,7 +557,7 @@ qint64 QSerialPortPrivate::writeData(const char *data, qint64 maxSize)
void QSerialPortPrivate::processIoErrors(bool hasError)
{
if (hasError) {
- setError(QSerialPortErrorInfo(QSerialPort::ResourceError, QSerialPort::tr("Device disappeared from the system")));
+ setError(QSerialPortErrorInfo(QSerialPort::ResourceError));
return;
}
@@ -568,12 +568,12 @@ void QSerialPortPrivate::processIoErrors(bool hasError)
}
if (errors & CE_FRAME) {
- setError(QSerialPortErrorInfo(QSerialPort::FramingError, QSerialPort::tr("Framing error detected while reading")));
+ setError(QSerialPortErrorInfo(QSerialPort::FramingError));
} else if (errors & CE_RXPARITY) {
- setError(QSerialPortErrorInfo(QSerialPort::FramingError, QSerialPort::tr("ParityError error detected while reading")));
+ setError(QSerialPortErrorInfo(QSerialPort::FramingError));
parityErrorOccurred = true;
} else if (errors & CE_BREAK) {
- setError(QSerialPortErrorInfo(QSerialPort::BreakConditionError, QSerialPort::tr("Break condition detected while reading")));
+ setError(QSerialPortErrorInfo(QSerialPort::BreakConditionError));
} else {
setError(QSerialPortErrorInfo(QSerialPort::UnknownError, QSerialPort::tr("Unknown streaming error")));
}
@@ -711,7 +711,7 @@ bool QSerialPortPrivate::waitForReadOrWrite(bool *selectForRead, bool *selectFor
breaker.stop();
if (breaker.isWorked()) {
- setError(QSerialPortErrorInfo(QSerialPort::TimeoutError, QSerialPort::tr("Operation timed out")));
+ setError(QSerialPortErrorInfo(QSerialPort::TimeoutError));
} else {
if (checkRead) {
Q_ASSERT(selectForRead);