From 5e924edc6d6761e2e680c20810a3bddb16dceaf1 Mon Sep 17 00:00:00 2001 From: "Aaron J. Seigo" Date: Wed, 16 Dec 2009 22:46:34 +0000 Subject: [PATCH] need to also register KJob with the runtime otherwise those signals are not very usable from the runtime; found while trying to connect to the finished signal of an http request svn path=/trunk/KDE/kdebase/runtime/; revision=1063096 --- .../simplebindings/qscriptbookkeeping.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/scriptengines/javascript/simplebindings/qscriptbookkeeping.cpp b/scriptengines/javascript/simplebindings/qscriptbookkeeping.cpp index ed1484793..f9a27123b 100644 --- a/scriptengines/javascript/simplebindings/qscriptbookkeeping.cpp +++ b/scriptengines/javascript/simplebindings/qscriptbookkeeping.cpp @@ -75,6 +75,19 @@ void controlsFromScriptValue(const QScriptValue& obj, Plasma::VideoWidget::Contr } } +Q_DECLARE_METATYPE(KJob *) +typedef KJob* KJobPtr; +QScriptValue qScriptValueFromKJob(QScriptEngine *engine, const KJobPtr &job) +{ + return engine->newQObject(const_cast(job), QScriptEngine::AutoOwnership, QScriptEngine::PreferExistingWrapperObject); +} + +void qKJobFromQScriptValue(const QScriptValue &scriptValue, KJobPtr &job) +{ + QObject *obj = scriptValue.toQObject(); + job = static_cast(obj); +} + Q_DECLARE_METATYPE(KIO::Job *) typedef KIO::Job* KioJobPtr; QScriptValue qScriptValueFromKIOJob(QScriptEngine *engine, const KioJobPtr &job) @@ -160,6 +173,7 @@ void registerSimpleAppletMetaTypes(QScriptEngine *engine) qScriptRegisterMetaType(engine, qScriptValueFromData, 0, QScriptValue()); qScriptRegisterMetaType(engine, qScriptValueFromKConfigGroup, kConfigGroupFromScriptValue, QScriptValue()); qScriptRegisterMetaType(engine, qScriptValueFromControls, controlsFromScriptValue, QScriptValue()); + qScriptRegisterMetaType(engine, qScriptValueFromKJob, qKJobFromQScriptValue); qScriptRegisterMetaType(engine, qScriptValueFromKIOJob, qKIOJobFromQScriptValue); qScriptRegisterMetaType(engine, qScriptValueFromAnimation, abstractAnimationFromQScriptValue); qScriptRegisterMetaType(engine, qScriptValueFromQGraphicsWidget, qGraphicsWidgetFromQScriptValue);