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>

5 files changed, 34 insertions, 35 deletions

diff --git a/examples/mimetypefinder/main.cpp b/examples/mimetypefinder/main.cpp
index ae1e9ee..7b67bad 100644
--- a/examples/mimetypefinder/main.cpp
+++ b/examples/mimetypefinder/main.cpp
@@ -25,8 +25,7 @@ int main(int argc, char *argv[])
         QFile qstdin;
         qstdin.open(stdin, QIODevice::ReadOnly);
         const QByteArray data = qstdin.readAll();
-        //mime = QMimeType::findByContent(data, &accuracy);
-        mime = db.findByData(data);
+        mime = db.mimeTypeForData(data);
     } else if (option == QLatin1String("-c")) {
         mime = db.mimeTypeForFile(fileName, QMimeDatabase::MatchContent);
     } else if (option == QLatin1String("-f")) {
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;
 
diff --git a/tests/auto/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/qmimedatabase/tst_qmimedatabase.cpp
index 653c99c..7b6da34 100644
--- a/tests/auto/qmimedatabase/tst_qmimedatabase.cpp
+++ b/tests/auto/qmimedatabase/tst_qmimedatabase.cpp
@@ -199,7 +199,7 @@ void tst_qmimedatabase::test_mimeTypeForFileName()
     QVERIFY(mime.isValid());
     QCOMPARE(mime.name(), expectedMimeType);
 
-    QList<QMimeType> mimes = db.findMimeTypesByFileName(fileName);
+    QList<QMimeType> mimes = db.mimeTypesForFileName(fileName);
     if (expectedMimeType == "application/octet-stream") {
         QVERIFY(mimes.isEmpty());
     } else {
@@ -209,7 +209,7 @@ void tst_qmimedatabase::test_mimeTypeForFileName()
     }
 }
 
-void tst_qmimedatabase::test_findMultipleByName_data()
+void tst_qmimedatabase::test_mimeTypesForFileName_data()
 {
     QTest::addColumn<QString>("fileName");
     QTest::addColumn<QStringList>("expectedMimeTypes");
@@ -220,12 +220,12 @@ void tst_qmimedatabase::test_findMultipleByName_data()
     QTest::newRow("sub, 3 hits") << "foo.sub" << (QStringList() << "text/x-microdvd" << "text/x-mpsub" << "text/x-subviewer");
 }
 
-void tst_qmimedatabase::test_findMultipleByName()
+void tst_qmimedatabase::test_mimeTypesForFileName()
 {
     QFETCH(QString, fileName);
     QFETCH(QStringList, expectedMimeTypes);
     QMimeDatabase db;
-    QList<QMimeType> mimes = db.findMimeTypesByFileName(fileName);
+    QList<QMimeType> mimes = db.mimeTypesForFileName(fileName);
     QStringList mimeNames;
     foreach (const QMimeType& mime, mimes)
         mimeNames.append(mime.name());
@@ -333,7 +333,7 @@ void tst_qmimedatabase::test_icons()
 
 // In here we do the tests that need some content in a temporary file.
 // This could also be added to shared-mime-info's testsuite...
-void tst_qmimedatabase::test_findByFileWithContent()
+void tst_qmimedatabase::test_mimeTypeForFileWithContent()
 {
     QMimeDatabase db;
     QMimeType mime;
@@ -348,7 +348,7 @@ void tst_qmimedatabase::test_findByFileWithContent()
     mime = db.mimeTypeForFile(tempFileName);
     QCOMPARE(mime.name(), QString::fromLatin1("application/pdf"));
     QFile file(tempFileName);
-    mime = db.findByData(&file); // QIODevice ctor
+    mime = db.mimeTypeForData(&file); // QIODevice ctor
     QCOMPARE(mime.name(), QString::fromLatin1("application/pdf"));
     // by name only, we cannot find the mimetype
     mime = db.mimeTypeForFile(tempFileName, QMimeDatabase::MatchExtension);
@@ -387,19 +387,19 @@ void tst_qmimedatabase::test_findByFileWithContent()
 
     // findByData when the device cannot be opened (e.g. a directory)
     QFile dir("/");
-    mime = db.findByData(&dir);
+    mime = db.mimeTypeForData(&dir);
     QVERIFY(mime.isDefault());
 }
 
-void tst_qmimedatabase::test_findByUrl()
+void tst_qmimedatabase::test_mimeTypeForUrl()
 {
     QMimeDatabase db;
-    QVERIFY(db.findByUrl(QUrl::fromEncoded("http://foo/bar.png")).isDefault()); // HTTP can't know before downloading
-    QCOMPARE(db.findByUrl(QUrl::fromEncoded("ftp://foo/bar.png")).name(), QString::fromLatin1("image/png"));
-    QCOMPARE(db.findByUrl(QUrl::fromEncoded("ftp://foo/bar")).name(), QString::fromLatin1("application/octet-stream")); // unknown extension
+    QVERIFY(db.mimeTypeForUrl(QUrl::fromEncoded("http://foo/bar.png")).isDefault()); // HTTP can't know before downloading
+    QCOMPARE(db.mimeTypeForUrl(QUrl::fromEncoded("ftp://foo/bar.png")).name(), QString::fromLatin1("image/png"));
+    QCOMPARE(db.mimeTypeForUrl(QUrl::fromEncoded("ftp://foo/bar")).name(), QString::fromLatin1("application/octet-stream")); // unknown extension
 }
 
-void tst_qmimedatabase::test_findByContent_data()
+void tst_qmimedatabase::test_mimeTypeForData_data()
 {
     QTest::addColumn<QByteArray>("data");
     QTest::addColumn<QString>("expectedMimeTypeName");
@@ -410,15 +410,15 @@ void tst_qmimedatabase::test_findByContent_data()
     QTest::newRow("unknown") << QByteArray("\001abc?}") << "application/octet-stream";
 }
 
-void tst_qmimedatabase::test_findByContent()
+void tst_qmimedatabase::test_mimeTypeForData()
 {
     QFETCH(QByteArray, data);
     QFETCH(QString, expectedMimeTypeName);
 
     QMimeDatabase db;
-    QCOMPARE(db.findByData(data).name(), expectedMimeTypeName);
+    QCOMPARE(db.mimeTypeForData(data).name(), expectedMimeTypeName);
     QBuffer buffer(&data);
-    QCOMPARE(db.findByData(&buffer).name(), expectedMimeTypeName);
+    QCOMPARE(db.mimeTypeForData(&buffer).name(), expectedMimeTypeName);
 }
 
 void tst_qmimedatabase::test_mimeTypeForFileAndContent_data()
@@ -652,7 +652,7 @@ void tst_qmimedatabase::findByData()
     QVERIFY(f.open(QIODevice::ReadOnly));
     QByteArray data = f.read(16384);
 
-    const QString resultMimeTypeName = database.findByData(data).name();
+    const QString resultMimeTypeName = database.mimeTypeForData(data).name();
     if (xFail.length() >= 2 && xFail.at(1) == QLatin1Char('x')) {
         // Expected to fail
         QVERIFY2(resultMimeTypeName != mimeTypeName, qPrintable(resultMimeTypeName));
@@ -705,7 +705,7 @@ void tst_qmimedatabase::test_fromThreads()
     futures << QtConcurrent::run(this, &tst_qmimedatabase::test_icons);
     futures << QtConcurrent::run(this, &tst_qmimedatabase::test_inheritance);
     futures << QtConcurrent::run(this, &tst_qmimedatabase::test_knownSuffix);
-    futures << QtConcurrent::run(this, &tst_qmimedatabase::test_findByFileWithContent);
+    futures << QtConcurrent::run(this, &tst_qmimedatabase::test_mimeTypeForFileWithContent);
     futures << QtConcurrent::run(this, &tst_qmimedatabase::test_allMimeTypes); // a second time
     Q_FOREACH(QFuture<void> f, futures) // krazy:exclude=foreach
         f.waitForFinished();
diff --git a/tests/auto/qmimedatabase/tst_qmimedatabase.h b/tests/auto/qmimedatabase/tst_qmimedatabase.h
index 3ffeb6a..412b684 100644
--- a/tests/auto/qmimedatabase/tst_qmimedatabase.h
+++ b/tests/auto/qmimedatabase/tst_qmimedatabase.h
@@ -24,15 +24,15 @@ private slots:
     void test_mimeTypeForName();
     void test_mimeTypeForFileName_data();
     void test_mimeTypeForFileName();
-    void test_findMultipleByName_data();
-    void test_findMultipleByName();
+    void test_mimeTypesForFileName_data();
+    void test_mimeTypesForFileName();
     void test_inheritance();
     void test_aliases();
     void test_icons();
-    void test_findByFileWithContent();
-    void test_findByUrl();
-    void test_findByContent_data();
-    void test_findByContent();
+    void test_mimeTypeForFileWithContent();
+    void test_mimeTypeForUrl();
+    void test_mimeTypeForData_data();
+    void test_mimeTypeForData();
     void test_mimeTypeForFileAndContent_data();
     void test_mimeTypeForFileAndContent();
     void test_allMimeTypes();