From f240a9a9478643491a0181c006f099c0d01985fe Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Tue, 23 Jul 2019 10:04:01 +0200 Subject: [PATCH] ClangTools: Add using for QList Change-Id: Ie7978fc33386d083b786ad75b3b6700125b11fec Reviewed-by: Cristian Adam Reviewed-by: Christian Stenger --- src/plugins/clangtools/clangtidyclazytool.cpp | 10 +++++----- src/plugins/clangtools/clangtidyclazytool.h | 10 +++++----- src/plugins/clangtools/clangtool.cpp | 2 +- src/plugins/clangtools/clangtool.h | 11 ++++++----- src/plugins/clangtools/clangtoolruncontrol.cpp | 8 ++++---- src/plugins/clangtools/clangtoolsdiagnostic.h | 2 ++ .../clangtools/clangtoolsdiagnosticmodel.cpp | 2 +- .../clangtools/clangtoolsdiagnosticmodel.h | 2 +- .../clangtools/clangtoolslogfilereader.cpp | 18 +++++++++--------- .../clangtools/clangtoolslogfilereader.h | 8 ++++---- 10 files changed, 38 insertions(+), 35 deletions(-) diff --git a/src/plugins/clangtools/clangtidyclazytool.cpp b/src/plugins/clangtools/clangtidyclazytool.cpp index ec743c97949..ded560bb490 100644 --- a/src/plugins/clangtools/clangtidyclazytool.cpp +++ b/src/plugins/clangtools/clangtidyclazytool.cpp @@ -463,15 +463,15 @@ void ClangTidyClazyTool::handleStateUpdate() Debugger::showPermanentStatusMessage(message); } -QList ClangTidyClazyTool::read(const QString &filePath, - const QSet &projectFiles, - const QString &logFilePath, - QString *errorMessage) const +Diagnostics ClangTidyClazyTool::read(const QString &filePath, + const QSet &projectFiles, + const QString &logFilePath, + QString *errorMessage) const { return readSerializedDiagnostics(filePath, projectFiles, logFilePath, errorMessage); } -void ClangTidyClazyTool::onNewDiagnosticsAvailable(const QList &diagnostics) +void ClangTidyClazyTool::onNewDiagnosticsAvailable(const Diagnostics &diagnostics) { ClangTool::onNewDiagnosticsAvailable(diagnostics); if (!m_diagnosticFilterModel->filterRegExp().pattern().isEmpty()) diff --git a/src/plugins/clangtools/clangtidyclazytool.h b/src/plugins/clangtools/clangtidyclazytool.h index 17832905389..bf4ae4fbca7 100644 --- a/src/plugins/clangtools/clangtidyclazytool.h +++ b/src/plugins/clangtools/clangtidyclazytool.h @@ -53,12 +53,12 @@ public: void startTool(bool askUserForFileSelection) final; - QList read(const QString &filePath, - const QSet &projectFiles, - const QString &logFilePath, - QString *errorMessage) const final; + Diagnostics read(const QString &filePath, + const QSet &projectFiles, + const QString &logFilePath, + QString *errorMessage) const final; - void onNewDiagnosticsAvailable(const QList &diagnostics) override; + void onNewDiagnosticsAvailable(const Diagnostics &diagnostics) override; private: void handleStateUpdate() final; diff --git a/src/plugins/clangtools/clangtool.cpp b/src/plugins/clangtools/clangtool.cpp index 10295ed28b1..570420cf5c6 100644 --- a/src/plugins/clangtools/clangtool.cpp +++ b/src/plugins/clangtools/clangtool.cpp @@ -144,7 +144,7 @@ QSet ClangTool::diagnostics() const }); } -void ClangTool::onNewDiagnosticsAvailable(const QList &diagnostics) +void ClangTool::onNewDiagnosticsAvailable(const Diagnostics &diagnostics) { QTC_ASSERT(m_diagnosticModel, return); m_diagnosticModel->addDiagnostics(diagnostics); diff --git a/src/plugins/clangtools/clangtool.h b/src/plugins/clangtools/clangtool.h index 1d94719759c..b23d80dc059 100644 --- a/src/plugins/clangtools/clangtool.h +++ b/src/plugins/clangtools/clangtool.h @@ -26,6 +26,7 @@ #pragma once #include "clangfileinfo.h" +#include "clangtoolsdiagnostic.h" #include #include @@ -49,10 +50,10 @@ public: virtual void startTool(bool askUserForFileSelection) = 0; - virtual QList read(const QString &filePath, - const QSet &projectFiles, - const QString &logFilePath, - QString *errorMessage) const = 0; + virtual Diagnostics read(const QString &filePath, + const QSet &projectFiles, + const QString &logFilePath, + QString *errorMessage) const = 0; FileInfos collectFileInfos(ProjectExplorer::Project *project, bool askUserForFileSelection) const; @@ -62,7 +63,7 @@ public: const QString &name() const; - virtual void onNewDiagnosticsAvailable(const QList &diagnostics); + virtual void onNewDiagnosticsAvailable(const Diagnostics &diagnostics); signals: void finished(bool success); // For testing. diff --git a/src/plugins/clangtools/clangtoolruncontrol.cpp b/src/plugins/clangtools/clangtoolruncontrol.cpp index cd76afe4a51..ccacbfa1da0 100644 --- a/src/plugins/clangtools/clangtoolruncontrol.cpp +++ b/src/plugins/clangtools/clangtoolruncontrol.cpp @@ -398,10 +398,10 @@ void ClangToolRunControl::onRunnerFinishedWithSuccess(const QString &filePath) qCDebug(LOG) << "onRunnerFinishedWithSuccess:" << logFilePath; QString errorMessage; - const QList diagnostics = tool()->read(filePath, - m_projectFiles, - logFilePath, - &errorMessage); + const Diagnostics diagnostics = tool()->read(filePath, + m_projectFiles, + logFilePath, + &errorMessage); QFile::remove(logFilePath); // Clean-up. if (!errorMessage.isEmpty()) { diff --git a/src/plugins/clangtools/clangtoolsdiagnostic.h b/src/plugins/clangtools/clangtoolsdiagnostic.h index b607c8e8bed..1d2db2ba0d7 100644 --- a/src/plugins/clangtools/clangtoolsdiagnostic.h +++ b/src/plugins/clangtools/clangtoolsdiagnostic.h @@ -62,6 +62,8 @@ public: bool hasFixits = false; }; +using Diagnostics = QList; + quint32 qHash(const Diagnostic &diagnostic); } // namespace Internal diff --git a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp index db6e9b4a6b3..6ac802d9734 100644 --- a/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp +++ b/src/plugins/clangtools/clangtoolsdiagnosticmodel.cpp @@ -99,7 +99,7 @@ QDebug operator<<(QDebug debug, const Diagnostic &d) ; } -void ClangToolsDiagnosticModel::addDiagnostics(const QList &diagnostics) +void ClangToolsDiagnosticModel::addDiagnostics(const Diagnostics &diagnostics) { const auto onFixitStatusChanged = [this](FixitStatus newStatus) { if (newStatus == FixitStatus::Scheduled) diff --git a/src/plugins/clangtools/clangtoolsdiagnosticmodel.h b/src/plugins/clangtools/clangtoolsdiagnosticmodel.h index e5a97fea290..3ac1df0d0c2 100644 --- a/src/plugins/clangtools/clangtoolsdiagnosticmodel.h +++ b/src/plugins/clangtools/clangtoolsdiagnosticmodel.h @@ -113,7 +113,7 @@ class ClangToolsDiagnosticModel : public ClangToolsDiagnosticModelBase public: ClangToolsDiagnosticModel(QObject *parent = nullptr); - void addDiagnostics(const QList &diagnostics); + void addDiagnostics(const Diagnostics &diagnostics); QSet diagnostics() const; enum ItemRole { diff --git a/src/plugins/clangtools/clangtoolslogfilereader.cpp b/src/plugins/clangtools/clangtoolslogfilereader.cpp index 76c38f44bec..32dd6576483 100644 --- a/src/plugins/clangtools/clangtoolslogfilereader.cpp +++ b/src/plugins/clangtools/clangtoolslogfilereader.cpp @@ -182,11 +182,11 @@ static Diagnostic buildDiagnostic(const CXDiagnostic cxDiagnostic, return diagnostic; } -static QList readSerializedDiagnostics_helper(const QString &filePath, - const QSet &projectFiles, - const QString &logFilePath) +static Diagnostics readSerializedDiagnostics_helper(const QString &filePath, + const QSet &projectFiles, + const QString &logFilePath) { - QList list; + Diagnostics list; CXLoadDiag_Error error; CXString errorString; @@ -231,13 +231,13 @@ static bool checkFilePath(const QString &filePath, QString *errorMessage) return true; } -QList readSerializedDiagnostics(const QString &filePath, - const QSet &projectFiles, - const QString &logFilePath, - QString *errorMessage) +Diagnostics readSerializedDiagnostics(const QString &filePath, + const QSet &projectFiles, + const QString &logFilePath, + QString *errorMessage) { if (!checkFilePath(logFilePath, errorMessage)) - return QList(); + return {}; return readSerializedDiagnostics_helper(filePath, projectFiles, logFilePath); } diff --git a/src/plugins/clangtools/clangtoolslogfilereader.h b/src/plugins/clangtools/clangtoolslogfilereader.h index de37c362b58..2b6ef5c589f 100644 --- a/src/plugins/clangtools/clangtoolslogfilereader.h +++ b/src/plugins/clangtools/clangtoolslogfilereader.h @@ -34,10 +34,10 @@ namespace Utils { class FilePath; } namespace ClangTools { namespace Internal { -QList readSerializedDiagnostics(const QString &filePath, - const QSet &projectFiles, - const QString &logFilePath, - QString *errorMessage); +Diagnostics readSerializedDiagnostics(const QString &filePath, + const QSet &projectFiles, + const QString &logFilePath, + QString *errorMessage); } // namespace Internal } // namespace ClangTools