From d2cf2d781cf7db3b3feb42170f557b65cbf6d8c8 Mon Sep 17 00:00:00 2001 From: Chani Armitage Date: Tue, 25 Aug 2009 03:22:15 +0000 Subject: [PATCH] replace hasConfig functions with a .desktop entry svn path=/trunk/KDE/kdelibs/; revision=1015267 --- containmentactions.cpp | 10 ---------- containmentactions.h | 10 ---------- private/containmentactions_p.h | 4 +--- servicetypes/plasma-containmentactions.desktop | 3 +++ 4 files changed, 4 insertions(+), 23 deletions(-) diff --git a/containmentactions.cpp b/containmentactions.cpp index fa83abb0b..bbb15286c 100644 --- a/containmentactions.cpp +++ b/containmentactions.cpp @@ -222,16 +222,6 @@ void ContainmentActions::setConfigurationRequired(bool needsConfig) d->needsConfig = needsConfig; } -bool ContainmentActions::hasConfigurationInterface() const -{ - return d->hasConfig; -} - -void ContainmentActions::setHasConfigurationInterface(bool hasConfig) -{ - d->hasConfig = hasConfig; -} - QString ContainmentActions::eventToString(QEvent *event) { QString trigger; diff --git a/containmentactions.h b/containmentactions.h index 261c47fc5..400b8978a 100644 --- a/containmentactions.h +++ b/containmentactions.h @@ -195,11 +195,6 @@ class PLASMA_EXPORT ContainmentActions : public QObject */ bool configurationRequired() const; - /** - * @return true if the containmentactions has a config UI - */ - bool hasConfigurationInterface() const; - /** * Turns a mouse or wheel event into a string suitable for a ContainmentActions * @return the string representation of the event @@ -235,11 +230,6 @@ class PLASMA_EXPORT ContainmentActions : public QObject */ void setConfigurationRequired(bool needsConfiguring = true); - /** - * set whether the containmentactions has a config UI - */ - void setHasConfigurationInterface(bool hasConfig = true); - /** * @return the containment the plugin is associated with. */ diff --git a/private/containmentactions_p.h b/private/containmentactions_p.h index a8c55d08e..296e0811b 100644 --- a/private/containmentactions_p.h +++ b/private/containmentactions_p.h @@ -32,8 +32,7 @@ public: q(containmentActions), containmentActionsDescription(service), initialized(false), - needsConfig(false), - hasConfig(false) + needsConfig(false) { }; @@ -45,7 +44,6 @@ public: KServiceAction mode; bool initialized : 1; bool needsConfig : 1; - bool hasConfig : 1; }; } // namespace Plasma diff --git a/servicetypes/plasma-containmentactions.desktop b/servicetypes/plasma-containmentactions.desktop index ce800d225..135aec972 100644 --- a/servicetypes/plasma-containmentactions.desktop +++ b/servicetypes/plasma-containmentactions.desktop @@ -12,3 +12,6 @@ Comment[uk]=Дії контейнерів Плазми Comment[x-test]=xxPlasma ContainmentActionsxx Comment[zh_TW]=Plasma 容器動作 +[PropertyDef::X-Plasma-HasConfigurationInterface] +Type=bool +