From 826c9ae1d5a8bc7014b5dedeacdf8b567a30d916 Mon Sep 17 00:00:00 2001 From: "Aaron J. Seigo" Date: Tue, 2 Mar 2010 03:40:34 +0000 Subject: [PATCH] * move kstyles from runtime into workspace * make a proper library out of the oxygen helper lib * make the oxygen widget and kwin style link against it svn path=/trunk/KDE/kdebase/runtime/; revision=1097791 --- scriptengines/javascript/simplebindings/dataengine.cpp | 6 +++--- scriptengines/javascript/simplebindings/dataengine.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scriptengines/javascript/simplebindings/dataengine.cpp b/scriptengines/javascript/simplebindings/dataengine.cpp index 2f5ee895a..98837b2ea 100644 --- a/scriptengines/javascript/simplebindings/dataengine.cpp +++ b/scriptengines/javascript/simplebindings/dataengine.cpp @@ -56,9 +56,9 @@ void serviceJobFromQScriptValue(const QScriptValue &scriptValue, ServiceJobPtr & void registerDataEngineMetaTypes(QScriptEngine *engine) { - qRegisterMetaType("Plasma::DataEngine::Data"); - qRegisterMetaType("DataEngine::Data"); - qScriptRegisterMapMetaType(engine); + qRegisterMetaType("Plasma::DataEngine::Data"); + qRegisterMetaType("DataEngine::Data"); + qScriptRegisterMapMetaType(engine); qScriptRegisterMetaType(engine, qScriptValueFromService, serviceFromQScriptValue); qScriptRegisterMetaType(engine, qScriptValueFromDataEngine, dataEngineFromQScriptValue); qScriptRegisterMetaType(engine, qScriptValueFromServiceJob, serviceJobFromQScriptValue); diff --git a/scriptengines/javascript/simplebindings/dataengine.h b/scriptengines/javascript/simplebindings/dataengine.h index 82df668d2..fbeb24705 100644 --- a/scriptengines/javascript/simplebindings/dataengine.h +++ b/scriptengines/javascript/simplebindings/dataengine.h @@ -42,7 +42,7 @@ Q_DECLARE_METATYPE(DataEngine::Data) template QScriptValue qScriptValueFromMap(QScriptEngine *eng, const M &map) { - //kDebug() << "qScriptValueFromMap called"; + kDebug() << "qScriptValueFromMap called"; QScriptValue obj = eng->newObject(); typename M::const_iterator begin = map.constBegin(); typename M::const_iterator end = map.constEnd(); @@ -57,7 +57,7 @@ QScriptValue qScriptValueFromMap(QScriptEngine *eng, const M &map) template void qScriptValueToMap(const QScriptValue &value, M &map) { - //kDebug() << "qScriptValueToMap called"; + kDebug() << "qScriptValueToMap called"; QScriptValueIterator it(value); while (it.hasNext()) { it.next();