From 473a741c9fcf09febba312464fab8385e2351181 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 28 May 2019 13:49:26 +0200
Subject: 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>
---
 src/plugins/todo/cpptodoitemsscanner.cpp | 2 +-
 src/plugins/todo/todoitem.h              | 2 +-
 src/plugins/todo/todoitemsprovider.cpp   | 8 ++++----
 src/plugins/todo/todoitemsscanner.cpp    | 2 +-
 src/plugins/todo/todooutputpane.cpp      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/plugins/todo')

diff --git a/src/plugins/todo/cpptodoitemsscanner.cpp b/src/plugins/todo/cpptodoitemsscanner.cpp
index 46b6f3d9a79..938f7922fc3 100644
--- a/src/plugins/todo/cpptodoitemsscanner.cpp
+++ b/src/plugins/todo/cpptodoitemsscanner.cpp
@@ -60,7 +60,7 @@ void CppTodoItemsScanner::scannerParamsChanged()
     QSet<QString> filesToBeUpdated;
     foreach (const CppTools::ProjectInfo &info, modelManager->projectInfos())
         filesToBeUpdated.unite(Utils::transform(info.project().data()->files(ProjectExplorer::Project::SourceFiles),
-                                                &Utils::FileName::toString).toSet());
+                                                &Utils::FilePath::toString).toSet());
 
     modelManager->updateSourceFiles(filesToBeUpdated);
 }
diff --git a/src/plugins/todo/todoitem.h b/src/plugins/todo/todoitem.h
index be38f85ae7b..f44cf0b42c8 100644
--- a/src/plugins/todo/todoitem.h
+++ b/src/plugins/todo/todoitem.h
@@ -42,7 +42,7 @@ class TodoItem
 {
 public:
     QString text;
-    Utils::FileName file;
+    Utils::FilePath file;
     int line = -1;
     IconType iconType = IconType::Todo;
     QColor color;
diff --git a/src/plugins/todo/todoitemsprovider.cpp b/src/plugins/todo/todoitemsprovider.cpp
index 56de5e6bd51..ef2523c3469 100644
--- a/src/plugins/todo/todoitemsprovider.cpp
+++ b/src/plugins/todo/todoitemsprovider.cpp
@@ -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();
                 }
diff --git a/src/plugins/todo/todoitemsscanner.cpp b/src/plugins/todo/todoitemsscanner.cpp
index 9b3a25dbfa0..f9c57cccb7f 100644
--- a/src/plugins/todo/todoitemsscanner.cpp
+++ b/src/plugins/todo/todoitemsscanner.cpp
@@ -54,7 +54,7 @@ void TodoItemsScanner::processCommentLine(const QString &fileName, const QString
 
     for (int i = 0; i < newItemList.count(); ++i) {
         newItemList[i].line = lineNumber;
-        newItemList[i].file = Utils::FileName::fromString(fileName);
+        newItemList[i].file = Utils::FilePath::fromString(fileName);
     }
 
     outItemList << newItemList;
diff --git a/src/plugins/todo/todooutputpane.cpp b/src/plugins/todo/todooutputpane.cpp
index 13eccae4b9d..8abab12696d 100644
--- a/src/plugins/todo/todooutputpane.cpp
+++ b/src/plugins/todo/todooutputpane.cpp
@@ -176,7 +176,7 @@ void TodoOutputPane::todoTreeViewClicked(const QModelIndex &index)
 
     TodoItem item;
     item.text = index.sibling(row, Constants::OUTPUT_COLUMN_TEXT).data().toString();
-    item.file = Utils::FileName::fromUserInput(index.sibling(row, Constants::OUTPUT_COLUMN_FILE).data().toString());
+    item.file = Utils::FilePath::fromUserInput(index.sibling(row, Constants::OUTPUT_COLUMN_FILE).data().toString());
     item.line = index.sibling(row, Constants::OUTPUT_COLUMN_LINE).data().toInt();
     item.color = index.data(Qt::TextColorRole).value<QColor>();
     item.iconType = static_cast<IconType>(index.sibling(row, Constants::OUTPUT_COLUMN_TEXT)
-- 
cgit v1.2.3