From 0dcd66ef46d836758ddb61dca88063e07c64b56d Mon Sep 17 00:00:00 2001
From: cerf <delorme.hugues@gmail.com>
Date: Mon, 22 Aug 2011 15:33:03 +0000
Subject: [PATCH] vcsbase: rename slot VCSBaseClient::settingsChanged()
Rename VCSBaseClient::settingsChanged() to handleSettingsChanged().
This avoids confusion with a signal (note : Bazaar and Mercurial
plugins are impacted)
Change-Id: I8afd8d60be300088081338a4ed682c2760ba42eb
Merge-request: 358
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/3336
---
src/plugins/bazaar/bazaarplugin.cpp | 2 +-
src/plugins/mercurial/mercurialplugin.cpp | 2 +-
src/plugins/vcsbase/vcsbaseclient.cpp | 2 +-
src/plugins/vcsbase/vcsbaseclient.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index 493354a4c26..2b3e6b3b7c9 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -163,7 +163,7 @@ bool BazaarPlugin::initialize(const QStringList &arguments, QString *errorMessag
addAutoReleasedObject(m_optionsPage);
m_bazaarSettings.readSettings(m_core->settings());
- connect(m_optionsPage, SIGNAL(settingsChanged()), m_client, SLOT(settingsChanged()));
+ connect(m_optionsPage, SIGNAL(settingsChanged()), m_client, SLOT(handleSettingsChanged()));
connect(m_client, SIGNAL(changed(QVariant)), versionControl(), SLOT(changed(QVariant)));
static const char *describeSlot = SLOT(view(QString,QString));
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index 7c5632b663d..48c6d1fa39c 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -166,7 +166,7 @@ bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString *
addAutoReleasedObject(optionsPage);
mercurialSettings.readSettings(core->settings());
- connect(optionsPage, SIGNAL(settingsChanged()), m_client, SLOT(settingsChanged()));
+ connect(optionsPage, SIGNAL(settingsChanged()), m_client, SLOT(handleSettingsChanged()));
connect(m_client, SIGNAL(changed(QVariant)), versionControl(), SLOT(changed(QVariant)));
diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp
index 9a5743e3134..7c4d206dd91 100644
--- a/src/plugins/vcsbase/vcsbaseclient.cpp
+++ b/src/plugins/vcsbase/vcsbaseclient.cpp
@@ -479,7 +479,7 @@ VCSBaseClientSettings *VCSBaseClient::settings() const
return d->m_clientSettings;
}
-void VCSBaseClient::settingsChanged()
+void VCSBaseClient::handleSettingsChanged()
{
if (d->m_jobManager) {
d->m_jobManager->setSettings(settings()->binary(),
diff --git a/src/plugins/vcsbase/vcsbaseclient.h b/src/plugins/vcsbase/vcsbaseclient.h
index ccc7ea2e56b..599d73223ab 100644
--- a/src/plugins/vcsbase/vcsbaseclient.h
+++ b/src/plugins/vcsbase/vcsbaseclient.h
@@ -121,7 +121,7 @@ signals:
public slots:
void view(const QString &source, const QString &id);
- void settingsChanged();
+ void handleSettingsChanged();
protected:
enum VCSCommand
--
GitLab