[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/generic/scriptengines/webkit
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-01-02 1:55:40
Message-ID: 1262397340.987842.15143.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1068805 by aseigo:

make DataEngines work again


 M  +8 -2      plasmajs.cpp  
 M  +7 -1      plasmajs.h  


--- trunk/KDE/kdebase/workspace/plasma/generic/scriptengines/webkit/plasmajs.cpp #1068804:1068805
@@ -27,8 +27,9 @@
 
 using namespace Plasma;
 
-PlasmaJs::PlasmaJs(QObject *parent)
-    : QObject(parent)
+PlasmaJs::PlasmaJs(PlasmaWebApplet *parent)
+    : QObject(parent),
+      m_webApplet(parent)
 {
 }
 
@@ -37,6 +38,11 @@
     return DataEngineManager::listAllEngines();
 }
 
+QObject *PlasmaJs::dataEngine(const QString &name)
+{
+    return m_webApplet->dataEngine(name);
+}
+
 ConfigGroupWrapper::ConfigGroupWrapper(const KConfigGroup &config)
 : m_config(config)
 {
--- trunk/KDE/kdebase/workspace/plasma/generic/scriptengines/webkit/plasmajs.h #1068804:1068805
@@ -26,14 +26,20 @@
 #include <KConfigGroup>
 #include <Plasma/DataEngine>
 
+class PlasmaWebApplet;
+
 class PlasmaJs : public QObject
 {
     Q_OBJECT
 public:
-    PlasmaJs(QObject *parent=0);
+    PlasmaJs(PlasmaWebApplet *parent=0);
 
 public Q_SLOTS:
     QStringList knownEngines();
+    QObject *dataEngine(const QString &name);
+
+private:
+    PlasmaWebApplet *m_webApplet;
 };
 
 class DataEngineDataWrapper : public QObject
[prev in list] [next in list] [prev in thread] [next in thread]