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

fix QMimeDatabase qdoc errors

Browse Source 
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>
This commit is contained in:
Jeremy Katz 2012-07-26 19:31:10 +02:00 committed by Qt by Nokia
parent f408dfd033
commit 4cc7b71b31
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/corelib/mimetypes/qmimedatabase.cpp
View File

@ -341,7 +341,7 @@ QMimeType QMimeDatabase::mimeTypeForName(const QString &nameOrAlias) const
\a fileInfo may refer to an absolute or relative path. \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 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 when determining the MIME type, use mimeTypeForFile() or
mimeTypeForFileNameAndData() instead. mimeTypeForFileNameAndData() instead.
\sa mimeTypeForFile \sa mimeTypeForFile()
*/ */
QList<QMimeType> QMimeDatabase::mimeTypesForFileName(const QString &fileName) const QList<QMimeType> QMimeDatabase::mimeTypesForFileName(const QString &fileName) const
{ {
@ -586,4 +586,30 @@ QList<QMimeType> QMimeDatabase::allMimeTypes() const
return d->allMimeTypes(); 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 QT_END_NAMESPACE