From 770b4afeed37ddf036dcbc287b68f9f7b151af27 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Date: Sun, 20 Jan 2019 21:25:20 +0100
Subject: 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>
---
 src/corelib/serialization/qdatastream.cpp | 7 ++++---
 src/corelib/serialization/qdatastream.h   | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/corelib/serialization')

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;
 
-- 
cgit v1.2.3