Rename findByName to findByFileName

This makes it clearer that it's about file names, and not about mimetype
names. And this makes it closer to findMimeTypesByFileName.

Change-Id: If407fd775b71e9e75acfbd8725026f7e36fce871
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Wolf-Michael Bolle <wolf-michael.bolle@nokia.com>

13 files changed, 60 insertions, 60 deletions

diff --git a/examples/mimetypefinder/main.cpp b/examples/mimetypefinder/main.cpp
index e3a4223..8da085a 100644
--- a/examples/mimetypefinder/main.cpp
+++ b/examples/mimetypefinder/main.cpp
@@ -33,7 +33,7 @@ int main(int argc, char *argv[])
             mime = db.findByData(file.read(32000));
         }
     } else if (option == QLatin1String("-f")) {
-        mime = db.findByName(fileName);
+        mime = db.findByFileName(fileName);
     } else {
         mime = db.findByFile(fileName);
     }
diff --git a/src/imports/mimetypes/plugins.qmltypes b/src/imports/mimetypes/plugins.qmltypes
index 1f45f3c..3a2f099 100644
--- a/src/imports/mimetypes/plugins.qmltypes
+++ b/src/imports/mimetypes/plugins.qmltypes
@@ -15,7 +15,7 @@ Module {
             Parameter { name: "nameOrAlias"; type: "string" }
         }
         Method {
-            name: "findByName"
+            name: "findByFileName"
             type: "QDeclarativeMimeType*"
             Parameter { name: "fileName"; type: "string" }
         }
diff --git a/src/imports/mimetypes/qdeclarativemimedatabase.cpp b/src/imports/mimetypes/qdeclarativemimedatabase.cpp
index 7130191..51ea784 100644
--- a/src/imports/mimetypes/qdeclarativemimedatabase.cpp
+++ b/src/imports/mimetypes/qdeclarativemimedatabase.cpp
@@ -155,7 +155,7 @@ QDeclarativeMimeType *QDeclarativeMimeDatabase::mimeTypeForName (
 // ------------------------------------------------------------------------------------------------
 
 /*!
-    \qmlmethod MimeType MimeDatabase::findByName(string fileName)
+    \qmlmethod MimeType MimeDatabase::findByFileName(string fileName)
     \brief Returns a MIME type for the file \a fileName.
 
     A valid MIME type is always returned. If the file name doesn't match any
@@ -165,12 +165,12 @@ QDeclarativeMimeType *QDeclarativeMimeDatabase::mimeTypeForName (
     This function does not try to open the file. To also use the content
     when determining the MIME type, use findByFile().
 */
-QDeclarativeMimeType *QDeclarativeMimeDatabase::findByName (
+QDeclarativeMimeType *QDeclarativeMimeDatabase::findByFileName (
                                                     const QString &fileName
                                                 )
 {
     return new QDeclarativeMimeType (
-                   m_MimeDatabase.findByName(fileName),
+                   m_MimeDatabase.findByFileName(fileName),
                    this   // <- The new object will be released later
                           //    when this registry is released.
                );
diff --git a/src/imports/mimetypes/qdeclarativemimedatabase_p.h b/src/imports/mimetypes/qdeclarativemimedatabase_p.h
index 25973ec..7d49fdf 100644
--- a/src/imports/mimetypes/qdeclarativemimedatabase_p.h
+++ b/src/imports/mimetypes/qdeclarativemimedatabase_p.h
@@ -76,7 +76,7 @@ public:
                                           const QString &nameOrAlias
                                       );
 
-    Q_INVOKABLE QDeclarativeMimeType *findByName (
+    Q_INVOKABLE QDeclarativeMimeType *findByFileName (
                                           const QString &fileName
                                       );
 
diff --git a/src/mimetypes/qmimedatabase.cpp b/src/mimetypes/qmimedatabase.cpp
index c410377..897c634 100644
--- a/src/mimetypes/qmimedatabase.cpp
+++ b/src/mimetypes/qmimedatabase.cpp
@@ -107,12 +107,12 @@ QMimeType QMimeDatabasePrivate::mimeTypeForName(const QString &nameOrAlias)
     return provider()->mimeTypeForName(provider()->resolveAlias(nameOrAlias));
 }
 
-QStringList QMimeDatabasePrivate::findByName(const QString &fileName, QString *foundSuffix)
+QStringList QMimeDatabasePrivate::findByFileName(const QString &fileName, QString *foundSuffix)
 {
     if (fileName.endsWith(QLatin1Char('/')))
         return QStringList() << QLatin1String("inode/directory");
 
-    const QStringList matchingMimeTypes = provider()->findByName(QFileInfo(fileName).fileName(), foundSuffix);
+    const QStringList matchingMimeTypes = provider()->findByFileName(QFileInfo(fileName).fileName(), foundSuffix);
     return matchingMimeTypes;
 }
 
@@ -162,7 +162,7 @@ QMimeType QMimeDatabasePrivate::findByData(const QByteArray &data, int *accuracy
 
 // ------------------------------------------------------------------------------------------------
 
-QMimeType QMimeDatabasePrivate::findByNameAndData(const QString &fileName, QIODevice *device, int *accuracyPtr)
+QMimeType QMimeDatabasePrivate::findByFileNameAndData(const QString &fileName, QIODevice *device, int *accuracyPtr)
 {
     // First, glob patterns are evaluated. If there is a match with max weight,
     // this one is selected and we are done. Otherwise, the file contents are
@@ -172,7 +172,7 @@ QMimeType QMimeDatabasePrivate::findByNameAndData(const QString &fileName, QIODe
     *accuracyPtr = 0;
 
     // Pass 1) Try to match on the file name
-    QStringList candidatesByName = findByName(fileName);
+    QStringList candidatesByName = findByFileName(fileName);
     if (candidatesByName.count() == 1) {
         *accuracyPtr = 100;
         const QMimeType mime = mimeTypeForName(candidatesByName.at(0));
@@ -395,7 +395,7 @@ QMimeType QMimeDatabase::findByFile(const QFileInfo &fileInfo) const
 #endif
 
     int priority = 0;
-    return d->findByNameAndData(fileInfo.absoluteFilePath(), &file, &priority);
+    return d->findByFileNameAndData(fileInfo.absoluteFilePath(), &file, &priority);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -425,7 +425,7 @@ QMimeType QMimeDatabase::findByFile(const QString &fileName) const
 // ------------------------------------------------------------------------------------------------
 
 /*!
-    \fn QMimeType QMimeDatabase::findByName(const QString &fileName) const;
+    \fn QMimeType QMimeDatabase::findByFileName(const QString &fileName) const;
     \brief Returns a MIME type for the file name \a fileName.
 
     A valid MIME type is always returned. If the file name doesn't match any
@@ -435,15 +435,15 @@ QMimeType QMimeDatabase::findByFile(const QString &fileName) const
 
     This function does not try to open the file. To also use the content
     when determining the MIME type, use findByFile() or
-    findByNameAndData() instead.
+    findByFileNameAndData() instead.
 
     \sa findMimeTypesByFileName
 */
-QMimeType QMimeDatabase::findByName(const QString &fileName) const
+QMimeType QMimeDatabase::findByFileName(const QString &fileName) const
 {
     QMutexLocker locker(&d->mutex);
 
-    QStringList matches = d->findByName(fileName);
+    QStringList matches = d->findByFileName(fileName);
     const int matchCount = matches.count();
     if (matchCount == 0)
         return d->mimeTypeForName(d->defaultMimeType());
@@ -467,15 +467,15 @@ QMimeType QMimeDatabase::findByName(const QString &fileName) const
 
     This function does not try to open the file. To also use the content
     when determining the MIME type, use findByFile() or
-    findByNameAndData() instead.
+    findByFileNameAndData() instead.
 
-    \sa findByName
+    \sa findByFileName
 */
 QList<QMimeType> QMimeDatabase::findMimeTypesByFileName(const QString &fileName) const
 {
     QMutexLocker locker(&d->mutex);
 
-    QStringList matches = d->findByName(fileName);
+    QStringList matches = d->findByFileName(fileName);
     QList<QMimeType> mimes;
     matches.sort(); // Make it deterministic
     foreach (const QString& mime, matches) {
@@ -495,7 +495,7 @@ QString QMimeDatabase::suffixForFileName(const QString &fileName) const
 {
     QMutexLocker locker(&d->mutex);
     QString foundSuffix;
-    d->findByName(fileName, &foundSuffix);
+    d->findByFileName(fileName, &foundSuffix);
     return foundSuffix;
 }
 
@@ -567,7 +567,7 @@ QMimeType QMimeDatabase::findByUrl(const QUrl &url) const
     if (scheme.startsWith(QLatin1String("http")))
         return mimeTypeForName(d->defaultMimeType());
 
-    return findByName(url.path());
+    return findByFileName(url.path());
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -588,12 +588,12 @@ QMimeType QMimeDatabase::findByUrl(const QUrl &url) const
     but the contents will be used if the file extension is unknown, or
     matches multiple MIME types.
 */
-QMimeType QMimeDatabase::findByNameAndData(const QString &fileName, QIODevice *device) const
+QMimeType QMimeDatabase::findByFileNameAndData(const QString &fileName, QIODevice *device) const
 {
     DBG() << "fileName" << fileName;
 
     int accuracy = 0;
-    return d->findByNameAndData(fileName, device, &accuracy);
+    return d->findByFileNameAndData(fileName, device, &accuracy);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -614,13 +614,13 @@ QMimeType QMimeDatabase::findByNameAndData(const QString &fileName, QIODevice *d
     but the contents will be used if the file extension is unknown, or
     matches multiple MIME types.
 */
-QMimeType QMimeDatabase::findByNameAndData(const QString &fileName, const QByteArray &data) const
+QMimeType QMimeDatabase::findByFileNameAndData(const QString &fileName, const QByteArray &data) const
 {
     DBG() << "fileName" << fileName;
 
     QBuffer buffer(const_cast<QByteArray *>(&data));
     int accuracy = 0;
-    return d->findByNameAndData(fileName, &buffer, &accuracy);
+    return d->findByFileNameAndData(fileName, &buffer, &accuracy);
 }
 
 // ------------------------------------------------------------------------------------------------
diff --git a/src/mimetypes/qmimedatabase.h b/src/mimetypes/qmimedatabase.h
index 738a1d4..7b3e0ba 100644
--- a/src/mimetypes/qmimedatabase.h
+++ b/src/mimetypes/qmimedatabase.h
@@ -45,7 +45,7 @@ public:
 
     QMimeType mimeTypeForName(const QString &nameOrAlias) const;
 
-    QMimeType findByName(const QString &fileName) const;
+    QMimeType findByFileName(const QString &fileName) const;
     QList<QMimeType> findMimeTypesByFileName(const QString &fileName) const;
 
     QMimeType findByData(const QByteArray &data) const;
@@ -54,8 +54,8 @@ public:
     QMimeType findByFile(const QString &fileName) const;
     QMimeType findByFile(const QFileInfo &fileInfo) const;
     QMimeType findByUrl(const QUrl &url) const;
-    QMimeType findByNameAndData(const QString &fileName, QIODevice *device) const;
-    QMimeType findByNameAndData(const QString &fileName, const QByteArray &data) const;
+    QMimeType findByFileNameAndData(const QString &fileName, QIODevice *device) const;
+    QMimeType findByFileNameAndData(const QString &fileName, const QByteArray &data) const;
 
     QString suffixForFileName(const QString &fileName) const;
 
diff --git a/src/mimetypes/qmimedatabase_p.h b/src/mimetypes/qmimedatabase_p.h
index de9dbe8..f418c35 100644
--- a/src/mimetypes/qmimedatabase_p.h
+++ b/src/mimetypes/qmimedatabase_p.h
@@ -59,9 +59,9 @@ struct QMimeDatabasePrivate
 
 
     QMimeType mimeTypeForName(const QString &nameOrAlias);
-    QMimeType findByNameAndData(const QString &fileName, QIODevice *device, int *priorityPtr);
+    QMimeType findByFileNameAndData(const QString &fileName, QIODevice *device, int *priorityPtr);
     QMimeType findByData(const QByteArray &data, int *priorityPtr);
-    QStringList findByName(const QString &fileName, QString *foundSuffix = 0);
+    QStringList findByFileName(const QString &fileName, QString *foundSuffix = 0);
 
     mutable QMimeProviderBase *m_provider;
     const QString m_defaultMimeType;
diff --git a/src/mimetypes/qmimeprovider.cpp b/src/mimetypes/qmimeprovider.cpp
index 29f4646..94fb9b1 100644
--- a/src/mimetypes/qmimeprovider.cpp
+++ b/src/mimetypes/qmimeprovider.cpp
@@ -261,7 +261,7 @@ QMimeType QMimeBinaryProvider::mimeTypeForName(const QString &name)
     return mimeTypeForNameUnchecked(name);
 }
 
-QStringList QMimeBinaryProvider::findByName(const QString &fileName, QString *foundSuffix)
+QStringList QMimeBinaryProvider::findByFileName(const QString &fileName, QString *foundSuffix)
 {
     checkCache();
     const QString lowerFileName = fileName.toLower();
@@ -655,7 +655,7 @@ QMimeType QMimeXMLProvider::mimeTypeForName(const QString &name)
     return m_nameMimeTypeMap.value(name);
 }
 
-QStringList QMimeXMLProvider::findByName(const QString &fileName, QString *foundSuffix)
+QStringList QMimeXMLProvider::findByFileName(const QString &fileName, QString *foundSuffix)
 {
     ensureLoaded();
 
diff --git a/src/mimetypes/qmimeprovider_p.h b/src/mimetypes/qmimeprovider_p.h
index 21ed2ae..06a8d06 100644
--- a/src/mimetypes/qmimeprovider_p.h
+++ b/src/mimetypes/qmimeprovider_p.h
@@ -34,7 +34,7 @@ public:
 
     virtual bool isValid() = 0;
     virtual QMimeType mimeTypeForName(const QString &name) = 0;
-    virtual QStringList findByName(const QString &fileName, QString *foundSuffix) = 0;
+    virtual QStringList findByFileName(const QString &fileName, QString *foundSuffix) = 0;
     virtual QStringList parents(const QString &mime) = 0;
     virtual QString resolveAlias(const QString &name) = 0;
     virtual QMimeType findByMagic(const QByteArray &data, int *accuracyPtr) = 0;
@@ -60,7 +60,7 @@ public:
 
     virtual bool isValid();
     virtual QMimeType mimeTypeForName(const QString &name);
-    virtual QStringList findByName(const QString &fileName, QString *foundSuffix);
+    virtual QStringList findByFileName(const QString &fileName, QString *foundSuffix);
     virtual QStringList parents(const QString &mime);
     virtual QString resolveAlias(const QString &name);
     virtual QMimeType findByMagic(const QByteArray &data, int *accuracyPtr);
@@ -101,7 +101,7 @@ public:
 
     virtual bool isValid();
     virtual QMimeType mimeTypeForName(const QString &name);
-    virtual QStringList findByName(const QString &fileName, QString *foundSuffix);
+    virtual QStringList findByFileName(const QString &fileName, QString *foundSuffix);
     virtual QStringList parents(const QString &mime);
     virtual QString resolveAlias(const QString &name);
     virtual QMimeType findByMagic(const QByteArray &data, int *accuracyPtr);
diff --git a/tests/auto/qdeclarativemimedatabase/testdata_list.sh b/tests/auto/qdeclarativemimedatabase/testdata_list.sh
index 3f31de7..306c977 100755
--- a/tests/auto/qdeclarativemimedatabase/testdata_list.sh
+++ b/tests/auto/qdeclarativemimedatabase/testdata_list.sh
@@ -2,7 +2,7 @@
 
 #
 # Prepares the data from testfiles/list for tests in QML in the same way as
-# tst_qmimedatabase::findByName_data() for C++.
+# tst_qmimedatabase::findByFileName_data() for C++.
 # For QML, instead of passing the data in QTest columns the data is passed
 # via the JavaScript include file testdata_list.js.
 #
diff --git a/tests/auto/qdeclarativemimedatabase/tst_qdeclarativemimedatabase.qml b/tests/auto/qdeclarativemimedatabase/tst_qdeclarativemimedatabase.qml
index 10c67e3..89b2edb 100644
--- a/tests/auto/qdeclarativemimedatabase/tst_qdeclarativemimedatabase.qml
+++ b/tests/auto/qdeclarativemimedatabase/tst_qdeclarativemimedatabase.qml
@@ -140,14 +140,14 @@ TestCase {
         return false;
     }
 
-    function test_findByName() {
+    function test_findByFileName() {
         var ok = 0
 
         for (var listIx = 0; listIx < list().length; ++listIx) {
             //print(listValue(listIx).filePath)
 
-            var resultMimeTypeName = database.findByName(listValue(listIx).filePath).name
-            //print("findByName(" + listValue(listIx).filePath + ") returned", resultMimeTypeName)
+            var resultMimeTypeName = database.findByFileName(listValue(listIx).filePath).name
+            //print("findByFileName(" + listValue(listIx).filePath + ") returned", resultMimeTypeName)
 
             // Results are ambiguous when multiple MIME types have the same glob
             // -> accept the current result if the found MIME type actually
diff --git a/tests/auto/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/qmimedatabase/tst_qmimedatabase.cpp
index 8340c76..00a5838 100644
--- a/tests/auto/qmimedatabase/tst_qmimedatabase.cpp
+++ b/tests/auto/qmimedatabase/tst_qmimedatabase.cpp
@@ -122,7 +122,7 @@ void tst_qmimedatabase::test_mimeTypeForName()
 
 }
 
-void tst_qmimedatabase::test_findByName_data()
+void tst_qmimedatabase::test_findByFileName_data()
 {
     QTest::addColumn<QString>("fileName");
     QTest::addColumn<QString>("expectedMimeType");
@@ -157,12 +157,12 @@ void tst_qmimedatabase::test_findByName_data()
     QTest::newRow("doesn't exist but has known extension") << "IDontExist.txt" << "text/plain";
 }
 
-void tst_qmimedatabase::test_findByName()
+void tst_qmimedatabase::test_findByFileName()
 {
     QFETCH(QString, fileName);
     QFETCH(QString, expectedMimeType);
     QMimeDatabase db;
-    QMimeType mime = db.findByName(fileName);
+    QMimeType mime = db.findByFileName(fileName);
     QVERIFY(mime.isValid());
     QCOMPARE(mime.name(), expectedMimeType);
 
@@ -284,11 +284,11 @@ void tst_qmimedatabase::test_aliases()
 void tst_qmimedatabase::test_icons()
 {
     QMimeDatabase db;
-    QMimeType directory = db.findByName(QString::fromLatin1("/"));
+    QMimeType directory = db.findByFileName(QString::fromLatin1("/"));
     QCOMPARE(directory.name(), QString::fromLatin1("inode/directory"));
     QCOMPARE(directory.iconName(), QString::fromLatin1("inode-directory"));
 
-    QMimeType pub = db.findByName(QString::fromLatin1("foo.epub"));
+    QMimeType pub = db.findByFileName(QString::fromLatin1("foo.epub"));
     QCOMPARE(pub.name(), QString::fromLatin1("application/epub+zip"));
     QCOMPARE(pub.iconName(), QString::fromLatin1("application-epub+zip"));
     QCOMPARE(pub.genericIconName(), QString::fromLatin1("x-office-document"));
@@ -314,7 +314,7 @@ void tst_qmimedatabase::test_findByFileWithContent()
     mime = db.findByData(&file); // QIODevice ctor
     QCOMPARE(mime.name(), QString::fromLatin1("application/pdf"));
     // by name only, we cannot find the mimetype
-    mime = db.findByName(tempFileName);
+    mime = db.findByFileName(tempFileName);
     QVERIFY(mime.isValid());
     QVERIFY(mime.isDefault());
 
@@ -328,7 +328,7 @@ void tst_qmimedatabase::test_findByFileWithContent()
         mime = db.findByFile(txtTempFileName);
         QCOMPARE(mime.name(), QString::fromLatin1("text/plain"));
         // fast mode finds the same
-        mime = db.findByName(txtTempFileName);
+        mime = db.findByFileName(txtTempFileName);
         QCOMPARE(mime.name(), QString::fromLatin1("text/plain"));
     }
 
@@ -384,7 +384,7 @@ void tst_qmimedatabase::test_findByContent()
     QCOMPARE(db.findByData(&buffer).name(), expectedMimeTypeName);
 }
 
-void tst_qmimedatabase::test_findByNameAndContent_data()
+void tst_qmimedatabase::test_findByFileNameAndContent_data()
 {
     QTest::addColumn<QString>("name");
     QTest::addColumn<QByteArray>("data");
@@ -403,14 +403,14 @@ void tst_qmimedatabase::test_findByNameAndContent_data()
     QTest::newRow("text.xls, found by extension, user is in control") << QString::fromLatin1("text.xls") << oleData << "application/vnd.ms-excel";
 }
 
-void tst_qmimedatabase::test_findByNameAndContent()
+void tst_qmimedatabase::test_findByFileNameAndContent()
 {
     QFETCH(QString, name);
     QFETCH(QByteArray, data);
     QFETCH(QString, expectedMimeTypeName);
 
     QMimeDatabase db;
-    QCOMPARE(db.findByNameAndData(name, data).name(), expectedMimeTypeName);
+    QCOMPARE(db.findByFileNameAndData(name, data).name(), expectedMimeTypeName);
 }
 
 void tst_qmimedatabase::test_allMimeTypes()
@@ -508,7 +508,7 @@ void tst_qmimedatabase::test_knownSuffix()
     QCOMPARE(db.suffixForFileName(QString::fromLatin1("foo.tar.bz2")), QString::fromLatin1("tar.bz2"));
 }
 
-void tst_qmimedatabase::findByName_data()
+void tst_qmimedatabase::findByFileName_data()
 {
     QTest::addColumn<QString>("filePath");
     QTest::addColumn<QString>("mimeTypeName");
@@ -541,7 +541,7 @@ void tst_qmimedatabase::findByName_data()
     }
 }
 
-void tst_qmimedatabase::findByName()
+void tst_qmimedatabase::findByFileName()
 {
     QFETCH(QString, filePath);
     QFETCH(QString, mimeTypeName);
@@ -551,7 +551,7 @@ void tst_qmimedatabase::findByName()
 
     //qDebug() << Q_FUNC_INFO << filePath;
 
-    const QMimeType resultMimeType(database.findByName(filePath));
+    const QMimeType resultMimeType(database.findByFileName(filePath));
     if (resultMimeType.isValid()) {
         //qDebug() << Q_FUNC_INFO << "MIME type" << resultMimeType.name() << "has generic icon name" << resultMimeType.genericIconName() << "and icon name" << resultMimeType.iconName();
 
@@ -569,7 +569,7 @@ void tst_qmimedatabase::findByName()
 #endif
     }
     const QString resultMimeTypeName = resultMimeType.name();
-    //qDebug() << Q_FUNC_INFO << "findByName() returned" << resultMimeTypeName;
+    //qDebug() << Q_FUNC_INFO << "findByFileName() returned" << resultMimeTypeName;
 
     const bool failed = resultMimeTypeName != mimeTypeName;
     const bool shouldFail = (xFail.length() >= 1 && xFail.at(0) == QLatin1Char('x'));
@@ -597,7 +597,7 @@ void tst_qmimedatabase::findByName()
 
 void tst_qmimedatabase::findByData_data()
 {
-    findByName_data();
+    findByFileName_data();
 }
 
 void tst_qmimedatabase::findByData()
@@ -622,7 +622,7 @@ void tst_qmimedatabase::findByData()
 
 void tst_qmimedatabase::findByFile_data()
 {
-    findByName_data();
+    findByFileName_data();
 }
 
 void tst_qmimedatabase::findByFile()
diff --git a/tests/auto/qmimedatabase/tst_qmimedatabase.h b/tests/auto/qmimedatabase/tst_qmimedatabase.h
index 4fec1c9..74b9fa2 100644
--- a/tests/auto/qmimedatabase/tst_qmimedatabase.h
+++ b/tests/auto/qmimedatabase/tst_qmimedatabase.h
@@ -22,8 +22,8 @@ private slots:
     void cleanupTestCase();
 
     void test_mimeTypeForName();
-    void test_findByName_data();
-    void test_findByName();
+    void test_findByFileName_data();
+    void test_findByFileName();
     void test_findMultipleByName_data();
     void test_findMultipleByName();
     void test_inheritance();
@@ -33,8 +33,8 @@ private slots:
     void test_findByUrl();
     void test_findByContent_data();
     void test_findByContent();
-    void test_findByNameAndContent_data();
-    void test_findByNameAndContent();
+    void test_findByFileNameAndContent_data();
+    void test_findByFileNameAndContent();
     void test_allMimeTypes();
     void test_inheritsPerformance();
     void test_suffixes_data();
@@ -44,8 +44,8 @@ private slots:
 
     // shared-mime-info test suite
 
-    void findByName_data();
-    void findByName();
+    void findByFileName_data();
+    void findByFileName();
 
     void findByData_data();
     void findByData();