diff options
| author | Samuel Gaist <samuel.gaist@edeltech.ch> | 2014-09-12 01:00:17 +0200 |
|---|---|---|
| committer | Samuel Gaist <samuel.gaist@edeltech.ch> | 2014-09-12 17:09:25 +0200 |
| commit | c399044e2a9ccdc14b627889320f34e87b7d6b7e (patch) | |
| tree | b3d1dc8618cd7ae09ae227cec92bc7ff34b90880 | |
| parent | 8dd56ea122073f19336713f7d993e965fd52e3e8 (diff) | |
| download | qtserialport-c399044e2a9ccdc14b627889320f34e87b7d6b7e.tar.gz | |
Added missing deprecation guards and documentation update
This patch adds the missing guards around the deprecated functions
implementations.
Change-Id: I829e90e289da7af736fc6f5d6c319509138f1aef
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| -rw-r--r-- | src/serialport/qserialport.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp index 9d2fcef..ffc763e 100644 --- a/src/serialport/qserialport.cpp +++ b/src/serialport/qserialport.cpp @@ -79,7 +79,9 @@ QSerialPortPrivateData::QSerialPortPrivateData(QSerialPort *q) , policy(QSerialPort::IgnorePolicy) , dataTerminalReady(false) , requestToSend(false) +#if QT_DEPRECATED_SINCE(5,3) , settingsRestoredOnClose(true) +#endif , q_ptr(q) { } @@ -580,6 +582,7 @@ void QSerialPort::close() The default state of the QSerialPort class is to restore the settings. */ +#if QT_DEPRECATED_SINCE(5,3) void QSerialPort::setSettingsRestoredOnClose(bool restore) { Q_D(QSerialPort); @@ -595,9 +598,10 @@ bool QSerialPort::settingsRestoredOnClose() const Q_D(const QSerialPort); return d->settingsRestoredOnClose; } - +#endif // QT_DEPRECATED_SINCE(5,3) /*! \fn void QSerialPort::settingsRestoredOnCloseChanged(bool restore) + \obsolete This signal is emitted after the flag which specifies to restore the previous settings while closing the serial port has been changed. The new @@ -1077,6 +1081,7 @@ bool QSerialPort::atEnd() const with the kernel and hardware. Hence, the two scenarios cannot be completely compared to each other. */ +#if QT_DEPRECATED_SINCE(5, 2) bool QSerialPort::setDataErrorPolicy(DataErrorPolicy policy) { Q_D(QSerialPort); @@ -1101,7 +1106,7 @@ QSerialPort::DataErrorPolicy QSerialPort::dataErrorPolicy() const Q_D(const QSerialPort); return d->policy; } - +#endif // QT_DEPRECATED_SINCE(5, 2) /*! \fn void QSerialPort::dataErrorPolicyChanged(DataErrorPolicy policy) \obsolete |