forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -351,7 +351,7 @@ void MercurialPluginPrivate::annotateCurrentFile()
|
||||
currentLine = editor->currentLine();
|
||||
const VcsBasePluginState state = currentState();
|
||||
QTC_ASSERT(state.hasFile(), return);
|
||||
m_client.annotate(state.currentFileTopLevel(), state.relativeCurrentFile(), QString(), currentLine);
|
||||
m_client.annotate(state.currentFileTopLevel(), state.relativeCurrentFile(), currentLine);
|
||||
}
|
||||
|
||||
void MercurialPluginPrivate::diffCurrentFile()
|
||||
@@ -775,7 +775,7 @@ bool MercurialPluginPrivate::vcsCreateRepository(const FilePath &directory)
|
||||
|
||||
void MercurialPluginPrivate::vcsAnnotate(const FilePath &filePath, int line)
|
||||
{
|
||||
m_client.annotate(filePath.parentDir(), filePath.fileName(), QString(), line);
|
||||
m_client.annotate(filePath.parentDir(), filePath.fileName(), line);
|
||||
}
|
||||
|
||||
VcsCommand *MercurialPluginPrivate::createInitialCheckoutCommand(const QString &url,
|
||||
|
||||
Reference in New Issue
Block a user