Initially display the current color in KColorDialog

[quassel.git] / src / uisupport / uistyle.h

diff --git a/src/uisupport/uistyle.h b/src/uisupport/uistyle.h
index 928b07b..3342aa4 100644 (file)
--- a/src/uisupport/uistyle.h
+++ b/src/uisupport/uistyle.h
@@ -49,7 +49,7 @@ public:
    *         Also, we _do_ rely on certain properties of these values in styleString() and friends!
    */
   enum FormatType {
-    None            = 0x00000000,
+    Base            = 0x00000000,
     Invalid         = 0xffffffff,
 
     // Message Formats (mutually exclusive!)
@@ -105,7 +105,7 @@ public:
   class StyledMessage;
 
   static FormatType formatType(Message::Type msgType);
-  static StyledString styleString(const QString &string, quint32 baseFormat = None);
+  static StyledString styleString(const QString &string, quint32 baseFormat = Base);
   static QString mircToInternal(const QString &);
   static inline QString timestampFormatString() { return _timestampFormatString; }
 
@@ -113,6 +113,7 @@ public:
   QFontMetricsF *fontMetrics(quint32 formatType, quint32 messageLabel = 0);
 
   inline QFont defaultFont() const { return _defaultFont; }
+  inline QBrush markerLineBrush() const { return _markerLineBrush; }
 
   QList<QTextLayout::FormatRange> toTextLayoutList(const FormatList &, int textLength, quint32 messageLabel = 0);
 
@@ -138,6 +139,7 @@ protected:
 
 private:
   QFont _defaultFont;
+  QBrush _markerLineBrush;
   QHash<quint64, QTextCharFormat> _formatCache;
   QHash<quint64, QFontMetricsF *> _metricsCache;
   static QHash<QString, FormatType> _formatCodes;
@@ -153,8 +155,6 @@ public:
   QString decoratedSender() const;
   const QString &plainContents() const;
 
-  inline FormatType timestampFormat() const { return UiStyle::Timestamp; }
-  FormatType senderFormat() const;
   const FormatList &contentsFormatList() const;
 
   quint8 senderHash() const;