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

VcsBaseEditorWidget: Avoid using sender()

Browse Source 
Change-Id: Id300535d40b52a2f7d3e69fca77ca75271da8711
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-07-19 18:13:12 +02:00
parent 07b0147714
commit 52e649cf53
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/vcsbase/vcsbaseeditor.cpp
View File

@@ -360,8 +360,10 @@ QAction *ChangeTextCursorHandler::createAnnotateAction(const QString &change, bo
editorWidget()->annotatePreviousRevisionTextFormat() : editorWidget()->annotatePreviousRevisionTextFormat() :
editorWidget()->annotateRevisionTextFormat(); editorWidget()->annotateRevisionTextFormat();
auto a = new QAction(format.arg(change), nullptr); auto a = new QAction(format.arg(change), nullptr);
a->setData(change); VcsBaseEditorWidget *editor = editorWidget();
connect(a, &QAction::triggered, editorWidget(), &VcsBaseEditorWidget::slotAnnotateRevision); connect(a, &QAction::triggered, editor, [editor, change] {
editor->slotAnnotateRevision(change);
});
return a; return a;
} }
@@ -1493,18 +1495,16 @@ void VcsBaseEditorWidget::addDiffActions(QMenu *, const DiffChunk &)
{ {
} }
void VcsBaseEditorWidget::slotAnnotateRevision() void VcsBaseEditorWidget::slotAnnotateRevision(const QString &change)
{ {
if (auto a = qobject_cast<const QAction *>(sender())) { const int currentLine = textCursor().blockNumber() + 1;
const int currentLine = textCursor().blockNumber() + 1; const QString fileName = fileNameForLine(currentLine);
const QString fileName = fileNameForLine(currentLine); QString workingDirectory = d->m_workingDirectory;
QString workingDirectory = d->m_workingDirectory; if (workingDirectory.isEmpty())
if (workingDirectory.isEmpty()) workingDirectory = QFileInfo(fileName).absolutePath();
workingDirectory = QFileInfo(fileName).absolutePath(); emit annotateRevisionRequested(FilePath::fromString(workingDirectory),
emit annotateRevisionRequested(FilePath::fromString(workingDirectory), QDir(workingDirectory).relativeFilePath(fileName),
QDir(workingDirectory).relativeFilePath(fileName), change, currentLine);
a->data().toString(), currentLine);
}
} }
QStringList VcsBaseEditorWidget::annotationPreviousVersions(const QString &) const QStringList VcsBaseEditorWidget::annotationPreviousVersions(const QString &) const

2
src/plugins/vcsbase/vcsbaseeditor.h
View File

@@ -273,7 +273,7 @@ private:
void slotPopulateLogBrowser(); void slotPopulateLogBrowser();
void slotJumpToEntry(int); void slotJumpToEntry(int);
void slotCursorPositionChanged() override; void slotCursorPositionChanged() override;
void slotAnnotateRevision(); void slotAnnotateRevision(const QString &change);
void slotApplyDiffChunk(); void slotApplyDiffChunk();
void slotPaste(); void slotPaste();
void showProgressIndicator(); void showProgressIndicator();