Clang: Fix build with GCC 5.3

Change-Id: I066c1c076c900e4eb3282e64b0b928327d15484d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

2 files changed, 85 insertions, 85 deletions

diff --git a/scripts/generateClazyChecks.py b/scripts/generateClazyChecks.py
index 373512de75..08034b1520 100755
--- a/scripts/generateClazyChecks.py
+++ b/scripts/generateClazyChecks.py
@@ -67,7 +67,7 @@ public:
     bool isValid() const { return !name.isEmpty() && level >= -1; }
 
     QString name;
-    int level = -1; // "Manual level"
+    int level; // "Manual level"
     QStringList topics;
 };
 using ClazyCheckInfos = std::vector<ClazyCheckInfo>;
@@ -102,9 +102,9 @@ def categories_as_initializer_string(check):
     return '{' + out + '}'
 
 def check_as_initializer_string(check):
-    return '{%s, %d, %s}' %(quoted(check['name']),
-                            check['level'],
-                            categories_as_initializer_string(check))
+    return '{QString(%s), %d, %s}' %(quoted(check['name']),
+                                     check['level'],
+                                     categories_as_initializer_string(check))
 
 def checks_as_initializer_string(checks):
     out = ''
diff --git a/src/plugins/cpptools/cpptools_clazychecks.h b/src/plugins/cpptools/cpptools_clazychecks.h
index 1c60e4f893..e95b20ce70 100644
--- a/src/plugins/cpptools/cpptools_clazychecks.h
+++ b/src/plugins/cpptools/cpptools_clazychecks.h
@@ -36,7 +36,7 @@ public:
     bool isValid() const { return !name.isEmpty() && level >= -1; }
 
     QString name;
-    int level = -1; // "Manual level"
+    int level; // "Manual level"
     QStringList topics;
 };
 using ClazyCheckInfos = std::vector<ClazyCheckInfo>;
@@ -44,86 +44,86 @@ using ClazyCheckInfos = std::vector<ClazyCheckInfo>;
 // CLANG-UPGRADE-CHECK: Run 'scripts/generateClazyChecks.py' after Clang upgrade to
 // update this header.
 static const ClazyCheckInfos CLAZY_CHECKS = {
-    {"qt-keywords", -1, {}},
-    {"ifndef-define-typo", -1, {"bug"}},
-    {"inefficient-qlist", -1, {"containers","performance"}},
-    {"isempty-vs-count", -1, {"readability"}},
-    {"qrequiredresult-candidates", -1, {"bug"}},
-    {"qstring-varargs", -1, {"bug"}},
-    {"qt4-qstring-from-array", -1, {"qt4","qstring"}},
-    {"tr-non-literal", -1, {"bug"}},
-    {"raw-environment-function", -1, {"bug"}},
-    {"container-inside-loop", -1, {"containers","performance"}},
-    {"qhash-with-char-pointer-key", -1, {"cpp","bug"}},
-    {"connect-by-name", 0, {"bug","readability"}},
-    {"connect-non-signal", 0, {"bug"}},
-    {"wrong-qevent-cast", 0, {"bug"}},
-    {"lambda-in-connect", 0, {"bug"}},
-    {"lambda-unique-connection", 0, {"bug"}},
-    {"qdatetime-utc", 0, {"performance"}},
-    {"qgetenv", 0, {"performance"}},
-    {"qstring-insensitive-allocation", 0, {"performance","qstring"}},
-    {"fully-qualified-moc-types", 0, {"bug","qml"}},
-    {"qvariant-template-instantiation", 0, {"performance"}},
-    {"unused-non-trivial-variable", 0, {"readability"}},
-    {"connect-not-normalized", 0, {"performance"}},
-    {"mutable-container-key", 0, {"containers","bug"}},
-    {"qenums", 0, {"deprecation"}},
-    {"qmap-with-pointer-key", 0, {"containers","performance"}},
-    {"qstring-ref", 0, {"performance","qstring"}},
-    {"strict-iterators", 0, {"containers","performance","bug"}},
-    {"writing-to-temporary", 0, {"bug"}},
-    {"container-anti-pattern", 0, {"containers","performance"}},
-    {"qcolor-from-literal", 0, {"performance"}},
-    {"qfileinfo-exists", 0, {"performance"}},
-    {"qstring-arg", 0, {"performance","qstring"}},
-    {"empty-qstringliteral", 0, {"performance"}},
-    {"qt-macros", 0, {"bug"}},
-    {"temporary-iterator", 0, {"containers","bug"}},
-    {"wrong-qglobalstatic", 0, {"performance"}},
-    {"lowercase-qml-type-name", 0, {"qml","bug"}},
-    {"auto-unexpected-qstringbuilder", 1, {"bug","qstring"}},
-    {"connect-3arg-lambda", 1, {"bug"}},
-    {"const-signal-or-slot", 1, {"readability","bug"}},
-    {"detaching-temporary", 1, {"containers","performance"}},
-    {"foreach", 1, {"containers","performance"}},
-    {"incorrect-emit", 1, {"readability"}},
-    {"inefficient-qlist-soft", 1, {"containers","performance"}},
-    {"install-event-filter", 1, {"bug"}},
-    {"non-pod-global-static", 1, {"performance"}},
-    {"post-event", 1, {"bug"}},
-    {"qdeleteall", 1, {"containers","performance"}},
-    {"qlatin1string-non-ascii", 1, {"bug","qstring"}},
-    {"qproperty-without-notify", 1, {"bug"}},
-    {"qstring-left", 1, {"bug","performance","qstring"}},
-    {"range-loop", 1, {"containers","performance"}},
-    {"returning-data-from-temporary", 1, {"bug"}},
-    {"rule-of-two-soft", 1, {"cpp","bug"}},
-    {"child-event-qobject-cast", 1, {"bug"}},
-    {"virtual-signal", 1, {"bug","readability"}},
-    {"overridden-signal", 1, {"bug","readability"}},
-    {"qhash-namespace", 1, {"bug"}},
-    {"skipped-base-method", 1, {"bug","cpp"}},
-    {"unneeded-cast", 3, {"cpp","readability"}},
-    {"ctor-missing-parent-argument", 2, {"bug"}},
-    {"base-class-event", 2, {"bug"}},
-    {"copyable-polymorphic", 2, {"cpp","bug"}},
-    {"function-args-by-ref", 2, {"cpp","performance"}},
-    {"function-args-by-value", 2, {"cpp","performance"}},
-    {"global-const-char-pointer", 2, {"cpp","performance"}},
-    {"implicit-casts", 2, {"cpp","bug"}},
-    {"missing-qobject-macro", 2, {"bug"}},
-    {"missing-typeinfo", 2, {"containers","performance"}},
-    {"old-style-connect", 2, {"performance"}},
-    {"qstring-allocations", 2, {"performance","qstring"}},
-    {"returning-void-expression", 2, {"readability","cpp"}},
-    {"rule-of-three", 2, {"cpp","bug"}},
-    {"virtual-call-ctor", 2, {"cpp","bug"}},
-    {"static-pmf", 2, {"bug"}},
-    {"assert-with-side-effects", 3, {"bug"}},
-    {"detaching-member", 3, {"containers","performance"}},
-    {"thread-with-slots", 3, {"bug"}},
-    {"reserve-candidates", 3, {"containers"}}
+    {QString("qt-keywords"), -1, {}},
+    {QString("ifndef-define-typo"), -1, {"bug"}},
+    {QString("inefficient-qlist"), -1, {"containers","performance"}},
+    {QString("isempty-vs-count"), -1, {"readability"}},
+    {QString("qrequiredresult-candidates"), -1, {"bug"}},
+    {QString("qstring-varargs"), -1, {"bug"}},
+    {QString("qt4-qstring-from-array"), -1, {"qt4","qstring"}},
+    {QString("tr-non-literal"), -1, {"bug"}},
+    {QString("raw-environment-function"), -1, {"bug"}},
+    {QString("container-inside-loop"), -1, {"containers","performance"}},
+    {QString("qhash-with-char-pointer-key"), -1, {"cpp","bug"}},
+    {QString("connect-by-name"), 0, {"bug","readability"}},
+    {QString("connect-non-signal"), 0, {"bug"}},
+    {QString("wrong-qevent-cast"), 0, {"bug"}},
+    {QString("lambda-in-connect"), 0, {"bug"}},
+    {QString("lambda-unique-connection"), 0, {"bug"}},
+    {QString("qdatetime-utc"), 0, {"performance"}},
+    {QString("qgetenv"), 0, {"performance"}},
+    {QString("qstring-insensitive-allocation"), 0, {"performance","qstring"}},
+    {QString("fully-qualified-moc-types"), 0, {"bug","qml"}},
+    {QString("qvariant-template-instantiation"), 0, {"performance"}},
+    {QString("unused-non-trivial-variable"), 0, {"readability"}},
+    {QString("connect-not-normalized"), 0, {"performance"}},
+    {QString("mutable-container-key"), 0, {"containers","bug"}},
+    {QString("qenums"), 0, {"deprecation"}},
+    {QString("qmap-with-pointer-key"), 0, {"containers","performance"}},
+    {QString("qstring-ref"), 0, {"performance","qstring"}},
+    {QString("strict-iterators"), 0, {"containers","performance","bug"}},
+    {QString("writing-to-temporary"), 0, {"bug"}},
+    {QString("container-anti-pattern"), 0, {"containers","performance"}},
+    {QString("qcolor-from-literal"), 0, {"performance"}},
+    {QString("qfileinfo-exists"), 0, {"performance"}},
+    {QString("qstring-arg"), 0, {"performance","qstring"}},
+    {QString("empty-qstringliteral"), 0, {"performance"}},
+    {QString("qt-macros"), 0, {"bug"}},
+    {QString("temporary-iterator"), 0, {"containers","bug"}},
+    {QString("wrong-qglobalstatic"), 0, {"performance"}},
+    {QString("lowercase-qml-type-name"), 0, {"qml","bug"}},
+    {QString("auto-unexpected-qstringbuilder"), 1, {"bug","qstring"}},
+    {QString("connect-3arg-lambda"), 1, {"bug"}},
+    {QString("const-signal-or-slot"), 1, {"readability","bug"}},
+    {QString("detaching-temporary"), 1, {"containers","performance"}},
+    {QString("foreach"), 1, {"containers","performance"}},
+    {QString("incorrect-emit"), 1, {"readability"}},
+    {QString("inefficient-qlist-soft"), 1, {"containers","performance"}},
+    {QString("install-event-filter"), 1, {"bug"}},
+    {QString("non-pod-global-static"), 1, {"performance"}},
+    {QString("post-event"), 1, {"bug"}},
+    {QString("qdeleteall"), 1, {"containers","performance"}},
+    {QString("qlatin1string-non-ascii"), 1, {"bug","qstring"}},
+    {QString("qproperty-without-notify"), 1, {"bug"}},
+    {QString("qstring-left"), 1, {"bug","performance","qstring"}},
+    {QString("range-loop"), 1, {"containers","performance"}},
+    {QString("returning-data-from-temporary"), 1, {"bug"}},
+    {QString("rule-of-two-soft"), 1, {"cpp","bug"}},
+    {QString("child-event-qobject-cast"), 1, {"bug"}},
+    {QString("virtual-signal"), 1, {"bug","readability"}},
+    {QString("overridden-signal"), 1, {"bug","readability"}},
+    {QString("qhash-namespace"), 1, {"bug"}},
+    {QString("skipped-base-method"), 1, {"bug","cpp"}},
+    {QString("unneeded-cast"), 3, {"cpp","readability"}},
+    {QString("ctor-missing-parent-argument"), 2, {"bug"}},
+    {QString("base-class-event"), 2, {"bug"}},
+    {QString("copyable-polymorphic"), 2, {"cpp","bug"}},
+    {QString("function-args-by-ref"), 2, {"cpp","performance"}},
+    {QString("function-args-by-value"), 2, {"cpp","performance"}},
+    {QString("global-const-char-pointer"), 2, {"cpp","performance"}},
+    {QString("implicit-casts"), 2, {"cpp","bug"}},
+    {QString("missing-qobject-macro"), 2, {"bug"}},
+    {QString("missing-typeinfo"), 2, {"containers","performance"}},
+    {QString("old-style-connect"), 2, {"performance"}},
+    {QString("qstring-allocations"), 2, {"performance","qstring"}},
+    {QString("returning-void-expression"), 2, {"readability","cpp"}},
+    {QString("rule-of-three"), 2, {"cpp","bug"}},
+    {QString("virtual-call-ctor"), 2, {"cpp","bug"}},
+    {QString("static-pmf"), 2, {"bug"}},
+    {QString("assert-with-side-effects"), 3, {"bug"}},
+    {QString("detaching-member"), 3, {"containers","performance"}},
+    {QString("thread-with-slots"), 3, {"bug"}},
+    {QString("reserve-candidates"), 3, {"containers"}}
 };
 
 } // namespace Constants