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

remove unused QFontDef member

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-12-05 13:05:22 +00:00
parent 94b081856d
commit 4b6374d9c8
2 changed files with 1 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gui/text/qfont.cpp
View file

@ -131,9 +131,6 @@ bool QFontDef::exactMatch(const QFontDef &other) const
&& (this_foundry.isEmpty()
|| other_foundry.isEmpty()
|| this_foundry == other_foundry)
#ifdef Q_WS_X11
&& addStyle == other.addStyle
#endif // Q_WS_X11
);
}
@ -747,9 +744,6 @@ void QFont::setFamily(const QString &family)
detach();
d->request.family = family;
#if defined(Q_WS_X11)
d->request.addStyle.clear();
#endif // Q_WS_X11
resolve_mask |= QFont::FamilyResolved;
}
@ -1313,10 +1307,6 @@ void QFont::setStyleHint(StyleHint hint, StyleStrategy strategy)
d->request.styleStrategy = strategy;
resolve_mask |= QFont::StyleHintResolved;
resolve_mask |= QFont::StyleStrategyResolved;
#if defined(Q_WS_X11)
d->request.addStyle.clear();
#endif // Q_WS_X11
}
/*!
@ -1602,9 +1592,6 @@ bool QFont::operator<(const QFont &f) const
if (r1.styleHint != r2.styleHint) return r1.styleHint < r2.styleHint;
if (r1.styleStrategy != r2.styleStrategy) return r1.styleStrategy < r2.styleStrategy;
if (r1.family != r2.family) return r1.family < r2.family;
#ifdef Q_WS_X11
if (r1.addStyle != r2.addStyle) return r1.addStyle < r2.addStyle;
#endif // Q_WS_X11
if (f.d->capital != d->capital) return f.d->capital < d->capital;
if (f.d->letterSpacingIsAbsolute != d->letterSpacingIsAbsolute) return f.d->letterSpacingIsAbsolute < d->letterSpacingIsAbsolute;

15
src/gui/text/qfont_p.h
View file

@ -71,10 +71,6 @@ struct QFontDef
QString family;
QString styleName;
#ifdef Q_WS_X11
QString addStyle;
#endif // Q_WS_X11
qreal pointSize;
qreal pixelSize;
@ -101,11 +97,7 @@ struct QFontDef
&& ignorePitch == other.ignorePitch && fixedPitch == other.fixedPitch
&& family == other.family
&& (styleName.isEmpty() || other.styleName.isEmpty() || styleName == other.styleName)
&& hintingPreference == other.hintingPreference
#ifdef Q_WS_X11
&& addStyle == other.addStyle
#endif
;
&& hintingPreference == other.hintingPreference;
}
inline bool operator<(const QFontDef &other) const
{
@ -119,11 +111,6 @@ struct QFontDef
if (!styleName.isEmpty() && !other.styleName.isEmpty() && styleName != other.styleName)
return styleName < other.styleName;
if (hintingPreference != other.hintingPreference) return hintingPreference < other.hintingPreference;
#ifdef Q_WS_X11
if (addStyle != other.addStyle) return addStyle < other.addStyle;
#endif // Q_WS_X11
if (ignorePitch != other.ignorePitch) return ignorePitch < other.ignorePitch;
if (fixedPitch != other.fixedPitch) return fixedPitch < other.fixedPitch;
return false;