Parse foreground and background for ChatLines

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

diff --git a/src/uisupport/qssparser.h b/src/uisupport/qssparser.h
index c5f86ee..9c4a69e 100644 (file)
--- a/src/uisupport/qssparser.h
+++ b/src/uisupport/qssparser.h
@@ -27,27 +27,12 @@ class QssParser {
   Q_DECLARE_TR_FUNCTIONS(QssParser)
 
   public:
-    enum Column {
-      Any,
-      Timestamp,
-      Sender,
-      Contents
-    };
-
-    struct ChatLineFormat {
-      QVector<QTextCharFormat> senderColors;
-      QVector<QTextCharFormat> mircColors;
-      QHash<UiStyle::FormatType, QTextCharFormat> formats;
-
-    };
-
     QssParser();
 
     void loadStyleSheet(const QString &sheet);
 
     inline QPalette palette() const { return _palette; }
-    ChatLineFormat basicFormat() const;
-    QHash<UiStyle::FormatType, ChatLineFormat> specialFormats() const;
+    inline const QHash<quint64, QTextCharFormat>& formats() const { return _formats; }
 
   protected:
     typedef QList<qreal> ColorTuple;
@@ -61,7 +46,7 @@ class QssParser {
     bool parsePalette(QPalette &, const QString &qss);
 
     // Parse basic data types
-    QBrush parseBrushValue(const QString &str);
+    QBrush parseBrushValue(const QString &str, bool *ok = 0);
     QColor parseColorValue(const QString &str);
     QFont parseFontValue(const QString &str);
 
@@ -73,8 +58,7 @@ class QssParser {
 
   private:
     QPalette _palette;
-    ChatLineFormat _basicFormat;
-    QHash<UiStyle::FormatType, ChatLineFormat> _specialFormats;
+    QHash<quint64, QTextCharFormat> _formats;
     int _maxSenderHash;
 };