diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-08-02 13:19:12 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-08-02 21:08:01 +0000 |
| commit | 6b38758084a10e210aed5a22110717ccc29ec5f8 (patch) | |
| tree | c70fbd63e97fb593f5d10e51786b19a8442d30c1 | |
| parent | 0257ffe465d89a99f062c366bd7c7cd6d6826b4d (diff) | |
Fix some qdoc warnings
qtbase/src/corelib/io/qfsfileengine.cpp:926: warning: Overrides a previous doc
qtbase/src/corelib/io/qfsfileengine.cpp:527: warning: (The previous doc is here)
qtbase/src/corelib/tools/qbytearray.cpp:689: warning: Cannot tie this documentation to anything
Change-Id: Ie7009f565a11a01859ccd0488ddeebe1b953305d
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/corelib/io/qfsfileengine.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qbytearray.cpp | 15 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp index 037deb89427..b7a54402246 100644 --- a/src/corelib/io/qfsfileengine.cpp +++ b/src/corelib/io/qfsfileengine.cpp @@ -923,10 +923,6 @@ bool QFSFileEngine::supportsExtension(Extension extension) const \reimp */ -/*! \fn QDateTime QFSFileEngine::fileTime(FileTime time) const - \reimp -*/ - /*! \fn QString QFSFileEngine::homePath() Returns the home path of the current user. diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index 3ecb2ac6624..9b648adb06e 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -686,14 +686,6 @@ QByteArray qCompress(const uchar* data, int nbytes, int compressionLevel) \sa qCompress() */ -/*! \relates QByteArray - - \overload - - Uncompresses the first \a nbytes of \a data and returns a new byte - array with the uncompressed data. -*/ - #ifndef QT_NO_COMPRESS namespace { struct QByteArrayDataDeleter @@ -709,6 +701,13 @@ static QByteArray invalidCompressedData() return QByteArray(); } +/*! \relates QByteArray + + \overload + + Uncompresses the first \a nbytes of \a data and returns a new byte + array with the uncompressed data. +*/ QByteArray qUncompress(const uchar* data, int nbytes) { if (!data) { |