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

Mercurial: Remove instance() clutter

Browse Source 
Task-number: QTCREATORBUG-9763

Change-Id: Ifd7251ee018447e7d910768ae4befb19df5d72c2
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Tobias Hunger
2013-08-02 12:23:56 +02:00
committed by hjk
parent f67275dc15
commit 33a5034482
5 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/mercurial/optionspage.cpp
View File

@@ -50,7 +50,7 @@ OptionsPageWidget::OptionsPageWidget(QWidget *parent) :
MercurialSettings OptionsPageWidget::settings() const
{
MercurialSettings s = MercurialPlugin::instance()->settings();
MercurialSettings s = MercurialPlugin::settings();
s.setValue(MercurialSettings::binaryPathKey, m_ui.commandChooser->rawPath());
s.setValue(MercurialSettings::userNameKey, m_ui.defaultUsernameLineEdit->text().trimmed());
s.setValue(MercurialSettings::userEmailKey, m_ui.defaultEmailLineEdit->text().trimmed());
@@ -99,7 +99,7 @@ QWidget *OptionsPage::createPage(QWidget *parent)
{
if (!optionsPageWidget)
optionsPageWidget = new OptionsPageWidget(parent);
optionsPageWidget->setSettings(MercurialPlugin::instance()->settings());
optionsPageWidget->setSettings(MercurialPlugin::settings());
if (m_searchKeywords.isEmpty())
m_searchKeywords = optionsPageWidget->searchKeywords();
return optionsPageWidget;
@@ -109,11 +109,10 @@ void OptionsPage::apply()
{
if (!optionsPageWidget)
return;
MercurialPlugin *plugin = MercurialPlugin::instance();
const MercurialSettings newSettings = optionsPageWidget->settings();
if (newSettings != plugin->settings()) {
if (newSettings != MercurialPlugin::settings()) {
//assume success and emit signal that settings are changed;
plugin->setSettings(newSettings);
MercurialPlugin::setSettings(newSettings);
newSettings.writeSettings(Core::ICore::settings());
emit settingsChanged();
}