From e4dec0484c7becbeaeeda3d473bfe2f24dc52e94 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Mon, 31 Aug 2020 14:43:17 +0200 Subject: [PATCH] ClangTools: Remove useless member FixitsRefactoringFile::m_filePath Change-Id: I686eddeea7c52096175c3b2fe1a519e8fbf2c876 Reviewed-by: Christian Stenger --- src/plugins/clangtools/clangfixitsrefactoringchanges.cpp | 4 ---- src/plugins/clangtools/clangfixitsrefactoringchanges.h | 3 --- src/plugins/clangtools/clangtool.cpp | 4 ---- 3 files changed, 11 deletions(-) diff --git a/src/plugins/clangtools/clangfixitsrefactoringchanges.cpp b/src/plugins/clangtools/clangfixitsrefactoringchanges.cpp index c6908565a3f..98d26069b78 100644 --- a/src/plugins/clangtools/clangfixitsrefactoringchanges.cpp +++ b/src/plugins/clangtools/clangfixitsrefactoringchanges.cpp @@ -75,13 +75,9 @@ static QDebug operator<<(QDebug debug, const ReplacementOperation &op) bool FixitsRefactoringFile::apply() { - qCDebug(fixitsLog) << "Applying fixits for" << m_filePath; - if (m_replacementOperations.isEmpty()) return false; // Error nothing to apply TODO: Is this correct to return? - QTC_ASSERT(!m_filePath.isEmpty(), return false); - ICodeStylePreferencesFactory *factory = TextEditorSettings::codeStyleFactory( CppTools::Constants::CPP_SETTINGS_ID); diff --git a/src/plugins/clangtools/clangfixitsrefactoringchanges.h b/src/plugins/clangtools/clangfixitsrefactoringchanges.h index e4692b22cc7..951e2a0fc86 100644 --- a/src/plugins/clangtools/clangfixitsrefactoringchanges.h +++ b/src/plugins/clangtools/clangfixitsrefactoringchanges.h @@ -54,10 +54,8 @@ class FixitsRefactoringFile { public: FixitsRefactoringFile() = default; - FixitsRefactoringFile(const QString &filePath) : m_filePath(filePath) {} ~FixitsRefactoringFile() { qDeleteAll(m_documents); } - bool isValid() const { return !m_filePath.isEmpty(); } int position(const QString &filePath, unsigned line, unsigned column) const; void setReplacements(const ReplacementOperations &ops) { m_replacementOperations = ops; } @@ -78,7 +76,6 @@ private: const Utils::Text::Replacements &replacements, int startIndex) const; - QString m_filePath; mutable Utils::TextFileFormat m_textFileFormat; mutable QHash m_documents; ReplacementOperations m_replacementOperations; // Not owned. diff --git a/src/plugins/clangtools/clangtool.cpp b/src/plugins/clangtools/clangtool.cpp index fde54fe1300..3c4227fd538 100644 --- a/src/plugins/clangtools/clangtool.cpp +++ b/src/plugins/clangtools/clangtool.cpp @@ -200,8 +200,6 @@ public: class RefactoringFileInfo { public: - bool isValid() const { return file.isValid(); } - FixitsRefactoringFile file; QVector diagnosticItems; bool hasScheduledFixits = false; @@ -215,8 +213,6 @@ public: // Get or create refactoring file RefactoringFileInfo &fileInfo = m_refactoringFileInfos[filePath]; - if (!fileInfo.isValid()) - fileInfo.file = FixitsRefactoringFile(filePath); // Append item fileInfo.diagnosticItems += diagnosticItem;