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 /tests/auto/corelib | |
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 'tests/auto/corelib')
-rw-r--r-- | tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp index ecea1a927e..e6def6ebbc 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp +++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp @@ -486,14 +486,14 @@ void tst_QMimeDatabase::mimeTypeForFileAndContent() QFETCH(QString, expectedMimeTypeName); QMimeDatabase db; - QCOMPARE(db.mimeTypeForNameAndData(name, data).name(), expectedMimeTypeName); + QCOMPARE(db.mimeTypeForFileNameAndData(name, data).name(), expectedMimeTypeName); QBuffer buffer(&data); - QCOMPARE(db.mimeTypeForNameAndData(name, &buffer).name(), expectedMimeTypeName); + QCOMPARE(db.mimeTypeForFileNameAndData(name, &buffer).name(), expectedMimeTypeName); QVERIFY(!buffer.isOpen()); // initial state was restored QVERIFY(buffer.open(QIODevice::ReadOnly)); - QCOMPARE(db.mimeTypeForNameAndData(name, &buffer).name(), expectedMimeTypeName); + QCOMPARE(db.mimeTypeForFileNameAndData(name, &buffer).name(), expectedMimeTypeName); QVERIFY(buffer.isOpen()); QCOMPARE(buffer.pos(), qint64(0)); } |