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

Vcs: rename overload SubmitEditor::diffSelectedFiles() for rows

Browse Source 
-> 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>
This commit is contained in:
Hugues Delorme
2015-03-04 14:56:56 +01:00
parent 2b954973d8
commit 12fac12e8f
9 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/bazaar/bazaarplugin.cpp
View File

@@ -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\".").

3
src/plugins/clearcase/clearcaseplugin.cpp
View File

@@ -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;

3
src/plugins/cvs/cvsplugin.cpp
View File

@@ -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;
}

3
src/plugins/git/gitsubmiteditor.cpp
View File

@@ -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)));
}

4
src/plugins/mercurial/mercurialplugin.cpp
View File

@@ -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\".").

3
src/plugins/perforce/perforceplugin.cpp
View File

@@ -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;
}

3
src/plugins/subversion/subversionplugin.cpp
View File

@@ -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;
}

2
src/plugins/vcsbase/vcsbasesubmiteditor.cpp
View File

@@ -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));
}

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

@@ -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);