diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-12-11 11:49:17 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-12-11 11:15:15 +0000 |
| commit | 32e824c76257c21ee4a5d036ecb7bfcbf6664448 (patch) | |
| tree | dd8fb47476b3fdf4fc0d73753f84e9ae0ef5f961 /src/plugins/git/gitclient.h | |
| parent | db85862a8c035093ca2c33b0fa9e90546b24855c (diff) | |
| download | qt-creator-32e824c76257c21ee4a5d036ecb7bfcbf6664448.tar.gz | |
VcsBase: Don't return editor from annotate()
Take int firstLine as last arg instead. Switch the order of
3rd and 4th args as most callers provide lineNumber
and don't provide revision.
Change-Id: Iab60c1068a4d9829d10219af39bf3dcbf51e37bb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/git/gitclient.h')
| -rw-r--r-- | src/plugins/git/gitclient.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 15e7e5f8a2..29747ea0ac 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -152,9 +152,9 @@ public: void log(const Utils::FilePath &workingDirectory, const QString &fileName = {}, bool enableAnnotationContextMenu = false, const QStringList &args = {}); void reflog(const Utils::FilePath &workingDirectory, const QString &branch = {}); - VcsBase::VcsBaseEditorWidget *annotate(const Utils::FilePath &workingDir, const QString &file, - const QString &revision = {}, int lineNumber = -1, - const QStringList &extraOptions = {}) override; + void annotate(const Utils::FilePath &workingDir, const QString &file, + int lineNumber = -1, const QString &revision = {}, + const QStringList &extraOptions = {}, int firstLine = -1) override; void reset(const Utils::FilePath &workingDirectory, const QString &argument, const QString &commit = {}); void removeStaleRemoteBranches(const Utils::FilePath &workingDirectory, const QString &remote); void recoverDeletedFiles(const Utils::FilePath &workingDirectory); |