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>

5 files changed, 11 insertions, 11 deletions

diff --git a/src/plugins/designer/codemodelhelpers.cpp b/src/plugins/designer/codemodelhelpers.cpp
index 9f376a114a..52bb38f5d1 100644
--- a/src/plugins/designer/codemodelhelpers.cpp
+++ b/src/plugins/designer/codemodelhelpers.cpp
@@ -47,7 +47,7 @@ static const char setupUiC[] = "setupUi";
 static QString generatedHeaderOf(const QString &uiFileName)
 {
     if (const ProjectExplorer::Project *uiProject =
-            ProjectExplorer::SessionManager::projectForFile(Utils::FileName::fromString(uiFileName))) {
+            ProjectExplorer::SessionManager::projectForFile(Utils::FilePath::fromString(uiFileName))) {
         QStringList files = uiProject->filesGeneratedFrom(uiFileName);
         if (!files.isEmpty()) // There should be at most one header generated from a .ui
             return files.front();
diff --git a/src/plugins/designer/formwindowfile.cpp b/src/plugins/designer/formwindowfile.cpp
index a35e8e14f2..f84b9e197b 100644
--- a/src/plugins/designer/formwindowfile.cpp
+++ b/src/plugins/designer/formwindowfile.cpp
@@ -97,7 +97,7 @@ Core::IDocument::OpenResult FormWindowFile::open(QString *errorString, const QSt
     form->setDirty(fileName != realFileName);
 
     syncXmlFromFormWindow();
-    setFilePath(Utils::FileName::fromString(absfileName));
+    setFilePath(Utils::FilePath::fromString(absfileName));
     setShouldAutoSave(false);
     resourceHandler()->updateProjectResources();
 
@@ -106,7 +106,7 @@ Core::IDocument::OpenResult FormWindowFile::open(QString *errorString, const QSt
 
 bool FormWindowFile::save(QString *errorString, const QString &name, bool autoSave)
 {
-    const FileName actualName = name.isEmpty() ? filePath() : FileName::fromString(name);
+    const FilePath actualName = name.isEmpty() ? filePath() : FilePath::fromString(name);
 
     if (Designer::Constants::Internal::debug)
         qDebug() << Q_FUNC_INFO << name << "->" << actualName;
@@ -175,7 +175,7 @@ bool FormWindowFile::setContents(const QByteArray &contents)
     return true;
 }
 
-void FormWindowFile::setFilePath(const FileName &newName)
+void FormWindowFile::setFilePath(const FilePath &newName)
 {
     m_formWindow->setFileName(newName.toString());
     IDocument::setFilePath(newName);
diff --git a/src/plugins/designer/formwindowfile.h b/src/plugins/designer/formwindowfile.h
index d9129c88b9..d5791e7461 100644
--- a/src/plugins/designer/formwindowfile.h
+++ b/src/plugins/designer/formwindowfile.h
@@ -69,7 +69,7 @@ public:
     QString formWindowContents() const;
     ResourceHandler *resourceHandler() const;
 
-    void setFilePath(const Utils::FileName &) override;
+    void setFilePath(const Utils::FilePath &) override;
     void setShouldAutoSave(bool sad = true) { m_shouldAutoSave = sad; }
     void updateIsModified();
 
diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp
index f8e9cf6642..d004f4a661 100644
--- a/src/plugins/designer/qtcreatorintegration.cpp
+++ b/src/plugins/designer/qtcreatorintegration.cpp
@@ -491,7 +491,7 @@ bool QtCreatorIntegration::navigateToSlot(const QString &objectName,
 {
     typedef QMap<int, Document::Ptr> DocumentMap;
 
-    const Utils::FileName currentUiFile = FormEditorW::activeEditor()->document()->filePath();
+    const Utils::FilePath currentUiFile = FormEditorW::activeEditor()->document()->filePath();
 #if 0
     return Designer::Internal::navigateToSlot(currentUiFile.toString(), objectName,
                                               signalSignature, parameterNames, errorMessage);
@@ -518,12 +518,12 @@ bool QtCreatorIntegration::navigateToSlot(const QString &objectName,
     } else {
         const CppTools::WorkingCopy workingCopy =
                 CppTools::CppModelManager::instance()->workingCopy();
-        const Utils::FileName configFileName =
-                Utils::FileName::fromString(CppTools::CppModelManager::configurationFileName());
-        QHashIterator<Utils::FileName, QPair<QByteArray, unsigned> > it = workingCopy.iterator();
+        const Utils::FilePath configFileName =
+                Utils::FilePath::fromString(CppTools::CppModelManager::configurationFileName());
+        QHashIterator<Utils::FilePath, QPair<QByteArray, unsigned> > it = workingCopy.iterator();
         while (it.hasNext()) {
             it.next();
-            const Utils::FileName &fileName = it.key();
+            const Utils::FilePath &fileName = it.key();
             if (fileName != configFileName)
                 newDocTable.insert(docTable.document(fileName));
         }
diff --git a/src/plugins/designer/resourcehandler.cpp b/src/plugins/designer/resourcehandler.cpp
index 73064f62bf..0f7029a0e2 100644
--- a/src/plugins/designer/resourcehandler.cpp
+++ b/src/plugins/designer/resourcehandler.cpp
@@ -88,7 +88,7 @@ void ResourceHandler::updateResourcesHelper(bool updateProjectResources)
         qDebug() << "ResourceHandler::updateResources()" << fileName;
 
     // Filename could change in the meantime.
-    Project *project = SessionManager::projectForFile(Utils::FileName::fromUserInput(fileName));
+    Project *project = SessionManager::projectForFile(Utils::FilePath::fromUserInput(fileName));
     const bool dirty = m_form->property("_q_resourcepathchanged").toBool();
     if (dirty)
         m_form->setDirty(true);