Rename the flow to flowControl for consistency

Change-Id: Ida3c4ff049f21bd96fd64b41c66787b3961ada5e
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>

7 files changed, 29 insertions, 29 deletions

diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp
index 060fcdc..3f14662 100644
--- a/src/serialport/qserialport.cpp
+++ b/src/serialport/qserialport.cpp
@@ -73,7 +73,7 @@ QSerialPortPrivateData::QSerialPortPrivateData(QSerialPort *q)
     , dataBits(QSerialPort::Data8)
     , parity(QSerialPort::NoParity)
     , stopBits(QSerialPort::OneStop)
-    , flow(QSerialPort::NoFlowControl)
+    , flowControl(QSerialPort::NoFlowControl)
     , policy(QSerialPort::IgnorePolicy)
     , settingsRestoredOnClose(true)
     , q_ptr(q)
@@ -835,7 +835,7 @@ QSerialPort::StopBits QSerialPort::stopBits() const
     with the kernel and hardware. Hence, the two scenarios cannot be completely
     compared to each other.
 */
-bool QSerialPort::setFlowControl(FlowControl flow)
+bool QSerialPort::setFlowControl(FlowControl flowControl)
 {
     Q_D(QSerialPort);
 
@@ -845,10 +845,10 @@ bool QSerialPort::setFlowControl(FlowControl flow)
         return false;
     }
 
-    if (d->setFlowControl(flow)) {
-        if (d->flow != flow) {
-            d->flow = flow;
-            emit flowControlChanged(d->flow);
+    if (d->setFlowControl(flowControl)) {
+        if (d->flowControl != flowControl) {
+            d->flowControl = flowControl;
+            emit flowControlChanged(d->flowControl);
         }
         return true;
     }
@@ -859,7 +859,7 @@ bool QSerialPort::setFlowControl(FlowControl flow)
 QSerialPort::FlowControl QSerialPort::flowControl() const
 {
     Q_D(const QSerialPort);
-    return d->flow;
+    return d->flowControl;
 }
 
 /*!
diff --git a/src/serialport/qserialport.h b/src/serialport/qserialport.h
index 30e3b8c..fb77e81 100644
--- a/src/serialport/qserialport.h
+++ b/src/serialport/qserialport.h
@@ -213,7 +213,7 @@ public:
     bool setStopBits(StopBits stopBits);
     StopBits stopBits() const;
 
-    bool setFlowControl(FlowControl flow);
+    bool setFlowControl(FlowControl flowControl);
     FlowControl flowControl() const;
 
     bool setDataTerminalReady(bool set);
@@ -258,7 +258,7 @@ Q_SIGNALS:
     void dataBitsChanged(QSerialPort::DataBits dataBits);
     void parityChanged(QSerialPort::Parity parity);
     void stopBitsChanged(QSerialPort::StopBits stopBits);
-    void flowControlChanged(QSerialPort::FlowControl flow);
+    void flowControlChanged(QSerialPort::FlowControl flowControl);
     void dataErrorPolicyChanged(QSerialPort::DataErrorPolicy policy);
     void dataTerminalReadyChanged(bool set);
     void requestToSendChanged(bool set);
diff --git a/src/serialport/qserialport_p.h b/src/serialport/qserialport_p.h
index 2166b47..e969f2f 100644
--- a/src/serialport/qserialport_p.h
+++ b/src/serialport/qserialport_p.h
@@ -70,7 +70,7 @@ public:
     QSerialPort::DataBits dataBits;
     QSerialPort::Parity parity;
     QSerialPort::StopBits stopBits;
-    QSerialPort::FlowControl flow;
+    QSerialPort::FlowControl flowControl;
     QSerialPort::DataErrorPolicy policy;
     bool dataTerminalReady;
     bool requestToSend;
diff --git a/src/serialport/qserialport_symbian.cpp b/src/serialport/qserialport_symbian.cpp
index b904d2b..7b8d5fd 100644
--- a/src/serialport/qserialport_symbian.cpp
+++ b/src/serialport/qserialport_symbian.cpp
@@ -340,9 +340,9 @@ bool QSerialPortPrivate::setStopBits(QSerialPort::StopBits stopBits)
     return updateCommConfig();
 }
 
-bool QSerialPortPrivate::setFlowControl(QSerialPort::FlowControl flow)
+bool QSerialPortPrivate::setFlowControl(QSerialPort::FlowControl flowControl)
 {
-    switch (flow) {
+    switch (flowControl) {
     case QSerialPort::NoFlowControl:
         currentSettings().iHandshake = KConfigFailDSR;
         break;
@@ -455,15 +455,15 @@ void QSerialPortPrivate::detectDefaultSettings()
     // Detect flow control.
     if ((currentSettings().iHandshake & (KConfigObeyXoff | KConfigSendXoff))
             == (KConfigObeyXoff | KConfigSendXoff))
-        flow = QSerialPort::SoftwareControl;
+        flowControl = QSerialPort::SoftwareControl;
     else if ((currentSettings().iHandshake & (KConfigObeyCTS | KConfigFreeRTS))
              == (KConfigObeyCTS | KConfigFreeRTS))
-        flow = QSerialPort::HardwareControl;
+        flowControl = QSerialPort::HardwareControl;
     else if (currentSettings().iHandshake & KConfigFailDSR)
-        flow = QSerialPort::NoFlowControl;
+        flowControl = QSerialPort::NoFlowControl;
     else {
         qWarning("%s: Unexpected flow control settings", Q_FUNC_INFO);
-        flow = QSerialPort::NoFlowControl;
+        flowControl = QSerialPort::NoFlowControl;
     }
 }
 
diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp
index 6c92d17..3ab7514 100644
--- a/src/serialport/qserialport_unix.cpp
+++ b/src/serialport/qserialport_unix.cpp
@@ -668,9 +668,9 @@ bool QSerialPortPrivate::setStopBits(QSerialPort::StopBits stopBits)
     return updateTermios();
 }
 
-bool QSerialPortPrivate::setFlowControl(QSerialPort::FlowControl flow)
+bool QSerialPortPrivate::setFlowControl(QSerialPort::FlowControl flowControl)
 {
-    switch (flow) {
+    switch (flowControl) {
     case QSerialPort::NoFlowControl:
         currentTermios.c_cflag &= ~CRTSCTS;
         currentTermios.c_iflag &= ~(IXON | IXOFF | IXANY);
@@ -944,14 +944,14 @@ void QSerialPortPrivate::detectDefaultSettings()
 
     // Detect flow control.
     if ((!(currentTermios.c_cflag & CRTSCTS)) && (!(currentTermios.c_iflag & (IXON | IXOFF | IXANY))))
-        flow = QSerialPort::NoFlowControl;
+        flowControl = QSerialPort::NoFlowControl;
     else if ((!(currentTermios.c_cflag & CRTSCTS)) && (currentTermios.c_iflag & (IXON | IXOFF | IXANY)))
-        flow = QSerialPort::SoftwareControl;
+        flowControl = QSerialPort::SoftwareControl;
     else if ((currentTermios.c_cflag & CRTSCTS) && (!(currentTermios.c_iflag & (IXON | IXOFF | IXANY))))
-        flow = QSerialPort::HardwareControl;
+        flowControl = QSerialPort::HardwareControl;
     else {
         qWarning("%s: Unexpected flow control settings", Q_FUNC_INFO);
-        flow = QSerialPort::NoFlowControl;
+        flowControl = QSerialPort::NoFlowControl;
     }
 }
 
diff --git a/src/serialport/qserialport_unix_p.h b/src/serialport/qserialport_unix_p.h
index ed86fc8..566ce52 100644
--- a/src/serialport/qserialport_unix_p.h
+++ b/src/serialport/qserialport_unix_p.h
@@ -117,7 +117,7 @@ public:
     bool setDataBits(QSerialPort::DataBits dataBits);
     bool setParity(QSerialPort::Parity parity);
     bool setStopBits(QSerialPort::StopBits stopBits);
-    bool setFlowControl(QSerialPort::FlowControl flow);
+    bool setFlowControl(QSerialPort::FlowControl flowControl);
     bool setDataErrorPolicy(QSerialPort::DataErrorPolicy policy);
 
     bool readNotification();
diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp
index be4530a..abf13b3 100644
--- a/src/serialport/qserialport_win.cpp
+++ b/src/serialport/qserialport_win.cpp
@@ -526,13 +526,13 @@ bool QSerialPortPrivate::setStopBits(QSerialPort::StopBits stopBits)
     return updateDcb();
 }
 
-bool QSerialPortPrivate::setFlowControl(QSerialPort::FlowControl flow)
+bool QSerialPortPrivate::setFlowControl(QSerialPort::FlowControl flowControl)
 {
     currentDcb.fInX = FALSE;
     currentDcb.fOutX = FALSE;
     currentDcb.fOutxCtsFlow = FALSE;
     currentDcb.fRtsControl = RTS_CONTROL_DISABLE;
-    switch (flow) {
+    switch (flowControl) {
     case QSerialPort::NoFlowControl:
         break;
     case QSerialPort::SoftwareControl:
@@ -855,15 +855,15 @@ void QSerialPortPrivate::detectDefaultSettings()
     // Detect flow control.
     if (!currentDcb.fOutxCtsFlow && (currentDcb.fRtsControl == RTS_CONTROL_DISABLE)
             && !currentDcb.fInX && !currentDcb.fOutX) {
-        flow = QSerialPort::NoFlowControl;
+        flowControl = QSerialPort::NoFlowControl;
     } else if (!currentDcb.fOutxCtsFlow && (currentDcb.fRtsControl == RTS_CONTROL_DISABLE)
                && currentDcb.fInX && currentDcb.fOutX) {
-        flow = QSerialPort::SoftwareControl;
+        flowControl = QSerialPort::SoftwareControl;
     } else if (currentDcb.fOutxCtsFlow && (currentDcb.fRtsControl == RTS_CONTROL_HANDSHAKE)
                && !currentDcb.fInX && !currentDcb.fOutX) {
-        flow = QSerialPort::HardwareControl;
+        flowControl = QSerialPort::HardwareControl;
     } else {
-        flow = QSerialPort::NoFlowControl;
+        flowControl = QSerialPort::NoFlowControl;
     }
 }