diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-04-20 08:26:23 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-04-21 15:48:42 +0000 |
| commit | b4580e9ea9b7a7e867a8ea88741822abe5ea7926 (patch) | |
| tree | 5d12bcf62eb11e6ae34874435f0349ccd64594c1 | |
| parent | 567e7f1518b14ab8568377522df0396ebaa5c1e0 (diff) | |
Documentation: Fix broken links to QIODeviceBase::OpenMode
Previously, QIODeviceBase was not visible in the documentation
and the links from QIODevice::open() were broken.
Fix by fully qualifying the arguments.
Change-Id: I43960ac2ff436251cc3bfad862d82f937b9bd4b1
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit 1b1844afef81520520ba75146f835a7dbbbb5fd6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/corelib/io/qiodevice.cpp | 12 | ||||
| -rw-r--r-- | src/corelib/io/qiodevice.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index 0bea68acc5..d07897141c 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -527,7 +527,7 @@ bool QIODevice::isSequential() const \sa OpenMode */ -QIODevice::OpenMode QIODevice::openMode() const +QIODeviceBase::OpenMode QIODevice::openMode() const { return d_func()->openMode; } @@ -539,7 +539,7 @@ QIODevice::OpenMode QIODevice::openMode() const \sa openMode(), OpenMode */ -void QIODevice::setOpenMode(OpenMode openMode) +void QIODevice::setOpenMode(QIODeviceBase::OpenMode openMode) { Q_D(QIODevice); #if defined QIODEVICE_DEBUG @@ -589,7 +589,7 @@ bool QIODevice::isTextModeEnabled() const default, this function returns \c false if openMode() returns \c NotOpen. - \sa openMode(), OpenMode + \sa openMode(), QIODeviceBase::OpenMode */ bool QIODevice::isOpen() const { @@ -774,9 +774,9 @@ bool QIODevicePrivate::allWriteBuffersEmpty() const otherwise returns \c false. This function should be called from any reimplementations of open() or other functions that open the device. - \sa openMode(), OpenMode + \sa openMode(), QIODeviceBase::OpenMode */ -bool QIODevice::open(OpenMode mode) +bool QIODevice::open(QIODeviceBase::OpenMode mode) { Q_D(QIODevice); d->openMode = mode; @@ -797,7 +797,7 @@ bool QIODevice::open(OpenMode mode) First emits aboutToClose(), then closes the device and sets its OpenMode to NotOpen. The error string is also reset. - \sa setOpenMode(), OpenMode + \sa setOpenMode(), QIODeviceBase::OpenMode */ void QIODevice::close() { diff --git a/src/corelib/io/qiodevice.h b/src/corelib/io/qiodevice.h index e4388b8972..fd97e8d1e5 100644 --- a/src/corelib/io/qiodevice.h +++ b/src/corelib/io/qiodevice.h @@ -78,7 +78,7 @@ public: #endif virtual ~QIODevice(); - OpenMode openMode() const; + QIODeviceBase::OpenMode openMode() const; void setTextModeEnabled(bool enabled); bool isTextModeEnabled() const; @@ -95,7 +95,7 @@ public: int currentWriteChannel() const; void setCurrentWriteChannel(int channel); - virtual bool open(OpenMode mode); + virtual bool open(QIODeviceBase::OpenMode mode); virtual void close(); // ### Qt 7 - QTBUG-76492: pos() and seek() should not be virtual, and @@ -159,7 +159,7 @@ protected: virtual qint64 skipData(qint64 maxSize); virtual qint64 writeData(const char *data, qint64 len) = 0; - void setOpenMode(OpenMode openMode); + void setOpenMode(QIODeviceBase::OpenMode openMode); void setErrorString(const QString &errorString); |