diff options
| author | Jeremy Katz <jeremy.katz@nokia.com> | 2012-07-26 19:31:10 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-27 03:27:07 +0200 |
| commit | 4cc7b71b313043921bb476c66b951bdddab9dbf8 (patch) | |
| tree | 860bc5cd68c91ee150ae42fceb8940b24b4c93f7 /src/corelib/mimetypes | |
| parent | f408dfd0337ecee503e5753b5a8c2bf1a8a05db2 (diff) | |
fix QMimeDatabase qdoc errors
Some of the \sa lines were missing () after function names.
Document MatchMode and the deprecated mimeTypeForNameAndData()
Change-Id: I468b9741908beb7be5723a8bb927e5418fc1c344
Reviewed-by: David Faure <faure@kde.org>
Diffstat (limited to 'src/corelib/mimetypes')
| -rw-r--r-- | src/corelib/mimetypes/qmimedatabase.cpp | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/src/corelib/mimetypes/qmimedatabase.cpp b/src/corelib/mimetypes/qmimedatabase.cpp index 04024ff5a7..5b9e0bd835 100644 --- a/src/corelib/mimetypes/qmimedatabase.cpp +++ b/src/corelib/mimetypes/qmimedatabase.cpp @@ -341,7 +341,7 @@ QMimeType QMimeDatabase::mimeTypeForName(const QString &nameOrAlias) const \a fileInfo may refer to an absolute or relative path. - \sa isDefault, mimeTypeForData + \sa QMimeType::isDefault(), mimeTypeForData() */ QMimeType QMimeDatabase::mimeTypeForFile(const QFileInfo &fileInfo, MatchMode mode) const { @@ -426,7 +426,7 @@ QMimeType QMimeDatabase::mimeTypeForFile(const QString &fileName, MatchMode mode when determining the MIME type, use mimeTypeForFile() or mimeTypeForFileNameAndData() instead. - \sa mimeTypeForFile + \sa mimeTypeForFile() */ QList<QMimeType> QMimeDatabase::mimeTypesForFileName(const QString &fileName) const { @@ -586,4 +586,30 @@ QList<QMimeType> QMimeDatabase::allMimeTypes() const return d->allMimeTypes(); } +/*! + \enum QMimeDatabase::MatchMode + + This enum specifies how matching a file to a MIME type is performed. + + \value MatchDefault Both the file name and content are used to look for a match + + \value MatchExtension Only the file name is used to look for a match + + \value MatchContent The file content is used to look for a match +*/ + +/*! + \fn QMimeType QMimeDatabase::mimeTypeForNameAndData(const QString &fileName, QIODevice *device) const + \obsolete + + This function is replaced by \l mimeTypeForFileNameAndData() +*/ + +/*! + \fn QMimeType QMimeDatabase::mimeTypeForNameAndData(const QString &fileName, const QByteArray &data) const + \obsolete + + This function is replaced by \l mimeTypeForFileNameAndData() +*/ + QT_END_NAMESPACE |