From 85b45920fb1c83b6e9c9cc409fc90df0a83f668d Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Fri, 11 Oct 2019 09:16:12 +0200 Subject: [PATCH] Clang: Simplify regex patterns ...by removing pointless backslashes. '/' is not meta character, therefore escaping it with a backslash is not needed. Change-Id: Ic0bd1f85b3eed721cad67f4b4d616352ea9e098a Reviewed-by: Cristian Adam Reviewed-by: Nikolai Kosjar --- src/plugins/cpptools/headerpathfilter.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/cpptools/headerpathfilter.cpp b/src/plugins/cpptools/headerpathfilter.cpp index 6c2d57fc684..da200d0321b 100644 --- a/src/plugins/cpptools/headerpathfilter.cpp +++ b/src/plugins/cpptools/headerpathfilter.cpp @@ -123,14 +123,14 @@ QString clangIncludeDirectory(const QString &clangVersion, const QString &clangR HeaderPaths::iterator resourceIterator(HeaderPaths &headerPaths, bool isMacOs) { // include/c++, include/g++, libc++\include and libc++abi\include - static const QString cppIncludes = R"((.*\/include\/.*(g\+\+|c\+\+).*))" - R"(|(.*libc\+\+\/include))" - R"(|(.*libc\+\+abi\/include))"; + static const QString cppIncludes = R"((.*/include/.*(g\+\+|c\+\+).*))" + R"(|(.*libc\+\+/include))" + R"(|(.*libc\+\+abi/include))"; static const QRegularExpression includeRegExp("\\A(" + cppIncludes + ")\\z"); // The same as includeRegExp but also matches /usr/local/include static const QRegularExpression includeRegExpMac("\\A(" + cppIncludes - + R"(|(\/usr\/local\/include))" + ")\\z"); + + R"(|(/usr/local/include))" + ")\\z"); const QRegularExpression &includePathRegEx = isMacOs ? includeRegExpMac : includeRegExp; @@ -148,7 +148,7 @@ bool isClangSystemHeaderPath(const HeaderPath &headerPath) // For example GCC on macOS uses system clang include path which makes clang code model // include incorrect system headers. static const QRegularExpression clangIncludeDir( - R"(\A.*\/lib\d*\/clang\/\d+\.\d+(\.\d+)?\/include\z)"); + R"(\A.*/lib\d*/clang/\d+\.\d+(\.\d+)?/include\z)"); return clangIncludeDir.match(headerPath.path).hasMatch(); }