From c241d8921ea6384c30a1731a036aec8edc7609ab Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 14 May 2012 19:42:10 +0200 Subject: 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 --- tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto') 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)); } -- cgit v1.2.3