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>

2 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp
index 21aadbc3c3..0c1d6563dd 100644
--- a/src/plugins/diffeditor/diffeditor.cpp
+++ b/src/plugins/diffeditor/diffeditor.cpp
@@ -317,8 +317,8 @@ void DiffEditor::documentHasChanged()
     for (const FileData &diffFile : diffFileList) {
         const DiffFileInfo &leftEntry = diffFile.leftFileInfo;
         const DiffFileInfo &rightEntry = diffFile.rightFileInfo;
-        const QString leftShortFileName = Utils::FileName::fromString(leftEntry.fileName).fileName();
-        const QString rightShortFileName = Utils::FileName::fromString(rightEntry.fileName).fileName();
+        const QString leftShortFileName = Utils::FilePath::fromString(leftEntry.fileName).fileName();
+        const QString rightShortFileName = Utils::FilePath::fromString(rightEntry.fileName).fileName();
         QString itemText;
         QString itemToolTip;
         if (leftEntry.fileName == rightEntry.fileName) {
diff --git a/src/plugins/diffeditor/diffeditordocument.cpp b/src/plugins/diffeditor/diffeditordocument.cpp
index eb1a00a451..8c24d09424 100644
--- a/src/plugins/diffeditor/diffeditordocument.cpp
+++ b/src/plugins/diffeditor/diffeditordocument.cpp
@@ -216,7 +216,7 @@ bool DiffEditorDocument::save(QString *errorString, const QString &fileName, boo
 
     const QFileInfo fi(fileName);
     setTemporary(false);
-    setFilePath(FileName::fromString(fi.absoluteFilePath()));
+    setFilePath(FilePath::fromString(fi.absoluteFilePath()));
     setPreferredDisplayName(QString());
     emit temporaryStateChanged();
 
@@ -263,7 +263,7 @@ Core::IDocument::OpenResult DiffEditorDocument::open(QString *errorString, const
         const QFileInfo fi(fileName);
         setTemporary(false);
         emit temporaryStateChanged();
-        setFilePath(FileName::fromString(fi.absoluteFilePath()));
+        setFilePath(FilePath::fromString(fi.absoluteFilePath()));
         setDiffFiles(fileDataList, fi.absolutePath());
     }
     endReload(ok);