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

vcsbase: rename slot VCSBaseClient::settingsChanged()

Browse Source 
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
This commit is contained in:
cerf
2011-08-22 15:33:03 +00:00
committed by Tobias Hunger
parent 3907824b4d
commit 0dcd66ef46
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,7 +163,7 @@ bool BazaarPlugin::initialize(const QStringList &arguments, QString *errorMessag
addAutoReleasedObject(m_optionsPage); addAutoReleasedObject(m_optionsPage);
m_bazaarSettings.readSettings(m_core->settings()); 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))); connect(m_client, SIGNAL(changed(QVariant)), versionControl(), SLOT(changed(QVariant)));
static const char *describeSlot = SLOT(view(QString,QString)); static const char *describeSlot = SLOT(view(QString,QString));

2
src/plugins/mercurial/mercurialplugin.cpp
View File

@@ -166,7 +166,7 @@ bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString *
addAutoReleasedObject(optionsPage); addAutoReleasedObject(optionsPage);
mercurialSettings.readSettings(core->settings()); 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))); connect(m_client, SIGNAL(changed(QVariant)), versionControl(), SLOT(changed(QVariant)));

2
src/plugins/vcsbase/vcsbaseclient.cpp
View File

@@ -479,7 +479,7 @@ VCSBaseClientSettings *VCSBaseClient::settings() const
return d->m_clientSettings; return d->m_clientSettings;
} }
void VCSBaseClient::settingsChanged() void VCSBaseClient::handleSettingsChanged()
{ {
if (d->m_jobManager) { if (d->m_jobManager) {
d->m_jobManager->setSettings(settings()->binary(), d->m_jobManager->setSettings(settings()->binary(),

2
src/plugins/vcsbase/vcsbaseclient.h
View File

@@ -121,7 +121,7 @@ signals:
public slots: public slots:
void view(const QString &source, const QString &id); void view(const QString &source, const QString &id);
void settingsChanged(); void handleSettingsChanged();
protected: protected:
enum VCSCommand enum VCSCommand