X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fqssparser.h;h=c92b4060950b8d22e13e7168bad24fea795a7d58;hb=c639f2b13b485c0d158ee3857742eaf4d1fa4760;hp=1dc9e744b617ab53fa810f702110e0fc0c13fcfe;hpb=7bd2084db21a5203fe6119d3eb8857aa11c80aa7;p=quassel.git

diff --git a/src/uisupport/qssparser.h b/src/uisupport/qssparser.h
index 1dc9e744..c92b4060 100644
--- a/src/uisupport/qssparser.h
+++ b/src/uisupport/qssparser.h
@@ -29,7 +29,7 @@ class QssParser {
   public:
     QssParser();
 
-    void loadStyleSheet(const QString &sheet);
+    void processStyleSheet(QString &sheet);
 
     inline QPalette palette() const { return _palette; }
     inline const QHash<quint64, QTextCharFormat>& formats() const { return _formats; }
@@ -45,15 +45,19 @@ class QssParser {
     QTextCharFormat parseFormat(const QString &qss);
     bool parsePalette(QPalette &, const QString &qss);
 
-    // Parse basic data types
-    QBrush parseBrushValue(const QString &str);
-    QColor parseColorValue(const QString &str);
-    QFont parseFontValue(const QString &str);
-
-    // Parse subelements
+    // Parse color/brush-related properties
+    QBrush parseBrush(const QString &str, bool *ok = 0);
+    QColor parseColor(const QString &str);
     ColorTuple parseColorTuple(const QString &str);
     QGradientStops parseGradientStops(const QString &str);
 
+    // Parse font-related properties
+    void parseFont(const QString &str, QTextCharFormat *format);
+    void parseFontStyle(const QString &str, QTextCharFormat *format);
+    void parseFontWeight(const QString &str, QTextCharFormat *format);
+    void parseFontSize(const QString &str, QTextCharFormat *format);
+    void parseFontFamily(const QString &str, QTextCharFormat *format);
+
     QHash<QString, QPalette::ColorRole> _paletteColorRoles;
 
   private: