From ae9a16b5cde506463914092e3c77edb9a6a6a4b7 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 20 Jul 2020 14:03:10 +0200 Subject: [PATCH] Remove deprecated QDataStream::unsetDevice() Deprecated since 5.13. Change-Id: I9f8f58fb92bc12d32eab5b0ae8611611fe2481e5 Reviewed-by: Lars Knoll --- src/corelib/serialization/qdatastream.cpp | 13 ------------- src/corelib/serialization/qdatastream.h | 4 ---- 2 files changed, 17 deletions(-) diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp index c6135336cf0..dddce6075f4 100644 --- a/src/corelib/serialization/qdatastream.cpp +++ b/src/corelib/serialization/qdatastream.cpp @@ -396,19 +396,6 @@ void QDataStream::setDevice(QIODevice *d) dev = d; } -#if QT_DEPRECATED_SINCE(5, 13) -/*! - \obsolete - Unsets the I/O device. - Use setDevice(nullptr) instead. -*/ - -void QDataStream::unsetDevice() -{ - setDevice(nullptr); -} -#endif - /*! \fn bool QDataStream::atEnd() const diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h index ad47490ebf3..19188c3d915 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -127,10 +127,6 @@ 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;