X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fqssparser.cpp;h=f46147b34af186190b54957df44a6c43b557cd63;hp=91ecac5ab27cc8cd293ee57cb3e7aa3092626839;hb=5e4dd1ccc3277d871153ac3155b1d1443920f9b8;hpb=04c923c596fbde976b23979b92b0636635f97951

diff --git a/src/uisupport/qssparser.cpp b/src/uisupport/qssparser.cpp
index 91ecac5a..f46147b3 100644
--- a/src/uisupport/qssparser.cpp
+++ b/src/uisupport/qssparser.cpp
@@ -55,13 +55,17 @@ void QssParser::processStyleSheet(QString &ss) {
   if(ss.isEmpty())
     return;
 
-  // Now we have the stylesheet itself in ss, start parsing
+  // Remove C-style comments /* */ or //
+  QRegExp commentRx("(//.*(\\n|$)|/\\*.*\\*/)");
+  commentRx.setMinimal(true);
+  ss.remove(commentRx);
+
   // Palette definitions first, so we can apply roles later on
   QRegExp paletterx("(Palette[^{]*)\\{([^}]+)\\}");
   int pos = 0;
   while((pos = paletterx.indexIn(ss, pos)) >= 0) {
     parsePaletteData(paletterx.cap(1).trimmed(), paletterx.cap(2).trimmed());
-    pos += paletterx.matchedLength();
+    ss.remove(pos, paletterx.matchedLength());
   }
 
   // Now we can parse the rest of our custom blocks
@@ -75,9 +79,8 @@ void QssParser::processStyleSheet(QString &ss) {
     //else
     // TODO: add moar here
 
-    pos += blockrx.matchedLength();
+    ss.remove(pos, blockrx.matchedLength());
   }
-
 }
 
 void QssParser::parseChatLineData(const QString &decl, const QString &contents) {