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 <sona.kurazyan@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
parent
cf396c2da9
commit
c986c046b4
@ -34,14 +34,14 @@ void QFreeTypeFontDatabase::populateFontDatabase()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
QStringList nameFilters;
|
static const QString nameFilters[] = {
|
||||||
nameFilters << "*.ttf"_L1
|
u"*.ttf"_s,
|
||||||
<< "*.ttc"_L1
|
u"*.pfa"_s,
|
||||||
<< "*.pfa"_L1
|
u"*.pfb"_s,
|
||||||
<< "*.pfb"_L1
|
u"*.otf"_s,
|
||||||
<< "*.otf"_L1;
|
};
|
||||||
|
|
||||||
const auto fis = dir.entryInfoList(nameFilters, QDir::Files);
|
const auto fis = dir.entryInfoList(QStringList::fromReadOnlyData(nameFilters), QDir::Files);
|
||||||
for (const QFileInfo &fi : fis) {
|
for (const QFileInfo &fi : fis) {
|
||||||
const QByteArray file = QFile::encodeName(fi.absoluteFilePath());
|
const QByteArray file = QFile::encodeName(fi.absoluteFilePath());
|
||||||
QFreeTypeFontDatabase::addTTFile(QByteArray(), file);
|
QFreeTypeFontDatabase::addTTFile(QByteArray(), file);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user