From fe072de82ad356bf1dcb1ef45cb548adb1a604f7 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Sun, 31 Mar 2024 16:05:10 +0300
Subject: [PATCH] remove redundant QFontComboBox enums

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 src/gui/widgets/qfontcombobox.cpp | 17 +++++++----------
 src/gui/widgets/qfontcombobox.h   |  4 +---
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/gui/widgets/qfontcombobox.cpp b/src/gui/widgets/qfontcombobox.cpp
index c295fe515..3b76bbe6e 100644
--- a/src/gui/widgets/qfontcombobox.cpp
+++ b/src/gui/widgets/qfontcombobox.cpp
@@ -127,8 +127,9 @@ public:
 void QFontComboBoxPrivate::_q_updateModel()
 {
     Q_Q(QFontComboBox);
-    const int scalableMask = (QFontComboBox::ScalableFonts | QFontComboBox::NonScalableFonts);
-    const int spacingMask = (QFontComboBox::ProportionalFonts | QFontComboBox::MonospacedFonts);
+    const bool all = (filters == QFontComboBox::AllFonts);
+    const bool scalable = (filters & QFontComboBox::ScalableFonts);
+    const bool mono = (filters & QFontComboBox::MonospacedFonts);
 
     QStringListModel *m = qobject_cast<QStringListModel *>(q->model());
     if (!m)
@@ -142,13 +143,11 @@ void QFontComboBoxPrivate::_q_updateModel()
     QFont sf = fdb.font(currentFont.family(), currentFont.styleName(), currentFont.pointSize());
 
     for (int i = 0; i < list.size(); ++i) {
-        if ((filters & scalableMask) && (filters & scalableMask) != scalableMask) {
-            if (bool(filters & QFontComboBox::ScalableFonts) != fdb.isScalable(list.at(i)))
-                continue;
+        if (!all && scalable && !fdb.isScalable(list.at(i))) {
+            continue;
         }
-        if ((filters & spacingMask) && (filters & spacingMask) != spacingMask) {
-            if (bool(filters & QFontComboBox::MonospacedFonts) != fdb.isFixedPitch(list.at(i)))
-                continue;
+        if (!all && mono && !fdb.isFixedPitch(list.at(i))) {
+            continue;
         }
         result += list.at(i);
         if (list.at(i) == sf.family() || list.at(i).startsWith(sf.family() + QLatin1String(" [")))
@@ -257,9 +256,7 @@ QFontComboBox::~QFontComboBox()
 
   \value AllFonts Show all fonts
   \value ScalableFonts Show scalable fonts
-  \value NonScalableFonts Show non scalable fonts
   \value MonospacedFonts Show monospaced fonts
-  \value ProportionalFonts Show proportional fonts
 */
 
 /*!
diff --git a/src/gui/widgets/qfontcombobox.h b/src/gui/widgets/qfontcombobox.h
index 3b89916d8..643449122 100644
--- a/src/gui/widgets/qfontcombobox.h
+++ b/src/gui/widgets/qfontcombobox.h
@@ -46,9 +46,7 @@ public:
     enum FontFilter {
         AllFonts = 0,
         ScalableFonts = 0x1,
-        NonScalableFonts = 0x2,
-        MonospacedFonts = 0x4,
-        ProportionalFonts = 0x8
+        MonospacedFonts = 0x2
     };
     Q_DECLARE_FLAGS(FontFilters, FontFilter)