diff options
| author | David Faure <faure@kde.org> | 2012-01-27 21:52:52 +0100 |
|---|---|---|
| committer | Wolf-Michael Bolle <wolf-michael.bolle@nokia.com> | 2012-01-30 12:56:20 +0100 |
| commit | 52bfdb8b99d59164a93a9cc398eaaa925f4855fc (patch) | |
| tree | 8605da8784975bc136bf73779334cde688839653 /src | |
| parent | be42fc1a1855a752c1a7d5bb4dd2fa4a7045abcd (diff) | |
Rename the other findBy* methods to mimeTypeFor*.
These are API changes suggested by Lars.
Change-Id: I9bd71120531c8e1f2e9ae9999cd4ce28ae716f2c
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Wolf-Michael Bolle <wolf-michael.bolle@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mimetypes/qmimedatabase.cpp | 12 | ||||
| -rw-r--r-- | src/mimetypes/qmimedatabase.h | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/mimetypes/qmimedatabase.cpp b/src/mimetypes/qmimedatabase.cpp index 1469b96..531efdd 100644 --- a/src/mimetypes/qmimedatabase.cpp +++ b/src/mimetypes/qmimedatabase.cpp @@ -413,7 +413,7 @@ QMimeType QMimeDatabase::mimeTypeForFile(const QFileInfo &fileInfo, MatchFlags f } else { // MatchContent if (file.open(QIODevice::ReadOnly)) { locker.unlock(); - return findByData(&file); + return mimeTypeForData(&file); } else return d->mimeTypeForName(d->defaultMimeType()); } @@ -458,12 +458,12 @@ QMimeType QMimeDatabase::mimeTypeForFile(const QString &fileName, MatchFlags fla If multiple MIME types match this file, they are all returned. This function does not try to open the file. To also use the content - when determining the MIME type, use findByFile() or + when determining the MIME type, use mimeTypeForFile() or mimeTypeForNameAndData() instead. \sa mimeTypeForFile */ -QList<QMimeType> QMimeDatabase::findMimeTypesByFileName(const QString &fileName) const +QList<QMimeType> QMimeDatabase::mimeTypesForFileName(const QString &fileName) const { QMutexLocker locker(&d->mutex); @@ -500,7 +500,7 @@ QString QMimeDatabase::suffixForFileName(const QString &fileName) const known MIME type data, the default MIME type (application/octet-stream) is returned. */ -QMimeType QMimeDatabase::findByData(const QByteArray &data) const +QMimeType QMimeDatabase::mimeTypeForData(const QByteArray &data) const { QMutexLocker locker(&d->mutex); @@ -517,7 +517,7 @@ QMimeType QMimeDatabase::findByData(const QByteArray &data) const known MIME type data, the default MIME type (application/octet-stream) is returned. */ -QMimeType QMimeDatabase::findByData(QIODevice* device) const +QMimeType QMimeDatabase::mimeTypeForData(QIODevice* device) const { QMutexLocker locker(&d->mutex); @@ -544,7 +544,7 @@ QMimeType QMimeDatabase::findByData(QIODevice* device) const known MIME type data, the default MIME type (application/octet-stream) is returned. */ -QMimeType QMimeDatabase::findByUrl(const QUrl &url) const +QMimeType QMimeDatabase::mimeTypeForUrl(const QUrl &url) const { #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) if (url.isLocalFile()) diff --git a/src/mimetypes/qmimedatabase.h b/src/mimetypes/qmimedatabase.h index 47c59eb..ca1a4bb 100644 --- a/src/mimetypes/qmimedatabase.h +++ b/src/mimetypes/qmimedatabase.h @@ -55,12 +55,12 @@ public: QMimeType mimeTypeForFile(const QString &fileName, MatchFlags flags = MatchDefault) const; QMimeType mimeTypeForFile(const QFileInfo &fileInfo, MatchFlags flags = MatchDefault) const; - QList<QMimeType> findMimeTypesByFileName(const QString &fileName) const; + QList<QMimeType> mimeTypesForFileName(const QString &fileName) const; - QMimeType findByData(const QByteArray &data) const; - QMimeType findByData(QIODevice *device) const; + QMimeType mimeTypeForData(const QByteArray &data) const; + QMimeType mimeTypeForData(QIODevice *device) const; - QMimeType findByUrl(const QUrl &url) const; + QMimeType mimeTypeForUrl(const QUrl &url) const; QMimeType mimeTypeForNameAndData(const QString &fileName, QIODevice *device) const; QMimeType mimeTypeForNameAndData(const QString &fileName, const QByteArray &data) const; |