QmlJS: improve static initializings

Change-Id: Ifa37c912d0e43bcda896cb0ea851f97566c88d78 Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2016-09-20 20:53:05 +02:00
parent 11abe3adcf
commit a9221a53d8
3 changed files with 42 additions and 50 deletions
--- a/src/plugins/qmljseditor/qmljshighlighter.cpp
+++ b/src/plugins/qmljseditor/qmljshighlighter.cpp
@@ -42,16 +42,10 @@ QmlJSHighlighter::QmlJSHighlighter(QTextDocument *parent)
      m_inMultilineComment(false)
 {
    m_currentBlockParentheses.reserve(20);
-    static QVector<TextStyle> categories;
-    if (categories.isEmpty()) {
-        categories << C_NUMBER
-                   << C_STRING
-                   << C_TYPE
-                   << C_KEYWORD
-                   << C_FIELD
-                   << C_COMMENT
-                   << C_VISUAL_WHITESPACE;
-    }
+    static const QVector<TextStyle> categories{
+        C_NUMBER, C_STRING, C_TYPE,
+        C_KEYWORD, C_FIELD, C_COMMENT,
+        C_VISUAL_WHITESPACE};
    setTextFormatCategories(categories);
 }