Clang: Fix build with clang-8

Clang-Tidy checks and Clazy flags updated.
CLANG-UPGRADE-CHECK done.

Change-Id: I1ca585c5c3c77a7f183719df9c262603150914e8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>

5 files changed, 89 insertions, 17 deletions

diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
index 706c5101a3..8fd2508315 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
@@ -527,14 +527,14 @@ private:
             return;
 
         m_options.append(CppTools::XclangArgs({"-add-plugin",
-                                               "clang-lazy",
-                                               "-plugin-arg-clang-lazy",
+                                               "clazy",
+                                               "-plugin-arg-clazy",
                                                "enable-all-fixits",
-                                               "-plugin-arg-clang-lazy",
+                                               "-plugin-arg-clazy",
                                                "no-autowrite-fixits",
-                                               "-plugin-arg-clang-lazy",
+                                               "-plugin-arg-clazy",
                                                checks,
-                                               "-plugin-arg-clang-lazy",
+                                               "-plugin-arg-clazy",
                                                "ignore-included-files"}));
     }
 
diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp
index a580704243..2bb0caf3aa 100644
--- a/src/plugins/clangtools/clangtidyclazyrunner.cpp
+++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp
@@ -86,12 +86,12 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis
     const QString clazyChecks = m_diagnosticConfig.clazyChecks();
     if (!clazyChecks.isEmpty()) {
         arguments << XclangArgs({"-add-plugin",
-                                 "clang-lazy",
-                                 "-plugin-arg-clang-lazy",
+                                 "clazy",
+                                 "-plugin-arg-clazy",
                                  "enable-all-fixits",
-                                 "-plugin-arg-clang-lazy",
+                                 "-plugin-arg-clazy",
                                  "no-autowrite-fixits",
-                                 "-plugin-arg-clang-lazy",
+                                 "-plugin-arg-clazy",
                                  m_diagnosticConfig.clazyChecks()});
     }
 
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp
index a1e01911d6..7d12b33f05 100644
--- a/src/plugins/cpptools/compileroptionsbuilder.cpp
+++ b/src/plugins/cpptools/compileroptionsbuilder.cpp
@@ -524,6 +524,7 @@ static QStringList languageFeatureMacros()
         "__cpp_guaranteed_copy_elision",
         "__cpp_hex_float",
         "__cpp_if_constexpr",
+        "__cpp_impl_destroying_delete",
         "__cpp_inheriting_constructors",
         "__cpp_init_captures",
         "__cpp_initializer_lists",
diff --git a/src/plugins/cpptools/cpptools_clangtidychecks.h b/src/plugins/cpptools/cpptools_clangtidychecks.h
index 20dcbdf120..813e9b9ed5 100644
--- a/src/plugins/cpptools/cpptools_clangtidychecks.h
+++ b/src/plugins/cpptools/cpptools_clangtidychecks.h
@@ -50,7 +50,33 @@ static const TidyNode CLANG_TIDY_CHECKS_ROOT
         {
             "android-",
             {
+                {
+                    "uration-",
+                    {
+                        "comparison",
+                        "division",
+                        {
+                            "factory-",
+                            {
+                                "float",
+                                "scale"
+                            }
+                        },
+                        "subtraction"
+                    }
+                },
+                "aster-strsplit-delimiter",
+                {
+                    "o-",
+                    {
+                        "internal-dependencies",
+                        "namespace"
+                    }
+                },
+                "edundant-strcat-calls",
+                "tr-cat-append",
                 "tring-find-startswith",
+                "pgrade-duration-conversions",
                 {
                     "cloexec-",
                     {
@@ -149,6 +175,7 @@ static const TidyNode CLANG_TIDY_CHECKS_ROOT
                 "swapped-arguments",
                 "terminating-continue",
                 "throw-keyword-missing",
+                "too-small-loop-variable",
                 "undefined-memory-manipulation",
                 "undelegated-constructor",
                 {
@@ -166,6 +193,7 @@ static const TidyNode CLANG_TIDY_CHECKS_ROOT
             "cert-",
             {
                 "dcl03-c",
+                "dcl16-c",
                 "dcl21-cpp",
                 "dcl50-cpp",
                 "dcl54-cpp",
@@ -193,6 +221,7 @@ static const TidyNode CLANG_TIDY_CHECKS_ROOT
                 {
                     "apiModeling.",
                     {
+                        "StdCLibraryFunctions",
                         "TrustNonnull",
                         "google.GTest"
                     }
@@ -232,13 +261,13 @@ static const TidyNode CLANG_TIDY_CHECKS_ROOT
                     "cplusplus.",
                     {
                         "InnerPointer",
+                        "Move",
                         "NewDelete",
                         "NewDeleteLeaks",
                         "SelfAssignment"
                     }
                 },
                 "deadcode.DeadStores",
-                "llvm.Conventions",
                 {
                     "nullability.",
                     {
@@ -286,6 +315,7 @@ static const TidyNode CLANG_TIDY_CHECKS_ROOT
                     {
                         "API",
                         "NumberObjectConversion",
+                        "OSObjectRetainCount",
                         "ObjCProperty",
                         "SecKeychainAPI",
                         {
@@ -357,7 +387,6 @@ static const TidyNode CLANG_TIDY_CHECKS_ROOT
                         "Malloc",
                         "MallocSizeof",
                         "MismatchedDeallocator",
-                        "StdCLibraryFunctions",
                         "Vfork",
                         {
                             "cstring.",
@@ -381,11 +410,20 @@ static const TidyNode CLANG_TIDY_CHECKS_ROOT
         {
             "cppcoreguidelines-",
             {
-                "avoid-goto",
+                {
+                    "avoid-",
+                    {
+                        "c-arrays",
+                        "goto",
+                        "magic-numbers"
+                    }
+                },
                 "c-copy-assignment-signature",
                 "interfaces-global-init",
+                "macro-usage",
                 "narrowing-conversions",
                 "no-malloc",
+                "non-private-member-variables-in-classes",
                 "owning-memory",
                 {
                     "pro-",
@@ -447,6 +485,7 @@ static const TidyNode CLANG_TIDY_CHECKS_ROOT
                     "objc-",
                     {
                         "avoid-throwing-exception",
+                        "function-naming",
                         "global-variable-declaration"
                     }
                 },
@@ -473,7 +512,13 @@ static const TidyNode CLANG_TIDY_CHECKS_ROOT
         {
             "hicpp-",
             {
-                "avoid-goto",
+                {
+                    "avoid-",
+                    {
+                        "c-arrays",
+                        "goto"
+                    }
+                },
                 "braces-around-statements",
                 "deprecated-headers",
                 "exception-baseclass",
@@ -498,6 +543,7 @@ static const TidyNode CLANG_TIDY_CHECKS_ROOT
                 "special-member-functions",
                 "static-assert",
                 "undelegated-constructor",
+                "uppercase-literal-suffix",
                 {
                     "use-",
                     {
@@ -533,7 +579,13 @@ static const TidyNode CLANG_TIDY_CHECKS_ROOT
                 "definitions-in-headers",
                 "misplaced-const",
                 "new-delete-overloads",
-                "non-copyable-objects",
+                {
+                    "non-",
+                    {
+                        "copyable-objects",
+                        "private-member-variables-in-classes"
+                    }
+                },
                 "redundant-expression",
                 "static-assert",
                 "throw-by-value-catch-by-reference",
@@ -552,8 +604,21 @@ static const TidyNode CLANG_TIDY_CHECKS_ROOT
         {
             "modernize-",
             {
-                "avoid-bind",
-                "deprecated-headers",
+                {
+                    "avoid-",
+                    {
+                        "bind",
+                        "c-arrays"
+                    }
+                },
+                "concat-nested-namespaces",
+                {
+                    "deprecated-",
+                    {
+                        "headers",
+                        "ios-base-aliases"
+                    }
+                },
                 "loop-convert",
                 {
                     "make-",
@@ -589,6 +654,7 @@ static const TidyNode CLANG_TIDY_CHECKS_ROOT
                                 "delete"
                             }
                         },
+                        "nodiscard",
                         "noexcept",
                         "nullptr",
                         "override",
@@ -658,6 +724,7 @@ static const TidyNode CLANG_TIDY_CHECKS_ROOT
             {
                 "avoid-const-params-in-decls",
                 "braces-around-statements",
+                "const-return-type",
                 "container-size-empty",
                 "delete-null-pointer",
                 "deleted-default",
@@ -666,6 +733,8 @@ static const TidyNode CLANG_TIDY_CHECKS_ROOT
                 "identifier-naming",
                 "implicit-bool-conversion",
                 "inconsistent-declaration-parameter-name",
+                "isolate-declaration",
+                "magic-numbers",
                 "misleading-indentation",
                 "misplaced-array-index",
                 "named-parameter",
@@ -677,6 +746,7 @@ static const TidyNode CLANG_TIDY_CHECKS_ROOT
                         "declaration",
                         "function-ptr-dereference",
                         "member-init",
+                        "preprocessor",
                         "smartptr-get",
                         {
                             "string-",
@@ -703,6 +773,7 @@ static const TidyNode CLANG_TIDY_CHECKS_ROOT
                 },
                 "string-compare",
                 "uniqueptr-delete-release",
+                "uppercase-literal-suffix",
                 "rary-objects"
             }
         }
diff --git a/src/plugins/cpptools/cpptoolsconstants.h b/src/plugins/cpptools/cpptoolsconstants.h
index 2e1aebfd43..8490f2ccf5 100644
--- a/src/plugins/cpptools/cpptoolsconstants.h
+++ b/src/plugins/cpptools/cpptoolsconstants.h
@@ -100,7 +100,7 @@ const char SYMBOLS_FIND_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("CppTools", "C
 // CLANG_VERSION here because it might denote a version that was not yet
 // released (e.g. 6.0.1, but only 6.0.0 was released).
 constexpr const char TIDY_DOCUMENTATION_URL_TEMPLATE[]
-    = "https://releases.llvm.org/7.0.0/tools/clang/tools/extra/docs/clang-tidy/checks/%1.html";
+    = "https://releases.llvm.org/8.0.0/tools/clang/tools/extra/docs/clang-tidy/checks/%1.html";
 
 constexpr const char CLAZY_DOCUMENTATION_URL_TEMPLATE[]
     = "https://github.com/KDE/clazy/blob/master/docs/checks/README-%1.md";