From 03d492e49e74eefa1c83e37e833d862f4b9f1e45 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Sat, 13 Feb 2016 16:14:26 +0300 Subject: Deprecate QSPI::isBusy() method It is impossible to implement this method properly on all platforms. Its implementation is complicated and introduces a side-effects, related to the race-conditions, permissions and so on. The user can implement QSPI::isBusy() himself just trying to open a desired device, what is equivalent to the current implementation. Change-Id: I71ef69a1a8edb7c4df23c8b2816add40475e00b5 Reviewed-by: Sergey Belyashov Reviewed-by: Denis Shienkov --- src/serialport/qserialportinfo.cpp | 2 ++ src/serialport/qserialportinfo.h | 2 ++ src/serialport/qserialportinfo_osx.cpp | 2 ++ src/serialport/qserialportinfo_unix.cpp | 2 ++ src/serialport/qserialportinfo_win.cpp | 2 ++ src/serialport/qserialportinfo_wince.cpp | 2 ++ 6 files changed, 12 insertions(+) diff --git a/src/serialport/qserialportinfo.cpp b/src/serialport/qserialportinfo.cpp index 3e7245e..ca81cd0 100644 --- a/src/serialport/qserialportinfo.cpp +++ b/src/serialport/qserialportinfo.cpp @@ -257,6 +257,7 @@ bool QSerialPortInfo::hasProductIdentifier() const \sa isBusy() */ +#if QT_DEPRECATED_SINCE(5, 6) /*! \fn bool QSerialPortInfo::isBusy() const @@ -265,6 +266,7 @@ bool QSerialPortInfo::hasProductIdentifier() const \sa isNull() */ +#endif // QT_DEPRECATED_SINCE(5, 6) #if QT_DEPRECATED_SINCE(5, 2) /*! diff --git a/src/serialport/qserialportinfo.h b/src/serialport/qserialportinfo.h index 2b757f9..74daedc 100644 --- a/src/serialport/qserialportinfo.h +++ b/src/serialport/qserialportinfo.h @@ -72,7 +72,9 @@ public: bool hasProductIdentifier() const; bool isNull() const; +#if QT_DEPRECATED_SINCE(5, 6) bool isBusy() const; +#endif #if QT_DEPRECATED_SINCE(5, 2) QT_DEPRECATED bool isValid() const; #endif diff --git a/src/serialport/qserialportinfo_osx.cpp b/src/serialport/qserialportinfo_osx.cpp index 4e73025..912d880 100644 --- a/src/serialport/qserialportinfo_osx.cpp +++ b/src/serialport/qserialportinfo_osx.cpp @@ -213,6 +213,7 @@ QList QSerialPortInfo::standardBaudRates() return QSerialPortPrivate::standardBaudRates(); } +#if QT_DEPRECATED_SINCE(5, 6) bool QSerialPortInfo::isBusy() const { QString lockFilePath = serialPortLockFilePath(portName()); @@ -235,6 +236,7 @@ bool QSerialPortInfo::isBusy() const return true; } +#endif // QT_DEPRECATED_SINCE(5, 6) #if QT_DEPRECATED_SINCE(5, 2) bool QSerialPortInfo::isValid() const diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp index f5bbfc6..f7426fc 100644 --- a/src/serialport/qserialportinfo_unix.cpp +++ b/src/serialport/qserialportinfo_unix.cpp @@ -752,6 +752,7 @@ QList QSerialPortInfo::standardBaudRates() return QSerialPortPrivate::standardBaudRates(); } +#if QT_DEPRECATED_SINCE(5, 6) bool QSerialPortInfo::isBusy() const { QString lockFilePath = serialPortLockFilePath(portName()); @@ -774,6 +775,7 @@ bool QSerialPortInfo::isBusy() const return true; } +#endif // QT_DEPRECATED_SINCE(5, 6) #if QT_DEPRECATED_SINCE(5, 2) bool QSerialPortInfo::isValid() const diff --git a/src/serialport/qserialportinfo_win.cpp b/src/serialport/qserialportinfo_win.cpp index 63cf642..0a9fc64 100644 --- a/src/serialport/qserialportinfo_win.cpp +++ b/src/serialport/qserialportinfo_win.cpp @@ -350,6 +350,7 @@ QList QSerialPortInfo::standardBaudRates() return QSerialPortPrivate::standardBaudRates(); } +#if QT_DEPRECATED_SINCE(5, 6) bool QSerialPortInfo::isBusy() const { const HANDLE handle = ::CreateFile(reinterpret_cast(systemLocation().utf16()), @@ -363,6 +364,7 @@ bool QSerialPortInfo::isBusy() const } return false; } +#endif // QT_DEPRECATED_SINCE(5, 6) #if QT_DEPRECATED_SINCE(5, 2) bool QSerialPortInfo::isValid() const diff --git a/src/serialport/qserialportinfo_wince.cpp b/src/serialport/qserialportinfo_wince.cpp index 3688bc3..3b13244 100644 --- a/src/serialport/qserialportinfo_wince.cpp +++ b/src/serialport/qserialportinfo_wince.cpp @@ -125,6 +125,7 @@ QList QSerialPortInfo::standardBaudRates() return QSerialPortPrivate::standardBaudRates(); } +#if QT_DEPRECATED_SINCE(5, 6) bool QSerialPortInfo::isBusy() const { const HANDLE handle = ::CreateFile(reinterpret_cast(systemLocation().utf16()), @@ -138,6 +139,7 @@ bool QSerialPortInfo::isBusy() const } return false; } +#endif // QT_DEPRECATED_SINCE(5, 6) #if QT_DEPRECATED_SINCE(5, 2) bool QSerialPortInfo::isValid() const -- cgit v1.2.1