summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2015-12-12 21:13:01 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2015-12-13 18:47:46 +0000
commitbd3fb6cc346b3bdbb7a05131b912d450490fa5c8 (patch)
tree9847a68159e4976969034a494069ad8a5e63fcf5
parentd7b5d78ecc1b4d9dc6859f273d46847b1f2fe36d (diff)
Do not use settingFromBaudRate() on Windowsv5.6.0-beta1
This function makes sense only on *nix platforms. Change-Id: Ia1d107e1b0d9095f4f20e1aa472798aa0af11f0f Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
-rw-r--r--src/serialport/qserialport_p.h2
-rw-r--r--src/serialport/qserialport_win.cpp9
-rw-r--r--src/serialport/qserialport_wince.cpp9
3 files changed, 2 insertions, 18 deletions
diff --git a/src/serialport/qserialport_p.h b/src/serialport/qserialport_p.h
index 4d37254e..4a214e13 100644
--- a/src/serialport/qserialport_p.h
+++ b/src/serialport/qserialport_p.h
@@ -159,7 +159,9 @@ public:
static QString portNameToSystemLocation(const QString &port);
static QString portNameFromSystemLocation(const QString &location);
+#if defined(Q_OS_UNIX)
static qint32 settingFromBaudRate(qint32 baudRate);
+#endif
static QList<qint32> standardBaudRates();
diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp
index 8e7c2788..6e1a44f2 100644
--- a/src/serialport/qserialport_win.cpp
+++ b/src/serialport/qserialport_win.cpp
@@ -813,15 +813,6 @@ static const QList<qint32> standardBaudRatePairList()
return standardBaudRatesTable;
};
-qint32 QSerialPortPrivate::settingFromBaudRate(qint32 baudRate)
-{
- const QList<qint32> baudRatePairList = standardBaudRatePairList();
- const QList<qint32>::const_iterator baudRatePairListConstIterator
- = std::find(baudRatePairList.constBegin(), baudRatePairList.constEnd(), baudRate);
-
- return (baudRatePairListConstIterator != baudRatePairList.constEnd()) ? *baudRatePairListConstIterator : 0;
-}
-
QList<qint32> QSerialPortPrivate::standardBaudRates()
{
return standardBaudRatePairList();
diff --git a/src/serialport/qserialport_wince.cpp b/src/serialport/qserialport_wince.cpp
index b1975af1..9221f0e3 100644
--- a/src/serialport/qserialport_wince.cpp
+++ b/src/serialport/qserialport_wince.cpp
@@ -743,15 +743,6 @@ static const QList<qint32> standardBaudRatePairList()
return standardBaudRatesTable;
};
-qint32 QSerialPortPrivate::settingFromBaudRate(qint32 baudRate)
-{
- const QList<qint32> baudRatePairList = standardBaudRatePairList();
- const QList<qint32>::const_iterator baudRatePairListConstIterator
- = std::find(baudRatePairList.constBegin(), baudRatePairList.constEnd(), baudRate);
-
- return (baudRatePairListConstIterator != baudRatePairList.constEnd()) ? *baudRatePairListConstIterator : 0;
-}
-
QList<qint32> QSerialPortPrivate::standardBaudRates()
{
return standardBaudRatePairList();