summaryrefslogtreecommitdiffstats
path: root/src/serialport/qserialport_win.cpp
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2016-01-10 15:31:56 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2016-01-11 11:06:46 +0000
commit6dda140ada3d7c683537b069bf1512275a190884 (patch)
tree18802caba365a102c4abf1c90f4f17fc3e221958 /src/serialport/qserialport_win.cpp
parent4ff8b20cf2877298c8437fb892ebda600f46e293 (diff)
Get rid of QSPP::updateCommTimeouts() method
This method is used only once when initializing of a device. Thus its code can be moved to an initialization place, and this method can be removed then. Change-Id: Ie9a40da1d6a2980829327f66830893ad7179bd57 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'src/serialport/qserialport_win.cpp')
-rw-r--r--src/serialport/qserialport_win.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp
index f1760256..6d5dac0b 100644
--- a/src/serialport/qserialport_win.cpp
+++ b/src/serialport/qserialport_win.cpp
@@ -631,8 +631,10 @@ inline bool QSerialPortPrivate::initialize()
::ZeroMemory(&currentCommTimeouts, sizeof(currentCommTimeouts));
currentCommTimeouts.ReadIntervalTimeout = MAXDWORD;
- if (!updateCommTimeouts())
+ if (!::SetCommTimeouts(handle, &currentCommTimeouts)) {
+ setError(getSystemError());
return false;
+ }
if (!::SetCommMask(handle, originalEventMask)) {
setError(getSystemError());
@@ -672,15 +674,6 @@ bool QSerialPortPrivate::getDcb(DCB *dcb)
return true;
}
-bool QSerialPortPrivate::updateCommTimeouts()
-{
- if (!::SetCommTimeouts(handle, &currentCommTimeouts)) {
- setError(getSystemError());
- return false;
- }
- return true;
-}
-
QSerialPortErrorInfo QSerialPortPrivate::getSystemError(int systemErrorCode) const
{
if (systemErrorCode == -1)