From: Ivailo Monev <xakepa10@laimg.moc>
Date: Mon, 6 Jul 2020 11:37:10 +0000 (+0000)
Subject: use static list in QFontDatabase::standardSizes()
X-Git-Tag: 4.12.0~3703
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=257192e5f9f5122f29688338c617e055fe8f40f2;p=kde%2FKatie.git

use static list in QFontDatabase::standardSizes()

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---

diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index ec6194424..078aa7cee 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -1260,12 +1260,26 @@ QList<int> QFontDatabase::smoothSizes(const QString &family,
 */
 QList<int> QFontDatabase::standardSizes()
 {
-    QList<int> ret;
-    static const unsigned short standard[] =
-        { 6, 7, 8, 9, 10, 11, 12, 14, 16, 18, 20, 22, 24, 26, 28, 36, 48, 72, 0 };
-    const unsigned short *sizes = standard;
-    while (*sizes) ret << *sizes++;
-    return ret;
+    static const QList<int> sizes = QList<int>()
+        << 6
+        << 7
+        << 8
+        << 9
+        << 10
+        << 11
+        << 12
+        << 14
+        << 16
+        << 18
+        << 20
+        << 22
+        << 24
+        << 26
+        << 28
+        << 36
+        << 48
+        << 72;
+    return sizes;
 }