diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2015-07-12 14:59:57 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2015-07-16 09:35:45 +0000 |
| commit | fc1dc2d22781a46df2351848fa408eed96ccdd06 (patch) | |
| tree | a2b0c4d902c95e51b3f40f6d3c7ba4bcc9ed93b4 | |
| parent | e257bdc9aae5583b187bafb5e69e4a6143e3bf4e (diff) | |
| download | qtserialport-fc1dc2d22781a46df2351848fa408eed96ccdd06.tar.gz | |
Add missing QT_DEPRECATED_SINCE(5, 2) macro
The macro was added in the header file, but not in
the implementation file.
Change-Id: I51bc62eedbaba627fb525c04dc126bf0125e7a39
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| -rw-r--r-- | src/serialport/qserialportinfo.cpp | 2 | ||||
| -rw-r--r-- | src/serialport/qserialportinfo_mac.cpp | 2 | ||||
| -rw-r--r-- | src/serialport/qserialportinfo_unix.cpp | 2 | ||||
| -rw-r--r-- | src/serialport/qserialportinfo_win.cpp | 2 | ||||
| -rw-r--r-- | src/serialport/qserialportinfo_wince.cpp | 2 |
5 files changed, 10 insertions, 0 deletions
diff --git a/src/serialport/qserialportinfo.cpp b/src/serialport/qserialportinfo.cpp index 26b275d..055b226 100644 --- a/src/serialport/qserialportinfo.cpp +++ b/src/serialport/qserialportinfo.cpp @@ -266,6 +266,7 @@ bool QSerialPortInfo::hasProductIdentifier() const \sa isNull() */ +#if QT_DEPRECATED_SINCE(5, 2) /*! \fn bool QSerialPortInfo::isValid() const \obsolete @@ -275,6 +276,7 @@ bool QSerialPortInfo::hasProductIdentifier() const \sa isNull(), isBusy() */ +#endif // QT_DEPRECATED_SINCE(5, 2) /*! \fn QList<qint32> QSerialPortInfo::standardBaudRates() diff --git a/src/serialport/qserialportinfo_mac.cpp b/src/serialport/qserialportinfo_mac.cpp index 54abe21..380a9b8 100644 --- a/src/serialport/qserialportinfo_mac.cpp +++ b/src/serialport/qserialportinfo_mac.cpp @@ -236,11 +236,13 @@ bool QSerialPortInfo::isBusy() const return true; } +#if QT_DEPRECATED_SINCE(5, 2) bool QSerialPortInfo::isValid() const { QFile f(systemLocation()); return f.exists(); } +#endif // QT_DEPRECATED_SINCE(5, 2) QString QSerialPortInfoPrivate::portNameToSystemLocation(const QString &source) { diff --git a/src/serialport/qserialportinfo_unix.cpp b/src/serialport/qserialportinfo_unix.cpp index 07587ec..2eb2bf6 100644 --- a/src/serialport/qserialportinfo_unix.cpp +++ b/src/serialport/qserialportinfo_unix.cpp @@ -463,11 +463,13 @@ bool QSerialPortInfo::isBusy() const return true; } +#if QT_DEPRECATED_SINCE(5, 2) bool QSerialPortInfo::isValid() const { QFile f(systemLocation()); return f.exists(); } +#endif // QT_DEPRECATED_SINCE(5, 2) QString QSerialPortInfoPrivate::portNameToSystemLocation(const QString &source) { diff --git a/src/serialport/qserialportinfo_win.cpp b/src/serialport/qserialportinfo_win.cpp index 493c4d0..f6d9228 100644 --- a/src/serialport/qserialportinfo_win.cpp +++ b/src/serialport/qserialportinfo_win.cpp @@ -365,6 +365,7 @@ bool QSerialPortInfo::isBusy() const return false; } +#if QT_DEPRECATED_SINCE(5, 2) bool QSerialPortInfo::isValid() const { const HANDLE handle = ::CreateFile(reinterpret_cast<const wchar_t*>(systemLocation().utf16()), @@ -378,6 +379,7 @@ bool QSerialPortInfo::isValid() const } return true; } +#endif // QT_DEPRECATED_SINCE(5, 2) QString QSerialPortInfoPrivate::portNameToSystemLocation(const QString &source) { diff --git a/src/serialport/qserialportinfo_wince.cpp b/src/serialport/qserialportinfo_wince.cpp index 78439c9..9f1980f 100644 --- a/src/serialport/qserialportinfo_wince.cpp +++ b/src/serialport/qserialportinfo_wince.cpp @@ -139,6 +139,7 @@ bool QSerialPortInfo::isBusy() const return false; } +#if QT_DEPRECATED_SINCE(5, 2) bool QSerialPortInfo::isValid() const { const HANDLE handle = ::CreateFile(reinterpret_cast<const wchar_t*>(systemLocation().utf16()), @@ -152,6 +153,7 @@ bool QSerialPortInfo::isValid() const } return true; } +#endif // QT_DEPRECATED_SINCE(5, 2) QString QSerialPortInfoPrivate::portNameToSystemLocation(const QString &source) { |