alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* move kstyles from runtime into workspace

Browse Source 
* 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
This commit is contained in:
Aaron J. Seigo 2010-03-02 03:40:34 +00:00
parent a70f54e0d3
commit 826c9ae1d5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scriptengines/javascript/simplebindings/dataengine.cpp
View File

@ -56,9 +56,9 @@ void serviceJobFromQScriptValue(const QScriptValue &scriptValue, ServiceJobPtr &
void registerDataEngineMetaTypes(QScriptEngine *engine) void registerDataEngineMetaTypes(QScriptEngine *engine)
{ {
qRegisterMetaType<DataEngine::Data>("Plasma::DataEngine::Data"); qRegisterMetaType<Plasma::DataEngine::Data>("Plasma::DataEngine::Data");
qRegisterMetaType<DataEngine::Data>("DataEngine::Data"); qRegisterMetaType<Plasma::DataEngine::Data>("DataEngine::Data");
qScriptRegisterMapMetaType<DataEngine::Data>(engine); qScriptRegisterMapMetaType<Plasma::DataEngine::Data>(engine);
qScriptRegisterMetaType<Plasma::Service *>(engine, qScriptValueFromService, serviceFromQScriptValue); qScriptRegisterMetaType<Plasma::Service *>(engine, qScriptValueFromService, serviceFromQScriptValue);
qScriptRegisterMetaType<Plasma::DataEngine *>(engine, qScriptValueFromDataEngine, dataEngineFromQScriptValue); qScriptRegisterMetaType<Plasma::DataEngine *>(engine, qScriptValueFromDataEngine, dataEngineFromQScriptValue);
qScriptRegisterMetaType<Plasma::ServiceJob *>(engine, qScriptValueFromServiceJob, serviceJobFromQScriptValue); qScriptRegisterMetaType<Plasma::ServiceJob *>(engine, qScriptValueFromServiceJob, serviceJobFromQScriptValue);

4
scriptengines/javascript/simplebindings/dataengine.h
View File

@ -42,7 +42,7 @@ Q_DECLARE_METATYPE(DataEngine::Data)
template <class M> template <class M>
QScriptValue qScriptValueFromMap(QScriptEngine *eng, const M &map) QScriptValue qScriptValueFromMap(QScriptEngine *eng, const M &map)
{ {
//kDebug() << "qScriptValueFromMap called"; kDebug() << "qScriptValueFromMap called";
QScriptValue obj = eng->newObject(); QScriptValue obj = eng->newObject();
typename M::const_iterator begin = map.constBegin(); typename M::const_iterator begin = map.constBegin();
typename M::const_iterator end = map.constEnd(); typename M::const_iterator end = map.constEnd();
@ -57,7 +57,7 @@ QScriptValue qScriptValueFromMap(QScriptEngine *eng, const M &map)
template <class M> template <class M>
void qScriptValueToMap(const QScriptValue &value, M &map) void qScriptValueToMap(const QScriptValue &value, M &map)
{ {
//kDebug() << "qScriptValueToMap called"; kDebug() << "qScriptValueToMap called";
QScriptValueIterator it(value); QScriptValueIterator it(value);
while (it.hasNext()) { while (it.hasNext()) {
it.next(); it.next();