diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2020-06-18 00:11:00 +0300 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2020-06-18 05:18:03 +0000 |
commit | 53fc320b7264e19a5ae12ede2c120acaa151240b (patch) | |
tree | abbf141f5b6fd78c76ca090e91f72174c0afd372 | |
parent | 3d7697667d431a678ebddc96e8fc0ae78755ef2d (diff) |
Adapt to upstream changes
Change-Id: I964746d7c34cdf6a23cb027cbf6987b21a6b079f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
-rw-r--r-- | plugins/fossil/fossilplugin.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/plugins/fossil/fossilplugin.cpp b/plugins/fossil/fossilplugin.cpp index a83d547..ac68ec1 100644 --- a/plugins/fossil/fossilplugin.cpp +++ b/plugins/fossil/fossilplugin.cpp @@ -163,7 +163,8 @@ public: bool vcsMove(const QString &from, const QString &to) final; bool vcsCreateRepository(const QString &directory) final; - bool vcsAnnotate(const QString &file, int line) final; + void vcsAnnotate(const QString &file, int line) final; + void vcsDescribe(const QString &source, const QString &id) final { m_client.view(source, id); } Core::ShellCommand *createInitialCheckoutCommand(const QString &url, const Utils::FilePath &baseDirectory, @@ -205,7 +206,6 @@ public: void createDirectoryActions(const Core::Context &context); void createRepositoryActions(const Core::Context &context); - void describe(const QString &source, const QString &id) { m_client.view(source, id); }; bool pullOrPush(SyncMode mode); // Variables @@ -223,19 +223,19 @@ public: VcsEditorFactory fileLogFactory { &fileLogParameters, [] { return new FossilEditorWidget; }, - std::bind(&FossilPluginPrivate::describe, this, _1, _2) + std::bind(&FossilPluginPrivate::vcsDescribe, this, _1, _2) }; VcsEditorFactory annotateLogFactory { &annotateLogParameters, [] { return new FossilEditorWidget; }, - std::bind(&FossilPluginPrivate::describe, this, _1, _2) + std::bind(&FossilPluginPrivate::vcsDescribe, this, _1, _2) }; VcsEditorFactory diffFactory { &diffParameters, [] { return new FossilEditorWidget; }, - std::bind(&FossilPluginPrivate::describe, this, _1, _2) + std::bind(&FossilPluginPrivate::vcsDescribe, this, _1, _2) }; Core::CommandLocator *m_commandLocator = nullptr; @@ -993,11 +993,10 @@ bool FossilPluginPrivate::vcsCreateRepository(const QString &directory) return m_client.synchronousCreateRepository(directory); } -bool FossilPluginPrivate::vcsAnnotate(const QString &file, int line) +void FossilPluginPrivate::vcsAnnotate(const QString &file, int line) { const QFileInfo fi(file); m_client.annotate(fi.absolutePath(), fi.fileName(), QString(), line); - return true; } Core::ShellCommand *FossilPluginPrivate::createInitialCheckoutCommand(const QString &sourceUrl, |