[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-01-20 23:17:55
Message-ID: 1264029475.978430.23086.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1077825 by aseigo:

* simpler way of registering DataEngine::Data
* reg DataEngine::Data with Qt by name so it can find it at runtime; allows \
DataEngine::query to actually work


 M  +0 -2      CMakeLists.txt  
 M  +3 -1      javascriptdataengine.cpp  
 D             simplebindings/dataengine.cpp  
 M  +0 -2      simplebindings/dataengine.h  
 M  +3 -1      simplebindings/qscriptbookkeeping.cpp  


--- branches/KDE/4.4/kdebase/runtime/plasma/scriptengines/javascript/CMakeLists.txt \
#1077824:1077825 @@ -8,7 +8,6 @@
     simplebindings/bytearrayclass.cpp
     simplebindings/bytearrayprototype.cpp
     simplebindings/color.cpp
-    simplebindings/dataengine.cpp
     simplebindings/easingcurve.cpp
     simplebindings/font.cpp
     simplebindings/filedialogproxy.cpp
@@ -69,7 +68,6 @@
 
 set(javascript_dataengine_engine_SRCS
     javascriptdataengine.cpp
-    simplebindings/dataengine.cpp
     simplebindings/variant.cpp
 )
 kde4_add_plugin(plasma_dataenginescript_javascript \
                ${javascript_dataengine_engine_SRCS})
--- branches/KDE/4.4/kdebase/runtime/plasma/scriptengines/javascript/javascriptdataengine.cpp \
#1077824:1077825 @@ -47,7 +47,9 @@
     global.setProperty("removeData", \
                m_qscriptEngine->newFunction(JavaScriptDataEngine::jsRemoveData));
     global.setProperty("removeAllSources", \
m_qscriptEngine->newFunction(JavaScriptDataEngine::jsRemoveAllSources));  
-    qScriptRegisterMetaType<DataEngine::Data>(m_qscriptEngine, qScriptValueFromData, \
0, QScriptValue()); +    \
qRegisterMetaType<DataEngine::Data>("Plasma::DataEngine::Data"); +    \
qRegisterMetaType<DataEngine::Data>("DataEngine::Data"); +    \
qScriptRegisterMapMetaType<DataEngine::Data>(m_qscriptEngine);  /**
 TODO: Service bindings
 m_qscriptEngine->setDefaultPrototype(qMetaTypeId<Service*>(), \
                m_qscriptEngine->newQObject(new DummyService()));
--- branches/KDE/4.4/kdebase/runtime/plasma/scriptengines/javascript/simplebindings/dataengine.h \
#1077824:1077825 @@ -74,7 +74,5 @@
                                       qScriptValueToMap, prototype);
 }
 
-QScriptValue qScriptValueFromData(QScriptEngine *engine, const DataEngine::Data \
                &data);
-
 #endif // DATAENGINE_H
 
--- branches/KDE/4.4/kdebase/runtime/plasma/scriptengines/javascript/simplebindings/qscriptbookkeeping.cpp \
#1077824:1077825 @@ -194,7 +194,9 @@
     qScriptRegisterMetaType<KIO::Job *>(engine, qScriptValueFromKIOJob, \
qKIOJobFromQScriptValue);  
     qScriptRegisterMetaType<Plasma::Animation *>(engine, qScriptValueFromAnimation, \
                abstractAnimationFromQScriptValue);
-    qScriptRegisterMetaType<Plasma::DataEngine::Data>(engine, qScriptValueFromData, \
0, QScriptValue()); +    \
qRegisterMetaType<DataEngine::Data>("Plasma::DataEngine::Data"); +    \
qRegisterMetaType<DataEngine::Data>("DataEngine::Data"); +    \
                qScriptRegisterMapMetaType<DataEngine::Data>(engine);
     qScriptRegisterMetaType<Plasma::Extender *>(engine, qScriptValueFromExtender , \
                extenderFromQScriptValue);
     qScriptRegisterMetaType<Plasma::VideoWidget::Controls>(engine, \
qScriptValueFromControls, controlsFromScriptValue, QScriptValue());  }


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