From c986c046b4804e08dbe4c8e78b73e1775d64711a Mon Sep 17 00:00:00 2001 From: Mate Barany Date: Thu, 15 Sep 2022 18:05:07 +0200 Subject: [PATCH] QtGui: Use static const QString array to initialize QStringList This commit addresses a comment from the review of QTBUG-98434. Introduce a static const QString array for the name filters and create the filtering QStringList from this array. Task-number: QTBUG-103100 Change-Id: I7e07ea1083d802340c943f4a67eb4a831be4516a Reviewed-by: Sona Kurazyan Reviewed-by: Marc Mutz --- src/gui/text/freetype/qfreetypefontdatabase.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/text/freetype/qfreetypefontdatabase.cpp b/src/gui/text/freetype/qfreetypefontdatabase.cpp index e941614b4fa..cf1ca42ab44 100644 --- a/src/gui/text/freetype/qfreetypefontdatabase.cpp +++ b/src/gui/text/freetype/qfreetypefontdatabase.cpp @@ -34,14 +34,14 @@ void QFreeTypeFontDatabase::populateFontDatabase() return; } - QStringList nameFilters; - nameFilters << "*.ttf"_L1 - << "*.ttc"_L1 - << "*.pfa"_L1 - << "*.pfb"_L1 - << "*.otf"_L1; + static const QString nameFilters[] = { + u"*.ttf"_s, + u"*.pfa"_s, + u"*.pfb"_s, + u"*.otf"_s, + }; - const auto fis = dir.entryInfoList(nameFilters, QDir::Files); + const auto fis = dir.entryInfoList(QStringList::fromReadOnlyData(nameFilters), QDir::Files); for (const QFileInfo &fi : fis) { const QByteArray file = QFile::encodeName(fi.absoluteFilePath()); QFreeTypeFontDatabase::addTTFile(QByteArray(), file);