From 11a5a957d0c2b32104b41b0dc9b2c766af11a559 Mon Sep 17 00:00:00 2001 From: Rob Scheepmaker Date: Thu, 11 Sep 2008 22:51:43 +0000 Subject: [PATCH] Renamed extender to internal:extender to avoid possible name clashes. svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=860083 --- applet.cpp | 4 ++-- extenderitem.cpp | 2 +- servicetypes/plasma-applet-extenderapplet.desktop | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/applet.cpp b/applet.cpp index c2225bc03..d885bfa88 100644 --- a/applet.cpp +++ b/applet.cpp @@ -1359,7 +1359,7 @@ Applet* Applet::load(const QString& appletName, uint appletId, const QVariantLis KPluginLoader plugin(*offer); - if (!Plasma::isPluginVersionCompatible(plugin.pluginVersion()) && (appletName != "extender")) { + if (!Plasma::isPluginVersionCompatible(plugin.pluginVersion()) && (appletName != "internal:extender")) { return 0; } @@ -1368,7 +1368,7 @@ Applet* Applet::load(const QString& appletName, uint appletId, const QVariantLis QString error; Applet *applet; - if (appletName == "extender") { + if (appletName == "internal:extender") { applet = new ExtenderApplet(0, allArgs); } else { applet = offer->createInstance(0, allArgs, &error); diff --git a/extenderitem.cpp b/extenderitem.cpp index 922567bec..ffe5dfcc7 100644 --- a/extenderitem.cpp +++ b/extenderitem.cpp @@ -866,7 +866,7 @@ void ExtenderItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) mousePos = d->scenePosFromScreenPos(event->screenPos() - d->mousePos); foreach (Containment *containment, corona->containments()) { if (containment->sceneBoundingRect().contains(mousePos)) { - Applet *applet = containment->addApplet("extender", + Applet *applet = containment->addApplet("internal:extender", QVariantList(), QRectF(mousePos, size())); setExtender(applet->extender()); diff --git a/servicetypes/plasma-applet-extenderapplet.desktop b/servicetypes/plasma-applet-extenderapplet.desktop index 6286c8687..a58c71a30 100644 --- a/servicetypes/plasma-applet-extenderapplet.desktop +++ b/servicetypes/plasma-applet-extenderapplet.desktop @@ -2,5 +2,5 @@ Name=Internal Extender Container Type=Service X-KDE-ServiceTypes=Plasma/Applet -X-KDE-PluginInfo-Name=extender +X-KDE-PluginInfo-Name=internal:extender X-KDE-PluginInfo-EnabledByDefault=false