diff options
| author | hjk <hjk@qt.io> | 2019-05-28 13:49:26 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-05-28 12:23:26 +0000 |
| commit | 473a741c9fcf09febba312464fab8385e2351181 (patch) | |
| tree | 2d328a090993cb5c5fd34b43e9468bcbf7e4d4d0 /src/plugins/cppcheck/cppcheckrunner.cpp | |
| parent | 4704f49fbb1201ebf10ab9dbaed0275ff25faba8 (diff) | |
| download | qt-creator-473a741c9fcf09febba312464fab8385e2351181.tar.gz | |
Utils: Rename FileName to FilePath
More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.
Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/cppcheck/cppcheckrunner.cpp')
| -rw-r--r-- | src/plugins/cppcheck/cppcheckrunner.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/cppcheck/cppcheckrunner.cpp b/src/plugins/cppcheck/cppcheckrunner.cpp index 55f7472ef6..9c3e72bddb 100644 --- a/src/plugins/cppcheck/cppcheckrunner.cpp +++ b/src/plugins/cppcheck/cppcheckrunner.cpp @@ -75,15 +75,15 @@ void CppcheckRunner::reconfigure(const QString &binary, const QString &arguments m_arguments = arguments; } -void CppcheckRunner::addToQueue(const Utils::FileNameList &files, +void CppcheckRunner::addToQueue(const Utils::FilePathList &files, const QString &additionalArguments) { - Utils::FileNameList &existing = m_queue[additionalArguments]; + Utils::FilePathList &existing = m_queue[additionalArguments]; if (existing.isEmpty()) { existing = files; } else { std::copy_if(files.cbegin(), files.cend(), std::back_inserter(existing), - [&existing](const Utils::FileName &file) { return !existing.contains(file); }); + [&existing](const Utils::FilePath &file) { return !existing.contains(file); }); } if (m_isRunning) { @@ -94,7 +94,7 @@ void CppcheckRunner::addToQueue(const Utils::FileNameList &files, m_queueTimer.start(); } -void CppcheckRunner::stop(const Utils::FileNameList &files) +void CppcheckRunner::stop(const Utils::FilePathList &files) { if (!m_isRunning) return; @@ -103,7 +103,7 @@ void CppcheckRunner::stop(const Utils::FileNameList &files) m_process->kill(); } -void CppcheckRunner::removeFromQueue(const Utils::FileNameList &files) +void CppcheckRunner::removeFromQueue(const Utils::FilePathList &files) { if (m_queue.isEmpty()) return; @@ -112,14 +112,14 @@ void CppcheckRunner::removeFromQueue(const Utils::FileNameList &files) m_queue.clear(); } else { for (auto it = m_queue.begin(), end = m_queue.end(); it != end;) { - for (const Utils::FileName &file : files) + for (const Utils::FilePath &file : files) it.value().removeOne(file); it = !it.value().isEmpty() ? ++it : m_queue.erase(it); } } } -const Utils::FileNameList &CppcheckRunner::currentFiles() const +const Utils::FilePathList &CppcheckRunner::currentFiles() const { return m_currentFiles; } @@ -135,7 +135,7 @@ void CppcheckRunner::checkQueued() if (m_queue.isEmpty() || m_binary.isEmpty()) return; - Utils::FileNameList files = m_queue.begin().value(); + Utils::FilePathList files = m_queue.begin().value(); QString arguments = m_arguments + ' ' + m_queue.begin().key(); m_currentFiles.clear(); int argumentsLength = arguments.length(); |
