diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2016-11-26 22:13:18 +0200 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2016-11-28 09:39:38 +0000 |
commit | 414f49ea19ec2398b56c5aa9eb5706035c1c782b (patch) | |
tree | 210d4512d16e0d8b4595b4b93ad10f5d0877b1f5 /src/plugins/subversion | |
parent | 5832f52ceefb9ee19842af4513ae00ee7d311e31 (diff) |
VCS: Use Qt5 connect for annotate
Connect directly to the editor widget, which has a strong type.
Change-Id: I4d9778bc4a3c8ba1b37c5a5c0286fd72cda135de
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/subversion')
-rw-r--r-- | src/plugins/subversion/subversionplugin.cpp | 11 | ||||
-rw-r--r-- | src/plugins/subversion/subversionplugin.h | 4 |
2 files changed, 1 insertions, 14 deletions
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index bdc7654d9e..6346fa0e8a 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -777,14 +777,6 @@ void SubversionPlugin::annotateCurrentFile() vcsAnnotate(state.currentFileTopLevel(), state.relativeCurrentFile()); } -void SubversionPlugin::annotateVersion(const QString &workingDirectory, - const QString &file, - const QString &revision, - int lineNr) -{ - vcsAnnotate(workingDirectory, file, revision, lineNr); -} - void SubversionPlugin::vcsAnnotate(const QString &workingDir, const QString &file, const QString &revision /* = QString() */, int lineNumber /* = -1 */) @@ -918,11 +910,10 @@ IEditor *SubversionPlugin::showOutputInEditor(const QString &title, const QStrin << "Size= " << output.size() << " Type=" << editorType << debugCodec(codec); QString s = title; IEditor *editor = EditorManager::openEditorWithContents(id, &s, output.toUtf8()); - connect(editor, SIGNAL(annotateRevisionRequested(QString,QString,QString,int)), - this, SLOT(annotateVersion(QString,QString,QString,int))); SubversionEditorWidget *e = qobject_cast<SubversionEditorWidget*>(editor->widget()); if (!e) return 0; + connect(e, &VcsBaseEditorWidget::annotateRevisionRequested, this, &SubversionPlugin::vcsAnnotate); e->setForceReadOnly(true); s.replace(QLatin1Char(' '), QLatin1Char('_')); e->textDocument()->setFallbackSaveAsFileName(s); diff --git a/src/plugins/subversion/subversionplugin.h b/src/plugins/subversion/subversionplugin.h index f9312cbcd4..35a99e2cd9 100644 --- a/src/plugins/subversion/subversionplugin.h +++ b/src/plugins/subversion/subversionplugin.h @@ -98,10 +98,6 @@ public: void vcsAnnotate(const QString &workingDir, const QString &file, const QString &revision = QString(), int lineNumber = -1); -public slots: - void annotateVersion(const QString &workingDirectory, const QString &file, - const QString &revision, int lineNumber); - #ifdef WITH_TESTS private slots: void testLogResolving(); |