X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.h;h=7911dc7e95d658f655acfcb3ead3e6b06f3a95f8;hp=52ad81884a119e0988db733486bd7e39b326f622;hb=55049803e1f4215cedaa30935eae4ca2aa5835d2;hpb=9a13fa7b1e708d6349a414a36a3a19671e1abb9b diff --git a/src/uisupport/uistyle.h b/src/uisupport/uistyle.h index 52ad8188..7911dc7e 100644 --- a/src/uisupport/uistyle.h +++ b/src/uisupport/uistyle.h @@ -133,10 +133,10 @@ public: static QString mircToInternal(const QString &); static inline QString timestampFormatString() { return _timestampFormatString; } - QTextCharFormat format(quint32 formatType, quint32 messageLabel = 0); - QFontMetricsF *fontMetrics(quint32 formatType, quint32 messageLabel = 0); + QTextCharFormat format(quint32 formatType, quint32 messageLabel); + QFontMetricsF *fontMetrics(quint32 formatType, quint32 messageLabel); - QList toTextLayoutList(const FormatList &, int textLength, quint32 messageLabel = 0); + QList toTextLayoutList(const FormatList &, int textLength, quint32 messageLabel); inline const QBrush &brush(ColorRole role) const { return _uiStylePalette.at((int) role); } inline void setBrush(ColorRole role, const QBrush &brush) { _uiStylePalette[(int) role] = brush; } @@ -154,9 +154,9 @@ protected: void loadStyleSheet(); QString loadStyleSheet(const QString &name, bool shouldExist = false); - QTextCharFormat cachedFormat(quint64 key) const; - QTextCharFormat cachedFormat(quint32 formatType, quint32 messageLabel = 0) const; - void setCachedFormat(const QTextCharFormat &format, quint32 formatType, quint32 messageLabel = 0); + QTextCharFormat format(quint64 key) const; + QTextCharFormat cachedFormat(quint32 formatType, quint32 messageLabel) const; + void setCachedFormat(const QTextCharFormat &format, quint32 formatType, quint32 messageLabel); void mergeFormat(QTextCharFormat &format, quint32 formatType, quint64 messageLabel); void mergeSubElementFormat(QTextCharFormat &format, quint32 formatType, quint64 messageLabel); @@ -172,6 +172,7 @@ private slots: private: QVector _uiStylePalette; QBrush _markerLineBrush; + QHash _formats; QHash _formatCache; QHash _metricsCache; QHash _listItemFormats;