aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/git/gitclient.cpp
diff options
context:
space:
mode:
authorBill King <[email protected]>2010-06-11 13:35:22 +1000
committerBill King <[email protected]>2010-06-11 13:35:22 +1000
commit55edbe1c5b5a258ff106da98fd04f0c366bc31c0 (patch)
treee6cf6322b712c0128fc7078fb81c306021b2a2cd /src/plugins/git/gitclient.cpp
parent9a075e2c4843832774f1e58b71e709a43cc13083 (diff)
Fix parameters hidden by local variables.
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
-rw-r--r--src/plugins/git/gitclient.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 18e24bce510..706400b0702 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -1785,8 +1785,8 @@ void GitClient::setSettings(const GitSettings &s)
{
if (s != m_settings) {
m_settings = s;
- if (QSettings *s = m_core->settings())
- m_settings.toSettings(s);
+ if (QSettings *coreSettings = m_core->settings())
+ m_settings.toSettings(coreSettings);
m_binaryPath = m_settings.gitBinaryPath();
m_cachedGitVersion = 0u;
m_hasCachedGitVersion = false;