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

8
src/plugins/todo/todoitemsprovider.cpp
View File

@@ -124,7 +124,7 @@ void TodoItemsProvider::setItemsListWithinStartupProject()
QHashIterator<QString, QList<TodoItem> > it(m_itemsHash);
const QSet<QString> fileNames
= QSet<QString>::fromList(Utils::transform(m_startupProject->files(Project::SourceFiles),
&Utils::FileName::toString));
&Utils::FilePath::toString));
QVariantMap settings = m_startupProject->namedSettings(Constants::SETTINGS_NAME_KEY).toMap();
@@ -154,7 +154,7 @@ void TodoItemsProvider::setItemsListWithinSubproject()
ProjectNode *projectNode = node->parentProjectNode();
if (projectNode) {
// FIXME: The name doesn't match the implementation that lists all files.
QSet<Utils::FileName> subprojectFileNames;
QSet<Utils::FilePath> subprojectFileNames;
projectNode->forEachGenericNode([&](Node *node) {
subprojectFileNames.insert(node->filePath());
});
@@ -162,11 +162,11 @@ void TodoItemsProvider::setItemsListWithinSubproject()
// files must be both in the current subproject and the startup-project.
const QSet<QString> fileNames
= QSet<QString>::fromList(Utils::transform(m_startupProject->files(Project::SourceFiles),
&Utils::FileName::toString));
&Utils::FilePath::toString));
QHashIterator<QString, QList<TodoItem> > it(m_itemsHash);
while (it.hasNext()) {
it.next();
if (subprojectFileNames.contains(Utils::FileName::fromString(it.key()))
if (subprojectFileNames.contains(Utils::FilePath::fromString(it.key()))
&& fileNames.contains(it.key())) {
m_itemsList << it.value();
}