improve static initializers

Change-Id: I304fdd6627f01fc216c84930da607127c52409d9 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-09-23 15:46:41 +02:00
parent 669d04a686
commit d915b22db9
15 changed files with 119 additions and 146 deletions
--- a/src/plugins/cppeditor/cpphighlighter.cpp
+++ b/src/plugins/cppeditor/cpphighlighter.cpp
@@ -42,21 +42,20 @@ using namespace CPlusPlus;
 CppHighlighter::CppHighlighter(QTextDocument *document) :
    SyntaxHighlighter(document)
 {
-    static QVector<TextStyle> categories;
-    if (categories.isEmpty()) {
-        categories << C_NUMBER
-                   << C_STRING
-                   << C_TYPE
-                   << C_KEYWORD
-                   << C_PRIMITIVE_TYPE
-                   << C_OPERATOR
-                   << C_PREPROCESSOR
-                   << C_LABEL
-                   << C_COMMENT
-                   << C_DOXYGEN_COMMENT
-                   << C_DOXYGEN_TAG
-                   << C_VISUAL_WHITESPACE;
-    }
+    static const QVector<TextStyle> categories({
+        C_NUMBER,
+        C_STRING,
+        C_TYPE,
+        C_KEYWORD,
+        C_PRIMITIVE_TYPE,
+        C_OPERATOR,
+        C_PREPROCESSOR,
+        C_LABEL,
+        C_COMMENT,
+        C_DOXYGEN_COMMENT,
+        C_DOXYGEN_TAG,
+        C_VISUAL_WHITESPACE
+    });
    setTextFormatCategories(categories);
 }