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

Vcs: Remove some unneded indirections

Browse Source 
Change-Id: Ie9d976c06ff424fb106cb344bedb789c9b99e657
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2020-01-30 17:56:56 +01:00
parent 320958f2f5
commit d506a005ac
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/bazaar/bazaarplugin.cpp
View File

@@ -198,10 +198,10 @@ public:
void createRepositoryActions(const Core::Context &context); void createRepositoryActions(const Core::Context &context);
// Variables // Variables
BazaarSettings m_bazaarSettings; BazaarSettings m_settings;
BazaarClient m_client{&m_bazaarSettings}; BazaarClient m_client{&m_settings};
OptionsPage m_optionsPage{[this] { configurationChanged(); }, &m_bazaarSettings}; OptionsPage m_optionsPage{[this] { configurationChanged(); }, &m_settings};
VcsSubmitEditorFactory m_submitEditorFactory { VcsSubmitEditorFactory m_submitEditorFactory {
&submitEditorParameters, &submitEditorParameters,
@@ -475,7 +475,7 @@ void BazaarPluginPrivate::logRepository()
const VcsBasePluginState state = currentState(); const VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return); QTC_ASSERT(state.hasTopLevel(), return);
QStringList extraOptions; 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); m_client.log(state.topLevel(), QStringList(), extraOptions);
} }
@@ -661,10 +661,9 @@ void BazaarPluginPrivate::showCommitWidget(const QList<VcsBaseClient::StatusItem
commitEditor->document()->setPreferredDisplayName(msg); commitEditor->document()->setPreferredDisplayName(msg);
const BranchInfo branch = m_client.synchronousBranchQuery(m_submitRepository); const BranchInfo branch = m_client.synchronousBranchQuery(m_submitRepository);
const VcsBaseClientSettings &s = m_client.settings();
commitEditor->setFields(m_submitRepository, branch, commitEditor->setFields(m_submitRepository, branch,
s.stringValue(BazaarSettings::userNameKey), m_settings.stringValue(BazaarSettings::userNameKey),
s.stringValue(BazaarSettings::userEmailKey), status); m_settings.stringValue(BazaarSettings::userEmailKey), status);
} }
void BazaarPluginPrivate::diffFromEditorSelected(const QStringList &files) void BazaarPluginPrivate::diffFromEditorSelected(const QStringList &files)

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

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