Update to upstream FilePath changesHEADtemp/fossilmaster

Change-Id: I151fc9cb369bafd943dbfcfa17a301e09cd897df
Reviewed-by: Orgad Shaneh <[email protected]>

4 files changed, 9 insertions, 10 deletions

diff --git a/plugins/fossil/fossilclient.cpp b/plugins/fossil/fossilclient.cpp
index ce35438..492fcd1 100644
--- a/plugins/fossil/fossilclient.cpp
+++ b/plugins/fossil/fossilclient.cpp
@@ -729,7 +729,7 @@ void FossilClient::annotate(const FilePath &workingDir, const QString &file, int
     const Id kind = vcsEditorKind(AnnotateCommand);
     const QString id = VcsBaseEditor::getTitleId(workingDir, QStringList(file), revision);
     const QString title = vcsEditorTitle(vcsCmdString, id);
-    const QString source = VcsBaseEditor::getSource(workingDir, file);
+    const FilePath source = VcsBaseEditor::getSource(workingDir, file);
 
     VcsBaseEditorWidget *editor = createVcsEditor(kind, title, source,
                                                   VcsBaseEditor::getCodec(source),
@@ -853,10 +853,9 @@ FossilClient::SupportedFeatures FossilClient::supportedFeatures() const
     return features;
 }
 
-void FossilClient::view(const QString &source, const QString &id, const QStringList &extraOptions)
+void FossilClient::view(const FilePath &source, const QString &id, const QStringList &extraOptions)
 {
-    const FilePath fPath = FilePath::fromString(source);
-    const FilePath workingDirectory = fPath.isFile() ? fPath.absolutePath() : fPath;
+    const FilePath workingDirectory = source.isFile() ? source.absolutePath() : source;
 
     const RevisionInfo revisionInfo = synchronousRevisionQuery(workingDirectory, id);
     const QStringList args{"diff", "--from", revisionInfo.parentId, "--to", revisionInfo.id, "-v"};
@@ -935,7 +934,7 @@ void FossilClient::log(const FilePath &workingDir, const QStringList &files,
     const Id kind = vcsEditorKind(LogCommand);
     const QString id = VcsBaseEditor::getTitleId(workingDir, files);
     const QString title = vcsEditorTitle(vcsCmdString, id);
-    const QString source = VcsBaseEditor::getSource(workingDir, files);
+    const FilePath source = VcsBaseEditor::getSource(workingDir, files);
     VcsBaseEditorWidget *editor = createVcsEditor(kind, title, source,
                                                   VcsBaseEditor::getCodec(source),
                                                   vcsCmdString.toLatin1().constData(), id);
@@ -988,7 +987,7 @@ void FossilClient::logCurrentFile(const FilePath &workingDir, const QStringList
     const Id kind = vcsEditorKind(LogCommand);
     const QString id = VcsBaseEditor::getTitleId(workingDir, files);
     const QString title = vcsEditorTitle(vcsCmdString, id);
-    const QString source = VcsBaseEditor::getSource(workingDir, files);
+    const FilePath source = VcsBaseEditor::getSource(workingDir, files);
     VcsBaseEditorWidget *editor = createVcsEditor(kind, title, source,
                                                   VcsBaseEditor::getCodec(source),
                                                   vcsCmdString.toLatin1().constData(), id);
diff --git a/plugins/fossil/fossilclient.h b/plugins/fossil/fossilclient.h
index e2ed6a8..37d3246 100644
--- a/plugins/fossil/fossilclient.h
+++ b/plugins/fossil/fossilclient.h
@@ -112,7 +112,7 @@ public:
     unsigned int binaryVersion() const;
     QString binaryVersionString() const;
     SupportedFeatures supportedFeatures() const;
-    void view(const QString &source, const QString &id, const QStringList &extraOptions = {}) final;
+    void view(const Utils::FilePath &source, const QString &id, const QStringList &extraOptions = {}) final;
 
 private:
     static QList<BranchInfo> branchListFromOutput(const QString &output,
diff --git a/plugins/fossil/fossileditor.cpp b/plugins/fossil/fossileditor.cpp
index 92145b7..a3f9539 100644
--- a/plugins/fossil/fossileditor.cpp
+++ b/plugins/fossil/fossileditor.cpp
@@ -83,7 +83,7 @@ QString FossilEditorWidget::decorateVersion(const QString &revision) const
     static const int shortChangesetIdSize(10);
     static const int maxTextSize(120);
 
-    const Utils::FilePath workingDirectory = Utils::FilePath::fromString(source()).parentDir();
+    const Utils::FilePath workingDirectory = source().parentDir();
     const FossilClient *client = FossilPlugin::client();
     const RevisionInfo revisionInfo = client->synchronousRevisionQuery(workingDirectory, revision,
                                                                        true);
@@ -102,7 +102,7 @@ QString FossilEditorWidget::decorateVersion(const QString &revision) const
 
 QStringList FossilEditorWidget::annotationPreviousVersions(const QString &revision) const
 {
-    const Utils::FilePath workingDirectory = Utils::FilePath::fromString(source()).parentDir();
+    const Utils::FilePath workingDirectory = source().parentDir();
     const FossilClient *client = FossilPlugin::client();
     const RevisionInfo revisionInfo = client->synchronousRevisionQuery(workingDirectory, revision);
     if (revisionInfo.parentId.isEmpty())
diff --git a/plugins/fossil/fossilplugin.cpp b/plugins/fossil/fossilplugin.cpp
index 007e02a..e6b0a82 100644
--- a/plugins/fossil/fossilplugin.cpp
+++ b/plugins/fossil/fossilplugin.cpp
@@ -963,7 +963,7 @@ void FossilPluginPrivate::vcsAnnotate(const FilePath &filePath, int line)
 
 void FossilPluginPrivate::vcsDescribe(const FilePath &source, const QString &id)
 {
-    m_client.view(source.toString(), id);
+    m_client.view(source, id);
 }
 
 VcsCommand *FossilPluginPrivate::createInitialCheckoutCommand(const QString &sourceUrl,