diff --git a/applet.cpp b/applet.cpp index a2e055dce..e6790a717 100644 --- a/applet.cpp +++ b/applet.cpp @@ -581,7 +581,7 @@ void Applet::resetConfigurationObject() d->mainConfig = 0; } -ConfigXml* Applet::configXml() const +ConfigXml* Applet::configScheme() const { return d->configXml; } @@ -1243,7 +1243,7 @@ void Applet::showConfigurationInterface() dialog->enableButtonApply(true); } - emit launchActivated(); + emit releaseVisualFocus(); } void Applet::createConfigurationInterface(KConfigDialog *parent) diff --git a/applet.h b/applet.h index 8bb49feb8..b2b9ece3f 100644 --- a/applet.h +++ b/applet.h @@ -141,7 +141,7 @@ class PLASMA_EXPORT Applet : public QGraphicsWidget * * @return config skeleton object, or 0 if none **/ - ConfigXml* configXml() const; + ConfigXml* configScheme() const; /** * Loads the given DataEngine @@ -473,7 +473,7 @@ class PLASMA_EXPORT Applet : public QGraphicsWidget * to ensure that the Dashboard view in Plasma hides when such an event is * triggered by an item it is displaying. */ - void launchActivated(); + void releaseVisualFocus(); /** * Emitted whenever the applet makes a geometry change, so that views diff --git a/containment.cpp b/containment.cpp index 9de34d04d..1526cd280 100644 --- a/containment.cpp +++ b/containment.cpp @@ -986,7 +986,7 @@ Applet* Containment::Private::addApplet(const QString& name, const QVariantList& //kDebug() << applet->name() << "sizehint:" << applet->sizeHint() << "geometry:" << applet->geometry(); connect(applet, SIGNAL(configNeedsSaving()), q, SIGNAL(configNeedsSaving())); - connect(applet, SIGNAL(launchActivated()), q, SIGNAL(launchActivated())); + connect(applet, SIGNAL(releaseVisualFocus()), q, SIGNAL(releaseVisualFocus())); q->addApplet(applet, appletGeometry.topLeft(), delayInit); return applet; } diff --git a/corona.cpp b/corona.cpp index aa5a4ab7a..523cefdfd 100644 --- a/corona.cpp +++ b/corona.cpp @@ -165,7 +165,7 @@ public: containments.append(containment); connect(containment, SIGNAL(destroyed(QObject*)), q, SLOT(containmentDestroyed(QObject*))); connect(containment, SIGNAL(configNeedsSaving()), q, SLOT(scheduleConfigSync())); - connect(containment, SIGNAL(launchActivated()), q, SIGNAL(launchActivated())); + connect(containment, SIGNAL(releaseVisualFocus()), q, SIGNAL(releaseVisualFocus())); connect(containment, SIGNAL(screenChanged(int,int,Plasma::Containment*)), q, SIGNAL(screenOwnerChanged(int,int,Plasma::Containment*))); diff --git a/corona.h b/corona.h index dbed30294..a8ef959a8 100644 --- a/corona.h +++ b/corona.h @@ -146,7 +146,7 @@ Q_SIGNALS: * to ensure that the Dashboard view in Plasma hides when such an event is * triggered by an item it is displaying. */ - void launchActivated(); + void releaseVisualFocus(); protected: /**