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/gitplugin.cpp | |
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/gitplugin.cpp')
-rw-r--r-- | src/plugins/git/gitplugin.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 24c407fb4f..0ba8b77d96 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -1133,11 +1133,8 @@ void GitPluginPrivate::blameFile() const FilePath fileName = FilePath::fromString(state.currentFile()).canonicalPath(); FilePath topLevel; VcsManager::findVersionControlForDirectory(fileName.parentDir(), &topLevel); - VcsBaseEditorWidget *editor = m_gitClient.annotate( - topLevel, fileName.relativeChildPath(topLevel).toString(), - {}, lineNumber, extraOptions); - if (firstLine > 0) - editor->setFirstLineNumber(firstLine); + m_gitClient.annotate(topLevel, fileName.relativeChildPath(topLevel).toString(), + lineNumber, {}, extraOptions, firstLine); } void GitPluginPrivate::logProject() @@ -2126,7 +2123,7 @@ FilePaths GitPluginPrivate::unmanagedFiles(const FilePaths &filePaths) const void GitPluginPrivate::vcsAnnotate(const FilePath &filePath, int line) { - m_gitClient.annotate(filePath.absolutePath(), filePath.fileName(), {}, line); + m_gitClient.annotate(filePath.absolutePath(), filePath.fileName(), line); } void GitPlugin::emitFilesChanged(const QStringList &l) |