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

Git: Avoid repeating calls to currentState() in updateActions

Browse Source 
Change-Id: I9352b7d9ad064e6dc4eb694a9175c8f32b5b25c8
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2017-02-03 16:31:17 +02:00
committed by Orgad Shaneh
parent 67933e4c1f
commit 28b61a9f9c
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1319,13 +1319,14 @@ void GitPlugin::stashList()
void GitPlugin::updateActions(VcsBasePlugin::ActionState as) void GitPlugin::updateActions(VcsBasePlugin::ActionState as)
{ {
const bool repositoryEnabled = currentState().hasTopLevel(); const VcsBasePluginState state = currentState();
const bool repositoryEnabled = state.hasTopLevel();
if (m_stashDialog) if (m_stashDialog)
m_stashDialog->refresh(currentState().topLevel(), false); m_stashDialog->refresh(state.topLevel(), false);
if (m_branchDialog) if (m_branchDialog)
m_branchDialog->refresh(currentState().topLevel(), false); m_branchDialog->refresh(state.topLevel(), false);
if (m_remoteDialog) if (m_remoteDialog)
m_remoteDialog->refresh(currentState().topLevel(), false); m_remoteDialog->refresh(state.topLevel(), false);
m_commandLocator->setEnabled(repositoryEnabled); m_commandLocator->setEnabled(repositoryEnabled);
if (!enableMenuAction(as, m_menuAction)) if (!enableMenuAction(as, m_menuAction))
@@ -1334,12 +1335,12 @@ void GitPlugin::updateActions(VcsBasePlugin::ActionState as)
updateVersionWarning(); updateVersionWarning();
// Note: This menu is visible if there is no repository. Only // Note: This menu is visible if there is no repository. Only
// 'Create Repository'/'Show' actions should be available. // 'Create Repository'/'Show' actions should be available.
const QString fileName = currentState().currentFileName(); const QString fileName = state.currentFileName();
foreach (ParameterAction *fileAction, m_fileActions) foreach (ParameterAction *fileAction, m_fileActions)
fileAction->setParameter(fileName); fileAction->setParameter(fileName);
// If the current file looks like a patch, offer to apply // If the current file looks like a patch, offer to apply
m_applyCurrentFilePatchAction->setParameter(currentState().currentPatchFileDisplayName()); m_applyCurrentFilePatchAction->setParameter(state.currentPatchFileDisplayName());
const QString projectName = currentState().currentProjectName(); const QString projectName = state.currentProjectName();
foreach (ParameterAction *projectAction, m_projectActions) foreach (ParameterAction *projectAction, m_projectActions)
projectAction->setParameter(projectName); projectAction->setParameter(projectName);
@@ -1347,7 +1348,7 @@ void GitPlugin::updateActions(VcsBasePlugin::ActionState as)
repositoryAction->setEnabled(repositoryEnabled); repositoryAction->setEnabled(repositoryEnabled);
m_submoduleUpdateAction->setVisible(repositoryEnabled m_submoduleUpdateAction->setVisible(repositoryEnabled
&& !m_gitClient->submoduleList(currentState().topLevel()).isEmpty()); && !m_gitClient->submoduleList(state.topLevel()).isEmpty());
updateContinueAndAbortCommands(); updateContinueAndAbortCommands();
updateRepositoryBrowserAction(); updateRepositoryBrowserAction();