From d8803515539353be463469354095abdb2114bec9 Mon Sep 17 00:00:00 2001 From: Axel Spoerl Date: Fri, 29 Dec 2023 11:01:09 +0100 Subject: QMimeDataBase: Remove dead code Remove dead code. Task-number: QTBUG-118566 Change-Id: I4fd912a891733cc1624be2a631cb47f930b82963 Reviewed-by: Thiago Macieira --- .../mimetypes/qmimedatabase/tst_qmimedatabase.cpp | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp') diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp index 518cfcae57..7e97c661c1 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp +++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp @@ -184,7 +184,6 @@ void tst_QMimeDatabase::mimeTypeForName() QMimeType s1 = db.mimeTypeForName(QString::fromLatin1("text/plain")); QVERIFY(s1.isValid()); QCOMPARE(s1.name(), QString::fromLatin1("text/plain")); - //qDebug("Comment is %s", qPrintable(s1.comment())); QMimeType krita = db.mimeTypeForName(QString::fromLatin1("application/x-krita")); QVERIFY(krita.isValid()); @@ -895,25 +894,8 @@ void tst_QMimeDatabase::findByFileName() QMimeDatabase database; - //qDebug() << Q_FUNC_INFO << filePath; - const QMimeType resultMimeType(database.mimeTypeForFile(filePath, QMimeDatabase::MatchExtension)); - if (resultMimeType.isValid()) { - //qDebug() << Q_FUNC_INFO << "MIME type" << resultMimeType.name() << "has generic icon name" << resultMimeType.genericIconName() << "and icon name" << resultMimeType.iconName(); - -// Loading icons depend on the icon theme, we can't enable this test -#if 0 - QCOMPARE(resultMimeType.genericIconName(), QIcon::fromTheme(resultMimeType.genericIconName()).name()); - QVERIFY2(!QIcon::fromTheme(resultMimeType.genericIconName()).isNull(), qPrintable(resultMimeType.genericIconName())); - QVERIFY2(QIcon::hasThemeIcon(resultMimeType.genericIconName()), qPrintable(resultMimeType.genericIconName())); - - QCOMPARE(resultMimeType.iconName(), QIcon::fromTheme(resultMimeType.iconName()).name()); - QVERIFY2(!QIcon::fromTheme(resultMimeType.iconName()).isNull(), qPrintable(resultMimeType.iconName())); - QVERIFY2(QIcon::hasThemeIcon(resultMimeType.iconName()), qPrintable(resultMimeType.iconName())); -#endif - } const QString resultMimeTypeName = resultMimeType.name(); - //qDebug() << Q_FUNC_INFO << "mimeTypeForFile() returned" << resultMimeTypeName; const bool failed = resultMimeTypeName != mimeTypeName; const bool shouldFail = (xFail.size() >= 1 && xFail.at(0) == QLatin1Char('x')); @@ -926,7 +908,6 @@ void tst_QMimeDatabase::findByFileName() QVERIFY2(resultMimeType == foundMimeType, qPrintable(resultMimeType.name() + QString::fromLatin1(" vs. ") + foundMimeType.name())); if (foundMimeType.isValid()) { const QString extension = QFileInfo(filePath).suffix(); - //qDebug() << Q_FUNC_INFO << "globPatterns:" << foundMimeType.globPatterns() << "- extension:" << QString() + "*." + extension; if (foundMimeType.globPatterns().contains(QString::fromLatin1("*.") + extension)) return; } @@ -993,7 +974,6 @@ void tst_QMimeDatabase::findByFile() QMimeDatabase database; const QString resultMimeTypeName = database.mimeTypeForFile(filePath).name(); - //qDebug() << Q_FUNC_INFO << filePath << "->" << resultMimeTypeName; if (xFail.size() >= 3 && xFail.at(2) == QLatin1Char('x')) { // Expected to fail QVERIFY2(resultMimeTypeName != mimeTypeName, qPrintable(resultMimeTypeName)); -- cgit v1.2.3