1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Documentation: Fix broken links to QIODeviceBase::OpenMode

Browse Source 
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>
This commit is contained in:
Friedemann Kleint 2021-04-20 08:26:23 +02:00 committed by Qt Cherry-pick Bot
parent 3ec6e14771
commit ae62c5717e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/io/qiodevice.cpp
View File

@ -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()
{

6
src/corelib/io/qiodevice.h
View File

@ -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);