diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-08-07 11:46:07 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-08-15 20:55:31 +0200 |
commit | f741a12de11c9b06d971795cf34b26afc08e3f59 (patch) | |
tree | 91084bd3a88a7674d65806dd2d068ebcc372e5cd /src/corelib/serialization/qdatastream.cpp | |
parent | 5e3b7effbd7f70682d5a15ccd277e7f49c1e259e (diff) |
Disentangle QIODevice dependencies
Move the QIODevice::OpenMode enum into a base class, so that
we can remove the full QIODevice (and thus QObject) dependency
from qdatastream.h and qtextstream.h.
This is required so that we can include QDataStream in qmetatype.h
without getting circular dependencies.
As a nice side effect, QDataStream and QTextStream can now inherit
QIODeviceBase and provide the OpenMode enum directly in their
class scope.
Change-Id: Ifa68b7b1d8d95687ed032f6c9206f92e63bfacdf
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'src/corelib/serialization/qdatastream.cpp')
-rw-r--r-- | src/corelib/serialization/qdatastream.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp index 7888296b85..c6135336cf 100644 --- a/src/corelib/serialization/qdatastream.cpp +++ b/src/corelib/serialization/qdatastream.cpp @@ -302,7 +302,7 @@ QDataStream::QDataStream(QIODevice *d) } /*! - \fn QDataStream::QDataStream(QByteArray *a, QIODevice::OpenMode mode) + \fn QDataStream::QDataStream(QByteArray *a, OpenMode mode) Constructs a data stream that operates on a byte array, \a a. The \a mode describes how the device is to be used. @@ -314,7 +314,7 @@ QDataStream::QDataStream(QIODevice *d) is created to wrap the byte array. */ -QDataStream::QDataStream(QByteArray *a, QIODevice::OpenMode flags) +QDataStream::QDataStream(QByteArray *a, OpenMode flags) { QBuffer *buf = new QBuffer(a); #ifndef QT_NO_QOBJECT @@ -755,6 +755,14 @@ void QDataStream::abortTransaction() dev->commitTransaction(); } +/*! + \internal +*/ +bool QDataStream::isDeviceTransactionStarted() const +{ + return dev && dev->isTransactionStarted(); +} + /***************************************************************************** QDataStream read functions *****************************************************************************/ |