feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Rename FileName to FilePath

Browse Source 
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>
This commit is contained in:
hjk
2019-05-28 13:49:26 +02:00
parent 4704f49fbb
commit 473a741c9f
688 changed files with 3487 additions and 3484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/cppcheck/cppcheckrunner.cpp
View File

@@ -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();