ClangSupport: Use simpler structures in some cases

The patch is mostly mechanical, but contains also a few spurious changes
from values references for some local variables, foreach -> ranged for
etc that I coulnd't resist.

Change-Id: I58f0bd972546895eb318607cbfbd7ac35caf3f23
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/plugins/clangcodemodel/clangdiagnosticfilter.cpp b/src/plugins/clangcodemodel/clangdiagnosticfilter.cpp
index 78126eea69..c6f27f3f99 100644
--- a/src/plugins/clangcodemodel/clangdiagnosticfilter.cpp
+++ b/src/plugins/clangcodemodel/clangdiagnosticfilter.cpp
@@ -53,7 +53,7 @@ bool isBlackListedHeaderDiagnostic(const ClangBackEnd::DiagnosticContainer &diag
         Utf8StringLiteral("warning: #include_next in primary source file")
     };
 
-    return isHeaderFile && blackList.contains(diagnostic.text());
+    return isHeaderFile && blackList.contains(diagnostic.text);
 }
 
 bool isBlackListedQtDiagnostic(const ClangBackEnd::DiagnosticContainer &diagnostic)
@@ -68,7 +68,7 @@ bool isBlackListedQtDiagnostic(const ClangBackEnd::DiagnosticContainer &diagnost
                           "'qt_metacall' overrides a member function but is not marked 'override'"),
     };
 
-    return blackList.contains(diagnostic.text());
+    return blackList.contains(diagnostic.text);
 }
 
 template <class Condition>
@@ -111,10 +111,10 @@ void ClangDiagnosticFilter::filterDocumentRelatedWarnings(
 
     const auto isLocalWarning = [this, isHeaderFile]
             (const ClangBackEnd::DiagnosticContainer &diagnostic) {
-        return isWarningOrNote(diagnostic.severity())
+        return isWarningOrNote(diagnostic.severity)
             && !isBlackListedHeaderDiagnostic(diagnostic, isHeaderFile)
             && !isBlackListedQtDiagnostic(diagnostic)
-            && diagnostic.location().filePath() == m_filePath;
+            && diagnostic.location.filePath == m_filePath;
     };
 
     m_warningDiagnostics = filterDiagnostics(diagnostics, isLocalWarning);
@@ -124,8 +124,8 @@ void ClangDiagnosticFilter::filterDocumentRelatedErrors(
         const QVector<ClangBackEnd::DiagnosticContainer> &diagnostics)
 {
     const auto isLocalWarning = [this] (const ClangBackEnd::DiagnosticContainer &diagnostic) {
-        return !isWarningOrNote(diagnostic.severity())
-            && diagnostic.location().filePath() == m_filePath;
+        return !isWarningOrNote(diagnostic.severity)
+            && diagnostic.location.filePath == m_filePath;
     };
 
     m_errorDiagnostics = filterDiagnostics(diagnostics, isLocalWarning);
@@ -134,7 +134,7 @@ void ClangDiagnosticFilter::filterDocumentRelatedErrors(
 void ClangDiagnosticFilter::filterFixits()
 {
     const auto hasFixIts = [] (const ClangBackEnd::DiagnosticContainer &diagnostic) {
-        return diagnostic.fixIts().size() > 0;
+        return diagnostic.fixIts.size() > 0;
     };
 
     m_fixItdiagnostics.clear();
@@ -142,9 +142,9 @@ void ClangDiagnosticFilter::filterFixits()
     filterDiagnostics(m_errorDiagnostics, hasFixIts, m_fixItdiagnostics);
 
     for (const auto &warningDiagnostic : m_warningDiagnostics)
-        filterDiagnostics(warningDiagnostic.children(), hasFixIts, m_fixItdiagnostics);
+        filterDiagnostics(warningDiagnostic.children, hasFixIts, m_fixItdiagnostics);
     for (const auto &warningDiagnostic : m_errorDiagnostics)
-        filterDiagnostics(warningDiagnostic.children(), hasFixIts, m_fixItdiagnostics);
+        filterDiagnostics(warningDiagnostic.children, hasFixIts, m_fixItdiagnostics);
 }
 
 ClangDiagnosticFilter::ClangDiagnosticFilter(const QString &filePath)