1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QMimeDataBase: Remove dead code

Browse Source 
Remove dead code.

Task-number: QTBUG-118566
Change-Id: I4fd912a891733cc1624be2a631cb47f930b82963
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Axel Spoerl 2023-12-29 11:01:09 +01:00
parent 27dea6cf23
commit d880351553
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
View File

@ -184,7 +184,6 @@ void tst_QMimeDatabase::mimeTypeForName()
QMimeType s1 = db.mimeTypeForName(QString::fromLatin1("text/plain")); QMimeType s1 = db.mimeTypeForName(QString::fromLatin1("text/plain"));
QVERIFY(s1.isValid()); QVERIFY(s1.isValid());
QCOMPARE(s1.name(), QString::fromLatin1("text/plain")); QCOMPARE(s1.name(), QString::fromLatin1("text/plain"));
//qDebug("Comment is %s", qPrintable(s1.comment()));
QMimeType krita = db.mimeTypeForName(QString::fromLatin1("application/x-krita")); QMimeType krita = db.mimeTypeForName(QString::fromLatin1("application/x-krita"));
QVERIFY(krita.isValid()); QVERIFY(krita.isValid());
@ -895,25 +894,8 @@ void tst_QMimeDatabase::findByFileName()
QMimeDatabase database; QMimeDatabase database;
//qDebug() << Q_FUNC_INFO << filePath;
const QMimeType resultMimeType(database.mimeTypeForFile(filePath, QMimeDatabase::MatchExtension)); 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(); const QString resultMimeTypeName = resultMimeType.name();
//qDebug() << Q_FUNC_INFO << "mimeTypeForFile() returned" << resultMimeTypeName;
const bool failed = resultMimeTypeName != mimeTypeName; const bool failed = resultMimeTypeName != mimeTypeName;
const bool shouldFail = (xFail.size() >= 1 && xFail.at(0) == QLatin1Char('x')); 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())); QVERIFY2(resultMimeType == foundMimeType, qPrintable(resultMimeType.name() + QString::fromLatin1(" vs. ") + foundMimeType.name()));
if (foundMimeType.isValid()) { if (foundMimeType.isValid()) {
const QString extension = QFileInfo(filePath).suffix(); const QString extension = QFileInfo(filePath).suffix();
//qDebug() << Q_FUNC_INFO << "globPatterns:" << foundMimeType.globPatterns() << "- extension:" << QString() + "*." + extension;
if (foundMimeType.globPatterns().contains(QString::fromLatin1("*.") + extension)) if (foundMimeType.globPatterns().contains(QString::fromLatin1("*.") + extension))
return; return;
} }
@ -993,7 +974,6 @@ void tst_QMimeDatabase::findByFile()
QMimeDatabase database; QMimeDatabase database;
const QString resultMimeTypeName = database.mimeTypeForFile(filePath).name(); const QString resultMimeTypeName = database.mimeTypeForFile(filePath).name();
//qDebug() << Q_FUNC_INFO << filePath << "->" << resultMimeTypeName;
if (xFail.size() >= 3 && xFail.at(2) == QLatin1Char('x')) { if (xFail.size() >= 3 && xFail.at(2) == QLatin1Char('x')) {
// Expected to fail // Expected to fail
QVERIFY2(resultMimeTypeName != mimeTypeName, qPrintable(resultMimeTypeName)); QVERIFY2(resultMimeTypeName != mimeTypeName, qPrintable(resultMimeTypeName));