From 12fac12e8f78ed8770b90ae9f2aa80e1e78ee68c Mon Sep 17 00:00:00 2001
From: Hugues Delorme <delorme.hugues@fougsys.fr>
Date: Wed, 4 Mar 2015 14:56:56 +0100
Subject: [PATCH] Vcs: rename overload SubmitEditor::diffSelectedFiles() for
rows
-> Renamed to diffSelectedRows()
This allows to use easily Qt5 connects, without ugly casting to
pick the right overload
Change-Id: Ifaa0242febccb4e1aadd53470cc4b3be79b07c18
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
src/plugins/bazaar/bazaarplugin.cpp | 4 ++--
src/plugins/clearcase/clearcaseplugin.cpp | 3 ++-
src/plugins/cvs/cvsplugin.cpp | 3 ++-
src/plugins/git/gitsubmiteditor.cpp | 3 ++-
src/plugins/mercurial/mercurialplugin.cpp | 4 ++--
src/plugins/perforce/perforceplugin.cpp | 3 ++-
src/plugins/subversion/subversionplugin.cpp | 3 ++-
src/plugins/vcsbase/vcsbasesubmiteditor.cpp | 2 +-
src/plugins/vcsbase/vcsbasesubmiteditor.h | 2 +-
9 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index 1bc842a1ccb..5214e4fc288 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -596,8 +596,8 @@ void BazaarPlugin::showCommitWidget(const QList<VcsBaseClient::StatusItem> &stat
setSubmitEditor(commitEditor);
commitEditor->registerActions(m_editorUndo, m_editorRedo, m_editorCommit, m_editorDiff);
- connect(commitEditor, SIGNAL(diffSelectedFiles(QStringList)),
- this, SLOT(diffFromEditorSelected(QStringList)));
+ connect(commitEditor, &VcsBaseSubmitEditor::diffSelectedFiles,
+ this, &BazaarPlugin::diffFromEditorSelected);
commitEditor->setCheckScriptWorkingDirectory(m_submitRepository);
const QString msg = tr("Commit changes for \"%1\".").
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index c9aef6eb3e2..c20d63fa022 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -785,7 +785,8 @@ ClearCaseSubmitEditor *ClearCasePlugin::openClearCaseSubmitEditor(const QString
ClearCaseSubmitEditor *submitEditor = qobject_cast<ClearCaseSubmitEditor*>(editor);
QTC_ASSERT(submitEditor, return 0);
submitEditor->registerActions(m_submitUndoAction, m_submitRedoAction, m_checkInSelectedAction, m_checkInDiffAction);
- connect(submitEditor, SIGNAL(diffSelectedFiles(QStringList)), this, SLOT(diffCheckInFiles(QStringList)));
+ connect(submitEditor, &VcsBaseSubmitEditor::diffSelectedFiles,
+ this, &ClearCasePlugin::diffCheckInFiles);
submitEditor->setCheckScriptWorkingDirectory(m_checkInView);
submitEditor->setIsUcm(isUcm);
return submitEditor;
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index 1c3b2024f1a..ad2b1e38a6f 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -551,7 +551,8 @@ CvsSubmitEditor *CvsPlugin::openCVSSubmitEditor(const QString &fileName)
CvsSubmitEditor *submitEditor = qobject_cast<CvsSubmitEditor*>(editor);
QTC_ASSERT(submitEditor, return 0);
submitEditor->registerActions(m_submitUndoAction, m_submitRedoAction, m_submitCurrentLogAction, m_submitDiffAction);
- connect(submitEditor, SIGNAL(diffSelectedFiles(QStringList)), this, SLOT(diffCommitFiles(QStringList)));
+ connect(submitEditor, &VcsBaseSubmitEditor::diffSelectedFiles,
+ this, &CvsPlugin::diffCommitFiles);
return submitEditor;
}
diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp
index 230751b1284..298e154c877 100644
--- a/src/plugins/git/gitsubmiteditor.cpp
+++ b/src/plugins/git/gitsubmiteditor.cpp
@@ -132,7 +132,8 @@ GitSubmitEditor::GitSubmitEditor(const VcsBaseSubmitEditorParameters *parameters
m_firstUpdate(true),
m_commitDataFetcher(0)
{
- connect(this, SIGNAL(diffSelectedFiles(QList<int>)), this, SLOT(slotDiffSelected(QList<int>)));
+ connect(this, &VcsBaseSubmitEditor::diffSelectedRows,
+ this, &GitSubmitEditor::slotDiffSelected);
connect(submitEditorWidget(), SIGNAL(show(QString)), this, SLOT(showCommit(QString)));
}
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index 1c077cde2ba..b557cc68c88 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -576,8 +576,8 @@ void MercurialPlugin::showCommitWidget(const QList<VcsBaseClient::StatusItem> &s
setSubmitEditor(commitEditor);
commitEditor->registerActions(editorUndo, editorRedo, editorCommit, editorDiff);
- connect(commitEditor, SIGNAL(diffSelectedFiles(QStringList)),
- this, SLOT(diffFromEditorSelected(QStringList)));
+ connect(commitEditor, &VcsBaseSubmitEditor::diffSelectedFiles,
+ this, &MercurialPlugin::diffFromEditorSelected);
commitEditor->setCheckScriptWorkingDirectory(m_submitRepository);
const QString msg = tr("Commit changes for \"%1\".").
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index f9582b03cfa..912d149dc42 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -666,7 +666,8 @@ IEditor *PerforcePlugin::openPerforceSubmitEditor(const QString &fileName, const
setSubmitEditor(submitEditor);
submitEditor->restrictToProjectFiles(depotFileNames);
submitEditor->registerActions(m_undoAction, m_redoAction, m_submitCurrentLogAction, m_diffSelectedFiles);
- connect(submitEditor, SIGNAL(diffSelectedFiles(QStringList)), this, SLOT(slotSubmitDiff(QStringList)));
+ connect(submitEditor, &VcsBaseSubmitEditor::diffSelectedFiles,
+ this, &PerforcePlugin::slotSubmitDiff);
submitEditor->setCheckScriptWorkingDirectory(m_commitWorkingDirectory);
return editor;
}
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index 5a7ed50758f..d8d9cb60670 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -517,7 +517,8 @@ SubversionSubmitEditor *SubversionPlugin::openSubversionSubmitEditor(const QStri
QTC_ASSERT(submitEditor, return 0);
setSubmitEditor(submitEditor);
submitEditor->registerActions(m_submitUndoAction, m_submitRedoAction, m_submitCurrentLogAction, m_submitDiffAction);
- connect(submitEditor, SIGNAL(diffSelectedFiles(QStringList)), this, SLOT(diffCommitFiles(QStringList)));
+ connect(submitEditor, &VcsBaseSubmitEditor::diffSelectedFiles,
+ this, &SubversionPlugin::diffCommitFiles);
submitEditor->setCheckScriptWorkingDirectory(m_commitRepository);
return submitEditor;
}
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
index dd9c2cc4439..b0610527c12 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -510,7 +510,7 @@ QStringList VcsBaseSubmitEditor::rowsToFiles(const QList<int> &rows) const
void VcsBaseSubmitEditor::slotDiffSelectedVcsFiles(const QList<int> &rawList)
{
if (d->m_parameters->diffType == VcsBaseSubmitEditorParameters::DiffRows)
- emit diffSelectedFiles(rawList);
+ emit diffSelectedRows(rawList);
else
emit diffSelectedFiles(rowsToFiles(rawList));
}
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.h b/src/plugins/vcsbase/vcsbasesubmiteditor.h
index 0f7b50bf066..4adefffd3b0 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.h
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.h
@@ -136,7 +136,7 @@ public:
signals:
void diffSelectedFiles(const QStringList &files);
- void diffSelectedFiles(const QList<int> &rows);
+ void diffSelectedRows(const QList<int> &rows);
private slots:
void slotDiffSelectedVcsFiles(const QList<int> &rawList);
--
GitLab