Merge branch 'frameworks' of git://anongit.kde.org/kdelibs into frameworks
This commit is contained in:
commit
c35036a29c
10
applet.cpp
10
applet.cpp
@ -350,16 +350,6 @@ void Applet::saveState(KConfigGroup &group) const
|
||||
}
|
||||
}
|
||||
|
||||
KConfigGroup Applet::config(const QString &group) const
|
||||
{
|
||||
if (d->transient) {
|
||||
return KConfigGroup(KGlobal::config(), "PlasmaTransientsConfig");
|
||||
}
|
||||
|
||||
KConfigGroup cg = config();
|
||||
return KConfigGroup(&cg, group);
|
||||
}
|
||||
|
||||
KConfigGroup Applet::config() const
|
||||
{
|
||||
if (d->transient) {
|
||||
|
9
applet.h
9
applet.h
@ -107,15 +107,6 @@ class PLASMA_EXPORT Applet : public QGraphicsWidget
|
||||
**/
|
||||
KConfigGroup config() const;
|
||||
|
||||
/**
|
||||
* Returns a config group with the name provided. This ensures
|
||||
* that the group name is properly namespaced to avoid collision
|
||||
* with other applets that may be sharing this config file
|
||||
*
|
||||
* @param group the name of the group to access
|
||||
**/
|
||||
KConfigGroup config(const QString &group) const;
|
||||
|
||||
/**
|
||||
* Saves state information about this applet that will
|
||||
* be accessed when next instantiated in the restore(KConfigGroup&) method.
|
||||
|
Loading…
Reference in New Issue
Block a user