diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-01-20 21:25:20 +0100 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-01-23 18:48:56 +0000 |
| commit | 770b4afeed37ddf036dcbc287b68f9f7b151af27 (patch) | |
| tree | 618b9a88d8813464ac184e8d28b0fc21a6bacc7b /src/corelib/serialization | |
| parent | 612e4c5233c489603165f046d2d76935153b4169 (diff) | |
QtCore: mark obsolete functions as deprecated
Mark the following obsolete functions as deprecated so they can be
removed with Qt6:
- QDataStream::unsetDevice()
- QDir &QDir::operator=(const QString &path)
- QDir::addResourceSearchPath()
- QResource::addSearchPath()
- QResource::searchPaths()
- QSettings::setSystemIniPath()
- QSettings::setUserIniPath()
Change-Id: I5edfb2b4ce1ad843fa5fcd5b4c475ab9352b05f7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/serialization')
| -rw-r--r-- | src/corelib/serialization/qdatastream.cpp | 7 | ||||
| -rw-r--r-- | src/corelib/serialization/qdatastream.h | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp index 01808ebce6..cc4efc9be3 100644 --- a/src/corelib/serialization/qdatastream.cpp +++ b/src/corelib/serialization/qdatastream.cpp @@ -392,17 +392,18 @@ void QDataStream::setDevice(QIODevice *d) dev = d; } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete Unsets the I/O device. - Use setDevice(0) instead. + Use setDevice(nullptr) instead. */ void QDataStream::unsetDevice() { - setDevice(0); + setDevice(nullptr); } - +#endif /*! \fn bool QDataStream::atEnd() const diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h index 2c874700e4..81134f74b0 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -131,7 +131,10 @@ public: QIODevice *device() const; void setDevice(QIODevice *); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QDataStream::setDevice(nullptr) instead") void unsetDevice(); +#endif bool atEnd() const; |