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>

9 files changed, 24 insertions, 24 deletions

diff --git a/src/plugins/languageclient/client.cpp b/src/plugins/languageclient/client.cpp
index 4f1333981de..3acea150800 100644
--- a/src/plugins/languageclient/client.cpp
+++ b/src/plugins/languageclient/client.cpp
@@ -68,7 +68,7 @@ static Q_LOGGING_CATEGORY(LOGLSPCLIENT, "qtc.languageclient.client", QtWarningMs
 class TextMark : public TextEditor::TextMark
 {
 public:
-    TextMark(const Utils::FileName &fileName, const Diagnostic &diag)
+    TextMark(const Utils::FilePath &fileName, const Diagnostic &diag)
         : TextEditor::TextMark(fileName, diag.range().start().line() + 1, "lspmark")
         , m_diagnostic(diag)
     {
@@ -107,10 +107,10 @@ Client::Client(BaseClientInterface *clientInterface)
     connect(clientInterface, &BaseClientInterface::finished, this, &Client::finished);
 }
 
-static void updateEditorToolBar(QList<Utils::FileName> files)
+static void updateEditorToolBar(QList<Utils::FilePath> files)
 {
     QList<Core::IEditor *> editors = Core::DocumentModel::editorsForDocuments(
-        Utils::transform(files, [](Utils::FileName &file) {
+        Utils::transform(files, [](Utils::FilePath &file) {
             return Core::DocumentModel::documentForFilePath(file.toString());
         }));
     for (auto editor : editors)
@@ -271,7 +271,7 @@ bool Client::openDocument(Core::IDocument *document)
     using namespace TextEditor;
     if (!isSupportedDocument(document))
         return false;
-    const FileName &filePath = document->filePath();
+    const FilePath &filePath = document->filePath();
     const QString method(DidOpenTextDocumentNotification::methodName);
     if (Utils::optional<bool> registered = m_dynamicCapabilities.isRegistered(method)) {
         if (!registered.value())
@@ -410,7 +410,7 @@ void Client::documentContentsSaved(Core::IDocument *document)
 
 void Client::documentWillSave(Core::IDocument *document)
 {
-    const FileName &filePath = document->filePath();
+    const FilePath &filePath = document->filePath();
     if (!m_openedDocument.contains(filePath))
         return;
     bool sendMessage = true;
@@ -510,7 +510,7 @@ static bool sendTextDocumentPositionParamsRequest(Client *client,
     if (sendMessage) {
         const TextDocumentRegistrationOptions option(dynamicCapabilities.option(Request::methodName));
         if (option.isValid(nullptr))
-            sendMessage = option.filterApplies(FileName::fromString(QUrl(uri).adjusted(QUrl::PreferLocalFile).toString()));
+            sendMessage = option.filterApplies(FilePath::fromString(QUrl(uri).adjusted(QUrl::PreferLocalFile).toString()));
         else
             sendMessage = supportedFile;
     } else {
@@ -546,7 +546,7 @@ void Client::requestDocumentSymbols(TextEditor::TextDocument *document)
 {
     // TODO: Do not use this information for highlighting but the overview model
     return;
-    const FileName &filePath = document->filePath();
+    const FilePath &filePath = document->filePath();
     bool sendMessage = m_dynamicCapabilities.isRegistered(DocumentSymbolsRequest::methodName).value_or(false);
     if (sendMessage) {
         const TextDocumentRegistrationOptions option(m_dynamicCapabilities.option(DocumentSymbolsRequest::methodName));
@@ -688,7 +688,7 @@ void Client::cursorPositionChanged(TextEditor::TextEditorWidget *widget)
 
 void Client::requestCodeActions(const DocumentUri &uri, const QList<Diagnostic> &diagnostics)
 {
-    const Utils::FileName fileName = uri.toFileName();
+    const Utils::FilePath fileName = uri.toFileName();
     TextEditor::TextDocument *doc = TextEditor::TextDocument::textDocumentForFileName(fileName);
     if (!doc)
         return;
@@ -716,7 +716,7 @@ void Client::requestCodeActions(const CodeActionRequest &request)
     if (!request.isValid(nullptr))
         return;
 
-    const Utils::FileName fileName
+    const Utils::FilePath fileName
         = request.params().value_or(CodeActionParams()).textDocument().uri().toFileName();
 
     const QString method(CodeActionRequest::methodName);
@@ -831,7 +831,7 @@ bool Client::isSupportedDocument(const Core::IDocument *document) const
     return m_languagFilter.isSupported(document);
 }
 
-bool Client::isSupportedFile(const Utils::FileName &filePath, const QString &mimeType) const
+bool Client::isSupportedFile(const Utils::FilePath &filePath, const QString &mimeType) const
 {
     return m_languagFilter.isSupported(filePath, mimeType);
 }
diff --git a/src/plugins/languageclient/client.h b/src/plugins/languageclient/client.h
index 0f57907a8c5..9746607e627 100644
--- a/src/plugins/languageclient/client.h
+++ b/src/plugins/languageclient/client.h
@@ -129,7 +129,7 @@ public:
 
     void setSupportedLanguage(const LanguageFilter &filter);
     bool isSupportedDocument(const Core::IDocument *document) const;
-    bool isSupportedFile(const Utils::FileName &filePath, const QString &mimeType) const;
+    bool isSupportedFile(const Utils::FilePath &filePath, const QString &mimeType) const;
     bool isSupportedUri(const LanguageServerProtocol::DocumentUri &uri) const;
 
     void setName(const QString &name) { m_displayName = name; }
@@ -196,7 +196,7 @@ private:
     QHash<QByteArray, ContentHandler> m_contentHandler;
     QString m_displayName;
     LanguageFilter m_languagFilter;
-    QMap<Utils::FileName, QString> m_openedDocument;
+    QMap<Utils::FilePath, QString> m_openedDocument;
     Core::Id m_id;
     LanguageServerProtocol::ServerCapabilities m_serverCapabilities;
     DynamicCapabilities m_dynamicCapabilities;
diff --git a/src/plugins/languageclient/languageclientcompletionassist.cpp b/src/plugins/languageclient/languageclientcompletionassist.cpp
index 3c131094122..a036f7beb34 100644
--- a/src/plugins/languageclient/languageclientcompletionassist.cpp
+++ b/src/plugins/languageclient/languageclientcompletionassist.cpp
@@ -330,7 +330,7 @@ IAssistProposal *LanguageClientCompletionAssistProcessor::perform(const AssistIn
     params.setPosition({line, column});
     params.setContext(context);
     params.setTextDocument(
-                DocumentUri::fromFileName(Utils::FileName::fromString(interface->fileName())));
+                DocumentUri::fromFileName(Utils::FilePath::fromString(interface->fileName())));
     completionRequest.setResponseCallback([this](auto response) {
         this->handleCompletionResponse(response);
     });
diff --git a/src/plugins/languageclient/languageclientfunctionhint.cpp b/src/plugins/languageclient/languageclientfunctionhint.cpp
index f2aed1f72c8..9a1fe6fc8e9 100644
--- a/src/plugins/languageclient/languageclientfunctionhint.cpp
+++ b/src/plugins/languageclient/languageclientfunctionhint.cpp
@@ -82,7 +82,7 @@ IAssistProposal *FunctionHintProcessor::perform(const AssistInterface *interface
     m_pos = interface->position();
     QTextCursor cursor(interface->textDocument());
     cursor.setPosition(m_pos);
-    auto uri = DocumentUri::fromFileName(Utils::FileName::fromString(interface->fileName()));
+    auto uri = DocumentUri::fromFileName(Utils::FilePath::fromString(interface->fileName()));
     SignatureHelpRequest request;
     request.setParams(TextDocumentPositionParams(TextDocumentIdentifier(uri), Position(cursor)));
     request.setResponseCallback([this](auto response) { this->handleSignatureResponse(response); });
diff --git a/src/plugins/languageclient/languageclientmanager.cpp b/src/plugins/languageclient/languageclientmanager.cpp
index b519c13fef8..4c5ec02a594 100644
--- a/src/plugins/languageclient/languageclientmanager.cpp
+++ b/src/plugins/languageclient/languageclientmanager.cpp
@@ -240,7 +240,7 @@ void LanguageClientManager::applySettings()
         case BaseSettings::RequiresProject: {
             for (Core::IDocument *doc : Core::DocumentModel::openedDocuments()) {
                 if (setting->m_languageFilter.isSupported(doc)) {
-                    const Utils::FileName filePath = doc->filePath();
+                    const Utils::FilePath filePath = doc->filePath();
                     for (ProjectExplorer::Project *project :
                          ProjectExplorer::SessionManager::projects()) {
                         if (project->isKnownFile(filePath))
@@ -376,7 +376,7 @@ void LanguageClientManager::documentOpened(Core::IDocument *document)
         if (setting->isValid() && setting->m_enabled
             && setting->m_languageFilter.isSupported(document)) {
             if (setting->m_startBehavior == BaseSettings::RequiresProject) {
-                const Utils::FileName filePath = document->filePath();
+                const Utils::FilePath filePath = document->filePath();
                 for (ProjectExplorer::Project *project :
                      ProjectExplorer::SessionManager::projects()) {
                     // check whether file is part of this project
@@ -421,7 +421,7 @@ void LanguageClientManager::documentWillSave(Core::IDocument *document)
         interface->documentContentsSaved(document);
 }
 
-void LanguageClientManager::findLinkAt(const Utils::FileName &filePath,
+void LanguageClientManager::findLinkAt(const Utils::FilePath &filePath,
                                        const QTextCursor &cursor,
                                        Utils::ProcessLinkCallback callback)
 {
@@ -485,7 +485,7 @@ QList<Core::SearchResultItem> generateSearchResultItems(const LanguageClientArra
     return result;
 }
 
-void LanguageClientManager::findUsages(const Utils::FileName &filePath, const QTextCursor &cursor)
+void LanguageClientManager::findUsages(const Utils::FilePath &filePath, const QTextCursor &cursor)
 {
     const DocumentUri uri = DocumentUri::fromFileName(filePath);
     const TextDocumentIdentifier document(uri);
diff --git a/src/plugins/languageclient/languageclientmanager.h b/src/plugins/languageclient/languageclientmanager.h
index a39d88f3c3f..6be720697f0 100644
--- a/src/plugins/languageclient/languageclientmanager.h
+++ b/src/plugins/languageclient/languageclientmanager.h
@@ -89,9 +89,9 @@ private:
     void documentClosed(Core::IDocument *document);
     void documentContentsSaved(Core::IDocument *document);
     void documentWillSave(Core::IDocument *document);
-    void findLinkAt(const Utils::FileName &filePath, const QTextCursor &cursor,
+    void findLinkAt(const Utils::FilePath &filePath, const QTextCursor &cursor,
                     Utils::ProcessLinkCallback callback);
-    void findUsages(const Utils::FileName &filePath, const QTextCursor &cursor);
+    void findUsages(const Utils::FilePath &filePath, const QTextCursor &cursor);
 
     void projectAdded(ProjectExplorer::Project *project);
     void projectRemoved(ProjectExplorer::Project *project);
diff --git a/src/plugins/languageclient/languageclientquickfix.cpp b/src/plugins/languageclient/languageclientquickfix.cpp
index def01b17d81..70db31b8712 100644
--- a/src/plugins/languageclient/languageclientquickfix.cpp
+++ b/src/plugins/languageclient/languageclientquickfix.cpp
@@ -111,7 +111,7 @@ IAssistProposal *LanguageClientQuickFixAssistProcessor::perform(const AssistInte
         cursor.select(QTextCursor::LineUnderCursor);
     Range range(cursor);
     params.setRange(range);
-    auto uri = DocumentUri::fromFileName(Utils::FileName::fromString(interface->fileName()));
+    auto uri = DocumentUri::fromFileName(Utils::FilePath::fromString(interface->fileName()));
     params.setTextDocument(uri);
     CodeActionParams::CodeActionContext context;
     context.setDiagnostics(m_client->diagnosticsAt(uri, range));
diff --git a/src/plugins/languageclient/languageclientsettings.cpp b/src/plugins/languageclient/languageclientsettings.cpp
index 1de86b68021..50465770d9c 100644
--- a/src/plugins/languageclient/languageclientsettings.cpp
+++ b/src/plugins/languageclient/languageclientsettings.cpp
@@ -782,7 +782,7 @@ QString StdIOSettingsWidget::arguments() const
     return m_arguments->text();
 }
 
-bool LanguageFilter::isSupported(const Utils::FileName &filePath, const QString &mimeType) const
+bool LanguageFilter::isSupported(const Utils::FilePath &filePath, const QString &mimeType) const
 {
     if (mimeTypes.isEmpty() && filePattern.isEmpty())
         return true;
diff --git a/src/plugins/languageclient/languageclientsettings.h b/src/plugins/languageclient/languageclientsettings.h
index aed2bf585a4..1036348cb7b 100644
--- a/src/plugins/languageclient/languageclientsettings.h
+++ b/src/plugins/languageclient/languageclientsettings.h
@@ -39,7 +39,7 @@ class QLineEdit;
 QT_END_NAMESPACE
 
 namespace Utils {
-class FileName;
+class FilePath;
 class PathChooser;
 } // namespace Utils
 
@@ -57,7 +57,7 @@ struct LanguageFilter
 {
     QStringList mimeTypes;
     QStringList filePattern;
-    bool isSupported(const Utils::FileName &filePath, const QString &mimeType) const;
+    bool isSupported(const Utils::FilePath &filePath, const QString &mimeType) const;
     bool isSupported(const Core::IDocument *document) const;
 };