Merge all stylesheet formats with the base format

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

diff --git a/src/uisupport/qssparser.h b/src/uisupport/qssparser.h
index bb64e21..c92b406 100644 (file)
--- 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; }
@@ -52,11 +52,11 @@ class QssParser {
     QGradientStops parseGradientStops(const QString &str);
 
     // Parse font-related properties
-    bool parseFont(const QString &str, QFont *font);
-    bool parseFontStyle(const QString &str, QFont *font);
-    bool parseFontWeight(const QString &str, QFont *font);
-    bool parseFontSize(const QString &str, QFont *font);
-    bool parseFontFamily(const QString &str, QFont *font);
+    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;