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

Git: Reduce indirection in submit editor

Browse Source 
Change-Id: Ic4e897d5c8ec82dbbffd5bd9fe9af84491c4402f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2016-01-05 23:38:08 +02:00
committed by Orgad Shaneh
parent eb375d734d
commit 70958c4c07
4 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/git/gitplugin.cpp
View File

@@ -639,16 +639,6 @@ GitVersionControl *GitPlugin::gitVersionControl() const
return static_cast<GitVersionControl *>(versionControl());
}
void GitPlugin::submitEditorDiff(const QStringList &unstaged, const QStringList &staged)
{
m_gitClient->diffFiles(m_submitRepository, unstaged, staged);
}
void GitPlugin::submitEditorMerge(const QStringList &unmerged)
{
m_gitClient->merge(m_submitRepository, unmerged);
}
void GitPlugin::diffCurrentFile()
{
const VcsBasePluginState state = currentState();
@@ -960,10 +950,6 @@ IEditor *GitPlugin::openSubmitEditor(const QString &fileName, const CommitData &
IDocument *document = submitEditor->document();
document->setPreferredDisplayName(title);
VcsBasePlugin::setSource(document, m_submitRepository);
connect(submitEditor, &GitSubmitEditor::diff, this, &GitPlugin::submitEditorDiff);
connect(submitEditor, &GitSubmitEditor::merge, this, &GitPlugin::submitEditorMerge);
connect(submitEditor, &GitSubmitEditor::show,
m_gitClient, [this](const QString &wd, const QString &c) { m_gitClient->show(wd, c); });
return editor;
}