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/tasklist/taskfile.cpp       |  2 +-
 src/plugins/tasklist/taskfile.h         |  2 +-
 src/plugins/tasklist/tasklistplugin.cpp | 14 +++++++-------
 src/plugins/tasklist/tasklistplugin.h   |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/plugins/tasklist')

diff --git a/src/plugins/tasklist/taskfile.cpp b/src/plugins/tasklist/taskfile.cpp
index 36206164383..871cefe1ab0 100644
--- a/src/plugins/tasklist/taskfile.cpp
+++ b/src/plugins/tasklist/taskfile.cpp
@@ -61,7 +61,7 @@ bool TaskFile::reload(QString *errorString, ReloadFlag flag, ChangeType type)
     return load(errorString, filePath());
 }
 
-bool TaskFile::load(QString *errorString, const Utils::FileName &fileName)
+bool TaskFile::load(QString *errorString, const Utils::FilePath &fileName)
 {
     setFilePath(fileName);
     return TaskListPlugin::loadFile(errorString, fileName);
diff --git a/src/plugins/tasklist/taskfile.h b/src/plugins/tasklist/taskfile.h
index eaaf6388291..22331f788e7 100644
--- a/src/plugins/tasklist/taskfile.h
+++ b/src/plugins/tasklist/taskfile.h
@@ -40,7 +40,7 @@ public:
     ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const override;
     bool reload(QString *errorString, ReloadFlag flag, ChangeType type) override;
 
-    bool load(QString *errorString, const Utils::FileName &fileName);
+    bool load(QString *errorString, const Utils::FilePath &fileName);
 };
 
 } // namespace Internal
diff --git a/src/plugins/tasklist/tasklistplugin.cpp b/src/plugins/tasklist/tasklistplugin.cpp
index 95b6fa9e863..b1d843355a8 100644
--- a/src/plugins/tasklist/tasklistplugin.cpp
+++ b/src/plugins/tasklist/tasklistplugin.cpp
@@ -107,7 +107,7 @@ static QString unescape(const QString &input)
     return result;
 }
 
-static bool parseTaskFile(QString *errorString, const FileName &name)
+static bool parseTaskFile(QString *errorString, const FilePath &name)
 {
     QFile tf(name.toString());
     if (!tf.open(QIODevice::ReadOnly)) {
@@ -116,7 +116,7 @@ static bool parseTaskFile(QString *errorString, const FileName &name)
         return false;
     }
 
-    const FileName parentDir = name.parentDir();
+    const FilePath parentDir = name.parentDir();
     while (!tf.atEnd()) {
         QStringList chunks = parseRawLine(tf.readLine());
         if (chunks.isEmpty())
@@ -154,7 +154,7 @@ static bool parseTaskFile(QString *errorString, const FileName &name)
         description = unescape(description);
 
         TaskHub::addTask(type, description, Constants::TASKLISTTASK_ID,
-                         FileName::fromUserInput(file), line);
+                         FilePath::fromUserInput(file), line);
     }
     return true;
 }
@@ -163,7 +163,7 @@ static bool parseTaskFile(QString *errorString, const FileName &name)
 // TaskListPlugin
 // --------------------------------------------------------------------------
 
-IDocument *TaskListPlugin::openTasks(const FileName &fileName)
+IDocument *TaskListPlugin::openTasks(const FilePath &fileName)
 {
     foreach (TaskFile *doc, d->m_openFiles) {
         if (doc->filePath() == fileName)
@@ -210,7 +210,7 @@ bool TaskListPlugin::initialize(const QStringList &arguments, QString *errorMess
 
     d->m_fileFactory.addMimeType(QLatin1String("text/x-tasklist"));
     d->m_fileFactory.setOpener([this](const QString &fileName) {
-        return openTasks(FileName::fromString(fileName));
+        return openTasks(FilePath::fromString(fileName));
     });
 
     connect(SessionManager::instance(), &SessionManager::sessionLoaded,
@@ -219,7 +219,7 @@ bool TaskListPlugin::initialize(const QStringList &arguments, QString *errorMess
     return true;
 }
 
-bool TaskListPlugin::loadFile(QString *errorString, const FileName &fileName)
+bool TaskListPlugin::loadFile(QString *errorString, const FilePath &fileName)
 {
     clearTasks();
 
@@ -248,7 +248,7 @@ void TaskListPlugin::clearTasks()
 
 void TaskListPlugin::loadDataFromSession()
 {
-    const FileName fileName = FileName::fromString(
+    const FilePath fileName = FilePath::fromString(
                 SessionManager::value(QLatin1String(SESSION_FILE_KEY)).toString());
     if (!fileName.isEmpty())
         openTasks(fileName);
diff --git a/src/plugins/tasklist/tasklistplugin.h b/src/plugins/tasklist/tasklistplugin.h
index 4c78fcbfd00..6fcd6f3d7f4 100644
--- a/src/plugins/tasklist/tasklistplugin.h
+++ b/src/plugins/tasklist/tasklistplugin.h
@@ -28,7 +28,7 @@
 #include <coreplugin/idocumentfactory.h>
 #include <extensionsystem/iplugin.h>
 
-namespace Utils { class FileName; }
+namespace Utils { class FilePath; }
 
 namespace TaskList {
 namespace Internal {
@@ -45,12 +45,12 @@ public:
     bool initialize(const QStringList &arguments, QString *errorMessage) override;
     void extensionsInitialized() override {}
 
-    static bool loadFile(QString *errorString, const Utils::FileName &fileName);
+    static bool loadFile(QString *errorString, const Utils::FilePath &fileName);
 
     static void stopMonitoring();
     static void clearTasks();
 
-    Core::IDocument *openTasks(const Utils::FileName &fileName);
+    Core::IDocument *openTasks(const Utils::FilePath &fileName);
 
     void loadDataFromSession();
 
-- 
cgit v1.2.3