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

List:       kde-commits
Subject:    branches/KDE/4.4/kdebase/runtime/plasma/scriptengines/javascript
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-02-01 17:53:29
Message-ID: 1265046809.732466.28555.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1083638 by aseigo:

debug is actually supposed to be in the global context, along with print; this is how \
it is in trunk


 M  +0 -5      simplebindings/appletinterface.cpp  
 M  +0 -1      simplebindings/appletinterface.h  
 M  +12 -0     simplejavascriptapplet.cpp  
 M  +1 -0      simplejavascriptapplet.h  


--- branches/KDE/4.4/kdebase/runtime/plasma/scriptengines/javascript/simplebindings/appletinterface.cpp \
#1083637:1083638 @@ -343,11 +343,6 @@
     return m_appletScriptEngine->loadedExtensions().contains(extension.toLower());
 }
 
-void AppletInterface::debug(const QString &msg)
-{
-    kDebug() << msg;
-}
-
 QObject *AppletInterface::findChild(const QString &name) const
 {
     if (name.isEmpty()) {
--- branches/KDE/4.4/kdebase/runtime/plasma/scriptengines/javascript/simplebindings/appletinterface.h \
#1083637:1083638 @@ -241,7 +241,6 @@
     Q_INVOKABLE bool include(const QString &script);
     Q_INVOKABLE bool hasExtension(const QString &extension) const;
 
-    Q_INVOKABLE void debug(const QString &msg);
     Q_INVOKABLE QObject *findChild(const QString &name) const;
 
     Q_INVOKABLE Plasma::Extender *extender() const;
--- branches/KDE/4.4/kdebase/runtime/plasma/scriptengines/javascript/simplejavascriptapplet.cpp \
#1083637:1083638 @@ -569,6 +569,8 @@
 
     fun = m_engine->newFunction(SimpleJavaScriptApplet::print);
     global.setProperty("print", fun);
+    fun = m_engine->newFunction(SimpleJavaScriptApplet::debug);
+    global.setProperty("print", debug);
 
     // Work around bug in 4.3.0
     qMetaTypeId<QVariant>();
@@ -905,6 +907,16 @@
     return engine->undefinedValue();
 }
 
+QScriptValue SimpleJavaScriptApplet::debug(QScriptContext *context, QScriptEngine \
*engine) +{
+    if (context->argumentCount() < 1) {
+        return engine->undefinedValue();
+    }
+
+    kDebug() << context->argument(0).toString();
+    return engine->undefinedValue();
+}
+
 void SimpleJavaScriptApplet::collectGarbage()
 {
     m_engine->collectGarbage();
--- branches/KDE/4.4/kdebase/runtime/plasma/scriptengines/javascript/simplejavascriptapplet.h \
#1083637:1083638 @@ -97,6 +97,7 @@
     static QScriptValue createWidget(QScriptContext *context, QScriptEngine \
                *engine);
     static QScriptValue notSupported(QScriptContext *context, QScriptEngine \
                *engine);
     static QScriptValue print(QScriptContext *context, QScriptEngine *engine);
+    static QScriptValue debug(QScriptContext *context, QScriptEngine *engine);
     static QScriptValue widgetAdjustSize(QScriptContext *context, QScriptEngine \
*engine);  
     // run extension


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