summaryrefslogtreecommitdiff
path: root/src/plugins/mercurial/mercurialplugin.cpp
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@theqtcompany.com>2015-03-26 12:22:29 +0100
committerTobias Hunger <tobias.hunger@theqtcompany.com>2015-04-08 09:30:44 +0000
commit90ce38da39ba7acf6f7883a86916abcfc7efe23c (patch)
tree48a34950ff0b1a64d1f052ede5609e3a949837fc /src/plugins/mercurial/mercurialplugin.cpp
parentd3100774f9b2b342fe36b9b3d213934f79e96b64 (diff)
downloadqt-creator-90ce38da39ba7acf6f7883a86916abcfc7efe23c.tar.gz
Vcs: Move handling of settings from VcsBaseClient to VcsBaseClientImpl
... and update users of that functionality accordingly. Unexpected plus: Now every supported VCS actually saves their setting when requested. Change-Id: I02db7b2ce14e5f52d26409b2a01aea290c2a294a Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/mercurial/mercurialplugin.cpp')
-rw-r--r--src/plugins/mercurial/mercurialplugin.cpp16
1 files changed, 1 insertions, 15 deletions
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index a7dcb65b26..4f0799407a 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -136,12 +136,11 @@ bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString *
{
Core::Context context(Constants::MERCURIAL_CONTEXT);
- m_client = new MercurialClient(&mercurialSettings);
+ m_client = new MercurialClient;
initializeVcs(new MercurialControl(m_client), context);
optionsPage = new OptionsPage();
addAutoReleasedObject(optionsPage);
- mercurialSettings.readSettings(core->settings());
connect(m_client, SIGNAL(changed(QVariant)), versionControl(), SLOT(changed(QVariant)));
connect(m_client, SIGNAL(needUpdate()), this, SLOT(update()));
@@ -176,19 +175,6 @@ bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString *
return true;
}
-const MercurialSettings &MercurialPlugin::settings()
-{
- return m_instance->mercurialSettings;
-}
-
-void MercurialPlugin::setSettings(const MercurialSettings &settings)
-{
- if (settings != m_instance->mercurialSettings) {
- m_instance->mercurialSettings = settings;
- static_cast<MercurialControl *>(m_instance->versionControl())->emitConfigurationChanged();
- }
-}
-
void MercurialPlugin::createMenu(const Core::Context &context)
{
// Create menu item for Mercurial