From d506a005ac4e391d165e14c4154a2dce99a81004 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 30 Jan 2020 17:56:56 +0100 Subject: [PATCH] Vcs: Remove some unneded indirections Change-Id: Ie9d976c06ff424fb106cb344bedb789c9b99e657 Reviewed-by: Orgad Shaneh --- src/plugins/bazaar/bazaarplugin.cpp | 13 ++++++------- src/plugins/git/gitplugin.cpp | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index 336d74cc908..eebe1824421 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/src/plugins/bazaar/bazaarplugin.cpp @@ -198,10 +198,10 @@ public: void createRepositoryActions(const Core::Context &context); // Variables - BazaarSettings m_bazaarSettings; - BazaarClient m_client{&m_bazaarSettings}; + BazaarSettings m_settings; + BazaarClient m_client{&m_settings}; - OptionsPage m_optionsPage{[this] { configurationChanged(); }, &m_bazaarSettings}; + OptionsPage m_optionsPage{[this] { configurationChanged(); }, &m_settings}; VcsSubmitEditorFactory m_submitEditorFactory { &submitEditorParameters, @@ -475,7 +475,7 @@ void BazaarPluginPrivate::logRepository() const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return); QStringList extraOptions; - extraOptions += QLatin1String("--limit=") + QString::number(m_client.settings().intValue(BazaarSettings::logCountKey)); + extraOptions += QLatin1String("--limit=") + QString::number(m_settings.intValue(BazaarSettings::logCountKey)); m_client.log(state.topLevel(), QStringList(), extraOptions); } @@ -661,10 +661,9 @@ void BazaarPluginPrivate::showCommitWidget(const QListdocument()->setPreferredDisplayName(msg); const BranchInfo branch = m_client.synchronousBranchQuery(m_submitRepository); - const VcsBaseClientSettings &s = m_client.settings(); commitEditor->setFields(m_submitRepository, branch, - s.stringValue(BazaarSettings::userNameKey), - s.stringValue(BazaarSettings::userEmailKey), status); + m_settings.stringValue(BazaarSettings::userNameKey), + m_settings.stringValue(BazaarSettings::userEmailKey), status); } void BazaarPluginPrivate::diffFromEditorSelected(const QStringList &files) diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index c43f32b1957..7216bfc7732 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -1151,7 +1151,7 @@ void GitPluginPrivate::pull() const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return); QString topLevel = state.topLevel(); - bool rebase = client()->settings().boolValue(GitSettings::pullRebaseKey); + bool rebase = m_settings.boolValue(GitSettings::pullRebaseKey); if (!rebase) { QString currentBranch = m_gitClient->synchronousCurrentLocalBranch(topLevel); @@ -1486,7 +1486,7 @@ void GitPluginPrivate::updateRepositoryBrowserAction() { const bool repositoryEnabled = currentState().hasTopLevel(); const bool hasRepositoryBrowserCmd - = !client()->settings().stringValue(GitSettings::repositoryBrowserCmd).isEmpty(); + = !m_settings.stringValue(GitSettings::repositoryBrowserCmd).isEmpty(); m_repositoryBrowserAction->setEnabled(repositoryEnabled && hasRepositoryBrowserCmd); }