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

Git: Remove function pointer in changeRelatedActions

Browse Source 
makes code more readable

Change-Id: I8f6369bf571144dde468546b8f47695fd4ffdf44
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Petar Perisin
2013-10-22 22:34:20 +02:00
parent e31426366b
commit 9bb93246c1
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/git/gitclient.h
View File

@@ -180,9 +180,8 @@ public:
QString revision = QString(), QString *errorMessage = 0,
bool revertStaging = true);
// Checkout branch
bool synchronousCheckout(const QString &workingDirectory, const QString &ref, QString *errorMessage);
bool synchronousCheckout(const QString &workingDirectory, const QString &ref)
{ return synchronousCheckout(workingDirectory, ref, 0); }
bool synchronousCheckout(const QString &workingDirectory, const QString &ref,
QString *errorMessage = 0);
void updateSubmodulesIfNeeded(const QString &workingDirectory, bool prompt);
// Do a stash and return identier.

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

@@ -894,24 +894,22 @@ void GitPlugin::startChangeRelatedAction()
if (!ensureAllDocumentsSaved())
return;
bool (GitClient::*commandFunction)(const QString&, const QString&);
switch (dialog.command()) {
case CherryPick:
commandFunction = &GitClient::synchronousCherryPick;
m_gitClient->synchronousCherryPick(workingDirectory, change);
break;
case Revert:
commandFunction = &GitClient::synchronousRevert;
m_gitClient->synchronousRevert(workingDirectory, change);
break;
case Checkout:
if (!m_gitClient->beginStashScope(workingDirectory, QLatin1String("Checkout")))
return;
commandFunction = &GitClient::synchronousCheckout;
m_gitClient->synchronousCheckout(workingDirectory, change);
break;
default:
return;
}
(m_gitClient->*commandFunction)(workingDirectory, change);
}
void GitPlugin::stageFile()