From 4cc7b71b313043921bb476c66b951bdddab9dbf8 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Thu, 26 Jul 2012 19:31:10 +0200 Subject: [PATCH] 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 --- src/corelib/mimetypes/qmimedatabase.cpp | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/src/corelib/mimetypes/qmimedatabase.cpp b/src/corelib/mimetypes/qmimedatabase.cpp index 04024ff..5b9e0bd 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 QMimeDatabase::mimeTypesForFileName(const QString &fileName) const { @@ -586,4 +586,30 @@ QList 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 -- 2.7.4