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

Git: s/GitPlugin::gitClient/GitPlugin::client/

Browse Source 
... same name as with almost all other plugins.

Change-Id: I964159044d86685735e8b1e816a0bf67e0576fd8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-03-27 12:00:46 +01:00
committed by Orgad Shaneh
parent 90ce38da39
commit 4f7844d6f5
18 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1110,7 +1110,7 @@ void GitPlugin::pull()
const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return);
QString topLevel = state.topLevel();
bool rebase = gitClient()->settings().boolValue(GitSettings::pullRebaseKey);
bool rebase = client()->settings().boolValue(GitSettings::pullRebaseKey);
if (!rebase) {
QString currentBranch = m_gitClient->synchronousCurrentLocalBranch(topLevel);
@@ -1417,11 +1417,11 @@ void GitPlugin::updateRepositoryBrowserAction()
{
const bool repositoryEnabled = currentState().hasTopLevel();
const bool hasRepositoryBrowserCmd
= !gitClient()->settings().stringValue(GitSettings::repositoryBrowserCmd).isEmpty();
= !client()->settings().stringValue(GitSettings::repositoryBrowserCmd).isEmpty();
m_repositoryBrowserAction->setEnabled(repositoryEnabled && hasRepositoryBrowserCmd);
}
GitClient *GitPlugin::gitClient() const
GitClient *GitPlugin::client() const
{
return m_gitClient;
}