Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 10:22:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove redundant QFontComboBox enums

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-03-31 16:05:10 +03:00
parent 0d24895e9a
commit fe072de82a
2 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gui/widgets/qfontcombobox.cpp
View file

@ -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
*/
/*!

4
src/gui/widgets/qfontcombobox.h
View file

@ -46,9 +46,7 @@ public:
enum FontFilter {
AllFonts = 0,
ScalableFonts = 0x1,
NonScalableFonts = 0x2,
MonospacedFonts = 0x4,
ProportionalFonts = 0x8
MonospacedFonts = 0x2
};
Q_DECLARE_FLAGS(FontFilters, FontFilter)