feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Adapt to upstream changes

Browse Source 
Change-Id: I964746d7c34cdf6a23cb027cbf6987b21a6b079f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Orgad Shaneh
2020-06-18 00:11:00 +03:00
committed by Orgad Shaneh
parent 3d7697667d
commit 53fc320b72
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/fossil/fossilplugin.cpp
View File

@@ -163,7 +163,8 @@ public:
bool vcsMove(const QString &from, const QString &to) final; bool vcsMove(const QString &from, const QString &to) final;
bool vcsCreateRepository(const QString &directory) 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, Core::ShellCommand *createInitialCheckoutCommand(const QString &url,
const Utils::FilePath &baseDirectory, const Utils::FilePath &baseDirectory,
@@ -205,7 +206,6 @@ public:
void createDirectoryActions(const Core::Context &context); void createDirectoryActions(const Core::Context &context);
void createRepositoryActions(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); bool pullOrPush(SyncMode mode);
// Variables // Variables
@@ -223,19 +223,19 @@ public:
VcsEditorFactory fileLogFactory { VcsEditorFactory fileLogFactory {
&fileLogParameters, &fileLogParameters,
[] { return new FossilEditorWidget; }, [] { return new FossilEditorWidget; },
std::bind(&FossilPluginPrivate::describe, this, _1, _2) std::bind(&FossilPluginPrivate::vcsDescribe, this, _1, _2)
}; };
VcsEditorFactory annotateLogFactory { VcsEditorFactory annotateLogFactory {
&annotateLogParameters, &annotateLogParameters,
[] { return new FossilEditorWidget; }, [] { return new FossilEditorWidget; },
std::bind(&FossilPluginPrivate::describe, this, _1, _2) std::bind(&FossilPluginPrivate::vcsDescribe, this, _1, _2)
}; };
VcsEditorFactory diffFactory { VcsEditorFactory diffFactory {
&diffParameters, &diffParameters,
[] { return new FossilEditorWidget; }, [] { return new FossilEditorWidget; },
std::bind(&FossilPluginPrivate::describe, this, _1, _2) std::bind(&FossilPluginPrivate::vcsDescribe, this, _1, _2)
}; };
Core::CommandLocator *m_commandLocator = nullptr; Core::CommandLocator *m_commandLocator = nullptr;
@@ -993,11 +993,10 @@ bool FossilPluginPrivate::vcsCreateRepository(const QString &directory)
return m_client.synchronousCreateRepository(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); const QFileInfo fi(file);
m_client.annotate(fi.absolutePath(), fi.fileName(), QString(), line); m_client.annotate(fi.absolutePath(), fi.fileName(), QString(), line);
return true;
} }
Core::ShellCommand *FossilPluginPrivate::createInitialCheckoutCommand(const QString &sourceUrl, Core::ShellCommand *FossilPluginPrivate::createInitialCheckoutCommand(const QString &sourceUrl,