From 6f4dc1cc4fd202807d055910850b1db295452cd7 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Wed, 19 May 2010 17:13:29 +0000 Subject: [PATCH] all the desktop/netbook scripting stuff is in the WorkspaceScripting namespace now svn path=/trunk/KDE/kdebase/workspace/; revision=1128578 --- appinterface.cpp | 5 +++++ appinterface.h | 5 +++++ applet.cpp | 5 +++++ applet.h | 4 ++++ containment.cpp | 5 +++++ containment.h | 5 +++++ layouttemplatepackagestructure.cpp | 5 +++++ layouttemplatepackagestructure.h | 4 ++++ scriptengine.cpp | 5 +++++ scriptengine.h | 5 +++++ widget.cpp | 4 ++++ widget.h | 5 +++++ 12 files changed, 57 insertions(+) diff --git a/appinterface.cpp b/appinterface.cpp index 6a9d33143..3c7384309 100644 --- a/appinterface.cpp +++ b/appinterface.cpp @@ -28,6 +28,9 @@ #include "scriptengine.h" +namespace WorkspaceScripting +{ + AppInterface::AppInterface(Plasma::Corona *corona, QObject *parent) : QObject(parent), m_corona(corona) @@ -137,5 +140,7 @@ QStringList AppInterface::knownContainmentTypes(const QString &type) const return containments; } +} + #include "appinterface.moc" diff --git a/appinterface.h b/appinterface.h index b3897f306..c15308595 100644 --- a/appinterface.h +++ b/appinterface.h @@ -32,6 +32,9 @@ namespace Plasma class Corona; } // namespace Plasma +namespace WorkspaceScripting +{ + class PLASMAGENERICSHELL_EXPORT AppInterface : public QObject { Q_OBJECT @@ -71,5 +74,7 @@ private: Plasma::Corona *m_corona; }; +} + #endif diff --git a/applet.cpp b/applet.cpp index 4c3984c10..71fb9ec78 100644 --- a/applet.cpp +++ b/applet.cpp @@ -29,6 +29,9 @@ #include #include +namespace WorkspaceScripting +{ + class Applet::Private { public: @@ -250,5 +253,7 @@ Plasma::Applet *Applet::applet() const return 0; } +} + #include "applet.moc" diff --git a/applet.h b/applet.h index c2f8724e3..1deead834 100644 --- a/applet.h +++ b/applet.h @@ -32,6 +32,9 @@ namespace Plasma class Applet; } // namespace Plasma +namespace WorkspaceScripting +{ + class PLASMAGENERICSHELL_EXPORT Applet : public QObject { Q_OBJECT @@ -74,6 +77,7 @@ private: Private * const d; }; +} #endif diff --git a/containment.cpp b/containment.cpp index d57f2727d..36bc099f4 100644 --- a/containment.cpp +++ b/containment.cpp @@ -28,6 +28,9 @@ #include "scriptengine.h" #include "widget.h" +namespace WorkspaceScripting +{ + class Containment::Private { public: @@ -299,5 +302,7 @@ Plasma::Containment *Containment::containment() const return d->containment.data(); } +} + #include "containment.moc" diff --git a/containment.h b/containment.h index 073ef95bc..88c2a574f 100644 --- a/containment.h +++ b/containment.h @@ -36,6 +36,9 @@ namespace Plasma class Widget; class PanelView; +namespace WorkspaceScripting +{ + class PLASMAGENERICSHELL_EXPORT Containment : public Applet { Q_OBJECT @@ -104,5 +107,7 @@ private: Private * const d; }; +} + #endif diff --git a/layouttemplatepackagestructure.cpp b/layouttemplatepackagestructure.cpp index e5f678ae6..ff9fc9655 100644 --- a/layouttemplatepackagestructure.cpp +++ b/layouttemplatepackagestructure.cpp @@ -19,6 +19,9 @@ #include "layouttemplatepackagestructure.h" +namespace WorkspaceScripting +{ + LayoutTemplatePackageStructure::LayoutTemplatePackageStructure(QObject *parent) : Plasma::PackageStructure(parent) { @@ -33,5 +36,7 @@ LayoutTemplatePackageStructure::~LayoutTemplatePackageStructure() } +} + #include "layouttemplatepackagestructure.moc" diff --git a/layouttemplatepackagestructure.h b/layouttemplatepackagestructure.h index 0d73f19b0..b9d33285e 100644 --- a/layouttemplatepackagestructure.h +++ b/layouttemplatepackagestructure.h @@ -23,6 +23,9 @@ #include #include "../plasmagenericshell_export.h" +namespace WorkspaceScripting +{ + class PLASMAGENERICSHELL_EXPORT LayoutTemplatePackageStructure : public Plasma::PackageStructure { Q_OBJECT @@ -32,6 +35,7 @@ public: ~LayoutTemplatePackageStructure(); }; +} #endif diff --git a/scriptengine.cpp b/scriptengine.cpp index d50376cd7..490c2ed63 100644 --- a/scriptengine.cpp +++ b/scriptengine.cpp @@ -40,6 +40,9 @@ QScriptValue constructQRectFClass(QScriptEngine *engine); +namespace WorkspaceScripting +{ + ScriptEngine::ScriptEngine(Plasma::Corona *corona, QObject *parent) : QScriptEngine(parent), m_corona(corona) @@ -427,5 +430,7 @@ QStringList ScriptEngine::defaultLayoutScripts() return scriptPaths; } +} + #include "scriptengine.moc" diff --git a/scriptengine.h b/scriptengine.h index fe6d7fd3e..86f4ddd29 100644 --- a/scriptengine.h +++ b/scriptengine.h @@ -32,6 +32,9 @@ namespace Plasma class Corona; } // namespace Plasma +namespace WorkspaceScripting +{ + class Containment; class PLASMAGENERICSHELL_EXPORT ScriptEngine : public QScriptEngine @@ -85,5 +88,7 @@ private: QScriptValue m_scriptSelf; }; +} + #endif diff --git a/widget.cpp b/widget.cpp index 0dcf9062c..24a92f761 100644 --- a/widget.cpp +++ b/widget.cpp @@ -26,6 +26,9 @@ #include #include +namespace WorkspaceScripting +{ + class Widget::Private { public: @@ -167,6 +170,7 @@ void Widget::showConfigurationInterface() } } +} #include "widget.moc" diff --git a/widget.h b/widget.h index daadc002b..40a74c804 100644 --- a/widget.h +++ b/widget.h @@ -31,6 +31,9 @@ namespace Plasma class Applet; } // namespace Plasma +namespace WorkspaceScripting +{ + class PLASMAGENERICSHELL_EXPORT Widget : public Applet { Q_OBJECT @@ -83,5 +86,7 @@ private: Private * const d; }; +} + #endif