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/cppchecktool.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/cppchecktool.cpp')
| -rw-r--r-- | src/plugins/cppcheck/cppchecktool.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/cppcheck/cppchecktool.cpp b/src/plugins/cppcheck/cppchecktool.cpp index b13b089cee..0c95f30fbd 100644 --- a/src/plugins/cppcheck/cppchecktool.cpp +++ b/src/plugins/cppcheck/cppchecktool.cpp @@ -181,16 +181,16 @@ const CppcheckOptions &CppcheckTool::options() const return m_options; } -void CppcheckTool::check(const Utils::FileNameList &files) +void CppcheckTool::check(const Utils::FilePathList &files) { QTC_ASSERT(m_project, return); - Utils::FileNameList filtered; + Utils::FilePathList filtered; if (m_filters.isEmpty()) { filtered = files; } else { std::copy_if(files.cbegin(), files.cend(), std::back_inserter(filtered), - [this](const Utils::FileName &file) { + [this](const Utils::FilePath &file) { const QString stringed = file.toString(); const auto filter = [stringed](const QRegExp &re) {return re.exactMatch(stringed);}; return !Utils::contains(m_filters, filter); @@ -208,8 +208,8 @@ void CppcheckTool::check(const Utils::FileNameList &files) return; } - std::map<CppTools::ProjectPart::Ptr, Utils::FileNameList> groups; - for (const Utils::FileName &file : qAsConst(filtered)) { + std::map<CppTools::ProjectPart::Ptr, Utils::FilePathList> groups; + for (const Utils::FilePath &file : qAsConst(filtered)) { const QString stringed = file.toString(); for (const CppTools::ProjectPart::Ptr &part : parts) { using CppTools::ProjectFile; @@ -224,7 +224,7 @@ void CppcheckTool::check(const Utils::FileNameList &files) addToQueue(group.second, *group.first); } -void CppcheckTool::addToQueue(const Utils::FileNameList &files, CppTools::ProjectPart &part) +void CppcheckTool::addToQueue(const Utils::FilePathList &files, CppTools::ProjectPart &part) { const QString key = part.id(); if (!m_cachedAdditionalArguments.contains(key)) @@ -232,7 +232,7 @@ void CppcheckTool::addToQueue(const Utils::FileNameList &files, CppTools::Projec m_runner->addToQueue(files, m_cachedAdditionalArguments[key]); } -void CppcheckTool::stop(const Utils::FileNameList &files) +void CppcheckTool::stop(const Utils::FilePathList &files) { m_runner->removeFromQueue(files); m_runner->stop(files); @@ -299,7 +299,7 @@ void CppcheckTool::parseErrorLine(const QString &line) if (!match.hasMatch()) return; - const Utils::FileName fileName = Utils::FileName::fromUserInput(match.captured(File)); + const Utils::FilePath fileName = Utils::FilePath::fromUserInput(match.captured(File)); if (!m_runner->currentFiles().contains(fileName)) return; |
