diff options
| author | David Faure <faure@kde.org> | 2012-05-14 19:42:10 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-15 14:25:37 +0200 |
| commit | c241d8921ea6384c30a1731a036aec8edc7609ab (patch) | |
| tree | d8fd21a2f15c66457004ea9151e771cf7865adf2 /src/corelib/mimetypes/qmimedatabase.h | |
| parent | f3476d3ae2380bb10781371c9e07ebeaea9c9b86 (diff) | |
Rename QMimeDatabase method for consistency.
Name is about mimetype names, while FileName is about, well, file names.
Task-number: QTBUG-25748
Change-Id: I34a9ac1a5fc06dc3e3855365e19c4dc7a1aa2671
Reviewed-by: Wolf-Michael Bolle <wolf-michael.bolle@nokia.com>
Diffstat (limited to 'src/corelib/mimetypes/qmimedatabase.h')
| -rw-r--r-- | src/corelib/mimetypes/qmimedatabase.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/corelib/mimetypes/qmimedatabase.h b/src/corelib/mimetypes/qmimedatabase.h index eff706e1b5..96ddee73c4 100644 --- a/src/corelib/mimetypes/qmimedatabase.h +++ b/src/corelib/mimetypes/qmimedatabase.h @@ -77,8 +77,17 @@ public: QMimeType mimeTypeForData(QIODevice *device) const; QMimeType mimeTypeForUrl(const QUrl &url) const; - QMimeType mimeTypeForNameAndData(const QString &fileName, QIODevice *device) const; - QMimeType mimeTypeForNameAndData(const QString &fileName, const QByteArray &data) const; + QMimeType mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device) const; + QMimeType mimeTypeForFileNameAndData(const QString &fileName, const QByteArray &data) const; + +#if QT_DEPRECATED_SINCE(5,0) + QT_DEPRECATED QMimeType mimeTypeForNameAndData(const QString &fileName, QIODevice *device) const { + return mimeTypeForFileNameAndData(fileName, device); + } + QT_DEPRECATED QMimeType mimeTypeForNameAndData(const QString &fileName, const QByteArray &data) const { + return mimeTypeForFileNameAndData(fileName, data); + } +#endif QString suffixForFileName(const QString &fileName) const; |