diff options
Diffstat (limited to 'tests')
5 files changed, 27 insertions, 27 deletions
diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp index 12e8083622..c2b82059ec 100644 --- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp +++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp @@ -166,7 +166,7 @@ void tst_QFontDatabase::systemFixedFont() // QTBUG-54623 { QFont font = QFontDatabase::systemFont(QFontDatabase::FixedFont); QFontInfo fontInfo(font); - bool fdbSaysFixed = QFontDatabase().isFixedPitch(fontInfo.family(), fontInfo.styleName()); + bool fdbSaysFixed = QFontDatabase::isFixedPitch(fontInfo.family(), fontInfo.styleName()); qCDebug(lcTests) << "system fixed font is" << font << "really fixed?" << fdbSaysFixed << fontInfo.fixedPitch(); QVERIFY(fdbSaysFixed); QVERIFY(fontInfo.fixedPitch()); @@ -296,8 +296,8 @@ void tst_QFontDatabase::addTwoAppFontsFromFamily() QString italicFontName = QFontDatabase::applicationFontFamilies(italicId).first(); QCOMPARE(regularFontName, italicFontName); - QFont italicFont = QFontDatabase().font(italicFontName, - QString::fromLatin1("Italic"), 14); + QFont italicFont = QFontDatabase::font(italicFontName, + QString::fromLatin1("Italic"), 14); QVERIFY(italicFont.italic()); QFontDatabase::removeApplicationFont(regularId); @@ -426,7 +426,7 @@ void tst_QFontDatabase::rasterFonts() if (fontInfo.family() != font.family()) QSKIP("Fixedsys font not available."); - QVERIFY(!QFontDatabase().isSmoothlyScalable(font.family())); + QVERIFY(!QFontDatabase::isSmoothlyScalable(font.family())); QVERIFY(fontInfo.pointSize() != font.pointSize()); } @@ -439,8 +439,8 @@ void tst_QFontDatabase::smoothFonts() QSKIP("Arial font not available."); // Smooth and bitmap scaling are mutually exclusive - QVERIFY(QFontDatabase().isSmoothlyScalable(font.family())); - QVERIFY(!QFontDatabase().isBitmapScalable(font.family())); + QVERIFY(QFontDatabase::isSmoothlyScalable(font.family())); + QVERIFY(!QFontDatabase::isBitmapScalable(font.family())); } void tst_QFontDatabase::registerOpenTypePreferredNamesSystem() diff --git a/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp index a443688d7e..8ed9ad6a9a 100644 --- a/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp +++ b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp @@ -156,7 +156,7 @@ void tst_QRawFont::explicitRawFontNotLoadedInDatabase() QRawFont font(testFont, 10, hintingPreference); QVERIFY(font.isValid()); - QVERIFY(!QFontDatabase().families().contains(font.familyName())); + QVERIFY(!QFontDatabase::families().contains(font.familyName())); } void tst_QRawFont::explicitRawFontNotAvailableInSystem_data() diff --git a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp index 9a55b16af9..04e6282ca9 100644 --- a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp +++ b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp @@ -182,7 +182,7 @@ void tst_QTextScriptEngine::devanagari_data() QSKIP("Test fonts are not available"); { - if (QFontDatabase().families(QFontDatabase::Devanagari).contains("Raghindi")) { + if (QFontDatabase::families(QFontDatabase::Devanagari).contains("Raghindi")) { QFont f("Raghindi"); const ShapeTable shape_table [] = { // Ka @@ -228,7 +228,7 @@ void tst_QTextScriptEngine::devanagari_data() } { - if (QFontDatabase().families(QFontDatabase::Devanagari).contains("Mangal")) { + if (QFontDatabase::families(QFontDatabase::Devanagari).contains("Mangal")) { QFont f("Mangal"); const ShapeTable shape_table [] = { // Ka @@ -289,7 +289,7 @@ void tst_QTextScriptEngine::bengali_data() QSKIP("Test fonts are not available"); { - if (QFontDatabase().families(QFontDatabase::Bengali).contains("Akaash")) { + if (QFontDatabase::families(QFontDatabase::Bengali).contains("Akaash")) { QFont f("Akaash"); const ShapeTable shape_table [] = { // Ka @@ -392,7 +392,7 @@ void tst_QTextScriptEngine::bengali_data() QSKIP("couldn't find Akaash"); } { - if (QFontDatabase().families(QFontDatabase::Bengali).contains("Mukti Narrow")) { + if (QFontDatabase::families(QFontDatabase::Bengali).contains("Mukti Narrow")) { QFont f("Mukti Narrow"); const ShapeTable shape_table [] = { // Ka @@ -490,7 +490,7 @@ void tst_QTextScriptEngine::bengali_data() QSKIP("couldn't find Mukti"); } { - if (QFontDatabase().families(QFontDatabase::Bengali).contains("Likhan")) { + if (QFontDatabase::families(QFontDatabase::Bengali).contains("Likhan")) { QFont f("Likhan"); const ShapeTable shape_table [] = { { { 0x9a8, 0x9cd, 0x9af, 0x0 }, @@ -527,7 +527,7 @@ void tst_QTextScriptEngine::gurmukhi_data() QSKIP("Test fonts are not available"); { - if (QFontDatabase().families(QFontDatabase::Gurmukhi).contains("Lohit Punjabi")) { + if (QFontDatabase::families(QFontDatabase::Gurmukhi).contains("Lohit Punjabi")) { QFont f("Lohit Punjabi"); const ShapeTable shape_table [] = { { { 0xA15, 0xA4D, 0xa39, 0x0 }, @@ -555,7 +555,7 @@ void tst_QTextScriptEngine::oriya_data() QSKIP("Test fonts are not available"); { - if (QFontDatabase().families(QFontDatabase::Oriya).contains("utkal")) { + if (QFontDatabase::families(QFontDatabase::Oriya).contains("utkal")) { QFont f("utkal"); const ShapeTable shape_table [] = { { { 0xb15, 0xb4d, 0xb24, 0xb4d, 0xb30, 0x0 }, @@ -596,7 +596,7 @@ void tst_QTextScriptEngine::tamil_data() QSKIP("Test fonts are not available"); { - if (QFontDatabase().families(QFontDatabase::Tamil).contains("AkrutiTml1")) { + if (QFontDatabase::families(QFontDatabase::Tamil).contains("AkrutiTml1")) { QFont f("AkrutiTml1"); const ShapeTable shape_table [] = { { { 0x0b95, 0x0bc2, 0x0 }, @@ -673,7 +673,7 @@ void tst_QTextScriptEngine::telugu_data() QSKIP("Test fonts are not available"); { - if (QFontDatabase().families(QFontDatabase::Telugu).contains("Pothana2000")) { + if (QFontDatabase::families(QFontDatabase::Telugu).contains("Pothana2000")) { QFont f("Pothana2000"); const ShapeTable shape_table [] = { { { 0xc15, 0xc4d, 0x0 }, @@ -722,7 +722,7 @@ void tst_QTextScriptEngine::kannada_data() QSKIP("Test fonts are not available"); { - if (QFontDatabase().families(QFontDatabase::Kannada).contains("Sampige")) { + if (QFontDatabase::families(QFontDatabase::Kannada).contains("Sampige")) { QFont f("Sampige"); const ShapeTable shape_table [] = { { { 0x0ca8, 0x0ccd, 0x0ca8, 0x0 }, @@ -753,7 +753,7 @@ void tst_QTextScriptEngine::kannada_data() QSKIP("couldn't find Sampige"); } { - if (QFontDatabase().families(QFontDatabase::Kannada).contains("Tunga")) { + if (QFontDatabase::families(QFontDatabase::Kannada).contains("Tunga")) { QFont f("Tunga"); const ShapeTable shape_table [] = { { { 0x0cb7, 0x0cc6, 0x0 }, @@ -793,7 +793,7 @@ void tst_QTextScriptEngine::malayalam_data() QSKIP("Test fonts are not available"); { - if (QFontDatabase().families(QFontDatabase::Malayalam).contains("AkrutiMal2")) { + if (QFontDatabase::families(QFontDatabase::Malayalam).contains("AkrutiMal2")) { QFont f("AkrutiMal2"); const ShapeTable shape_table [] = { { { 0x0d15, 0x0d46, 0x0 }, @@ -837,7 +837,7 @@ void tst_QTextScriptEngine::malayalam_data() QSKIP("couldn't find AkrutiMal2"); } { - if (QFontDatabase().families(QFontDatabase::Malayalam).contains("Rachana")) { + if (QFontDatabase::families(QFontDatabase::Malayalam).contains("Rachana")) { QFont f("Rachana"); const ShapeTable shape_table [] = { { { 0xd37, 0xd4d, 0xd1f, 0xd4d, 0xd30, 0xd40, 0x0 }, @@ -874,7 +874,7 @@ void tst_QTextScriptEngine::sinhala_data() QSKIP("Test fonts are not available"); { - if (QFontDatabase().families(QFontDatabase::Sinhala).contains("Malithi Web")) { + if (QFontDatabase::families(QFontDatabase::Sinhala).contains("Malithi Web")) { QFont f("Malithi Web"); const ShapeTable shape_table [] = { { { 0xd9a, 0xdd9, 0xdcf, 0x0 }, @@ -912,7 +912,7 @@ void tst_QTextScriptEngine::khmer_data() QSKIP("Test fonts are not available"); { - if (QFontDatabase().families(QFontDatabase::Khmer).contains("Khmer OS")) { + if (QFontDatabase::families(QFontDatabase::Khmer).contains("Khmer OS")) { QFont f("Khmer OS"); const ShapeTable shape_table [] = { { { 0x179a, 0x17cd, 0x0 }, @@ -956,7 +956,7 @@ void tst_QTextScriptEngine::linearB_data() QSKIP("Test fonts are not available"); { - if (QFontDatabase().families(QFontDatabase::Any).contains("Penuturesu")) { + if (QFontDatabase::families(QFontDatabase::Any).contains("Penuturesu")) { QFont f("Penuturesu"); const ShapeTable shape_table [] = { { { 0xd800, 0xdc01, 0xd800, 0xdc02, 0xd800, 0xdc03, 0 }, @@ -984,7 +984,7 @@ void tst_QTextScriptEngine::greek_data() QSKIP("Test fonts are not available"); { - if (QFontDatabase().families(QFontDatabase::Any).contains("DejaVu Sans")) { + if (QFontDatabase::families(QFontDatabase::Any).contains("DejaVu Sans")) { QFont f("DejaVu Sans"); for (int uc = 0x1f00; uc <= 0x1fff; ++uc) { QString string; @@ -997,7 +997,7 @@ void tst_QTextScriptEngine::greek_data() } { - if (QFontDatabase().families(QFontDatabase::Any).contains("SBL Greek")) { + if (QFontDatabase::families(QFontDatabase::Any).contains("SBL Greek")) { QFont f("SBL Greek"); for (int uc = 0x1f00; uc <= 0x1fff; ++uc) { QString string; diff --git a/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp index f5358ceb93..628af91674 100644 --- a/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp +++ b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp @@ -197,7 +197,7 @@ void tst_QFontDialog::task256466_wrongStyle() styleList->currentIndex().data().toString(), expectedSize); QCOMPARE(current.family(), expected.family()); QCOMPARE(current.style(), expected.style()); - if (expectedSize == 0 && !QFontDatabase().isScalable(current.family(), current.styleName())) + if (expectedSize == 0 && !QFontDatabase::isScalable(current.family(), current.styleName())) QEXPECT_FAIL("", "QTBUG-53299: Smooth sizes for unscalable font contains unsupported size", Continue); QCOMPARE(current.pointSizeF(), expected.pointSizeF()); } diff --git a/tests/manual/textrendering/textperformance/main.cpp b/tests/manual/textrendering/textperformance/main.cpp index 8fb3a3c4a2..9d238ad420 100644 --- a/tests/manual/textrendering/textperformance/main.cpp +++ b/tests/manual/textrendering/textperformance/main.cpp @@ -152,7 +152,7 @@ public: { static QStringList samples; if (samples.isEmpty()) { - foreach (const QFontDatabase::WritingSystem system, QFontDatabase().writingSystems()) + foreach (const QFontDatabase::WritingSystem system, QFontDatabase::writingSystems()) if (system != QFontDatabase::Ogham && system != QFontDatabase::Runic) samples.append(QFontDatabase::writingSystemSample(system)); } |