[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.2/kdesdk/lokalize/src
From:       Nickolai Shaforostoff <shafff () ukr ! net>
Date:       2009-04-30 21:03:13
Message-ID: 1241125393.385865.5083.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 961876 by shaforo:

BUG: 191074
Hang when no accelerator marker set and catalog is opened
patch by Chusslove Illich 

thanks ;)



 M  +6 -7      syntaxhighlighter.cpp  


--- branches/KDE/4.2/kdesdk/lokalize/src/syntaxhighlighter.cpp #961875:961876
@@ -75,13 +75,12 @@
     rule.pattern = QRegExp("(&[A-Za-z_:][A-Za-z0-9_\\.:-]*;)");
     highlightingRules.append(rule);
 
-    rule.format.setForeground(Qt::darkMagenta);
-    rule.pattern = QRegExp(Project::instance()->accel());
-    //rule.pattern = QRegExp("&[^;]*;");
-/*    QString accelRx=Project::instance()->accel();
-    int pos=accelRx.indexOf('(')+1;
-    rule.pattern = QRegExp(  accelRx.mid( pos,accelRx.indexOf(')',pos)-1 )  );*/
-    highlightingRules.append(rule);
+    if (!Project::instance()->accel().isEmpty())
+    {
+        rule.format.setForeground(Qt::darkMagenta);
+        rule.pattern = QRegExp(Project::instance()->accel());
+        highlightingRules.append(rule);
+    }
 
     //\n \t \"
     rule.format.setForeground(Qt::darkGreen);
[prev in list] [next in list] [prev in thread] [next in thread]