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

improve some memory management

Browse Source 
svn path=/trunk/KDE/kdebase/runtime/; revision=1058038
This commit is contained in:
Aaron J. Seigo 2009-12-03 20:58:17 +00:00
parent 64b1a70362
commit 243a160dac
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scriptengines/javascript/simplejavascriptapplet.cpp
View File

@ -546,7 +546,7 @@ bool SimpleJavaScriptApplet::importExtensions()
typedef Animation* AnimationPtr; typedef Animation* AnimationPtr;
QScriptValue qScriptValueFromAnimation(QScriptEngine *engine, const AnimationPtr &anim) QScriptValue qScriptValueFromAnimation(QScriptEngine *engine, const AnimationPtr &anim)
{ {
return engine->newQObject(const_cast<Animation *>(anim)); return engine->newQObject(const_cast<Animation *>(anim), QScriptEngine::AutoOwnership, QScriptEngine::PreferExistingWrapperObject);
} }
void abstractAnimationFromQScriptValue(const QScriptValue &scriptValue, AnimationPtr &anim) void abstractAnimationFromQScriptValue(const QScriptValue &scriptValue, AnimationPtr &anim)
@ -558,7 +558,7 @@ void abstractAnimationFromQScriptValue(const QScriptValue &scriptValue, Animatio
typedef QGraphicsWidget * QGraphicsWidgetPtr; typedef QGraphicsWidget * QGraphicsWidgetPtr;
QScriptValue qScriptValueFromQGraphicsWidget(QScriptEngine *engine, const QGraphicsWidgetPtr &anim) QScriptValue qScriptValueFromQGraphicsWidget(QScriptEngine *engine, const QGraphicsWidgetPtr &anim)
{ {
return engine->newQObject(const_cast<QGraphicsWidget *>(anim)); return engine->newQObject(const_cast<QGraphicsWidget *>(anim), QScriptEngine::AutoOwnership, QScriptEngine::PreferExistingWrapperObject);
} }
void qGraphicsWidgetFromQScriptValue(const QScriptValue &scriptValue, QGraphicsWidgetPtr &anim) void qGraphicsWidgetFromQScriptValue(const QScriptValue &scriptValue, QGraphicsWidgetPtr &anim)
@ -577,9 +577,11 @@ void SimpleJavaScriptApplet::setupObjects()
global.setProperty("AnimationGroup", m_engine->newFunction(SimpleJavaScriptApplet::animationGroup)); global.setProperty("AnimationGroup", m_engine->newFunction(SimpleJavaScriptApplet::animationGroup));
// Bindings for data engine // Bindings for data engine
m_engine->setDefaultPrototype(qMetaTypeId<DataEngine*>(), m_engine->newQObject(new DataEngine())); m_engine->setDefaultPrototype(qMetaTypeId<DataEngine*>(), m_engine->newQObject(new DataEngine(), QScriptEngine::ScriptOwnership));
m_engine->setDefaultPrototype(qMetaTypeId<Service*>(), m_engine->newQObject(new DummyService())); m_engine->setDefaultPrototype(qMetaTypeId<Service*>(), m_engine->newQObject(new DummyService(), QScriptEngine::ScriptOwnership));
m_engine->setDefaultPrototype(qMetaTypeId<ServiceJob*>(), m_engine->newQObject(new ServiceJob(QString(), QString(), QMap<QString, QVariant>()))); m_engine->setDefaultPrototype(qMetaTypeId<ServiceJob*>(),
m_engine->newQObject(new ServiceJob(QString(), QString(), QMap<QString, QVariant>()),
QScriptEngine::ScriptOwnership ));
bindI18N(m_engine); bindI18N(m_engine);
global.setProperty("dataEngine", m_engine->newFunction(SimpleJavaScriptApplet::dataEngine)); global.setProperty("dataEngine", m_engine->newFunction(SimpleJavaScriptApplet::dataEngine));
@ -699,10 +701,9 @@ QScriptValue SimpleJavaScriptApplet::service(QScriptContext *context, QScriptEng
QString source = context->argument(1).toString(); QString source = context->argument(1).toString();
Service *service = data->serviceForSource(source); Service *service = data->serviceForSource(source);
//kDebug( )<< "lets try to get" << source << "from" << dataEngine; //kDebug( )<< "lets try to get" << source << "from" << dataEngine;
return engine->newQObject(service); return engine->newQObject(service, QScriptEngine::AutoOwnership);
} }
#include <Plasma/Animation>
QScriptValue SimpleJavaScriptApplet::animation(QScriptContext *context, QScriptEngine *engine) QScriptValue SimpleJavaScriptApplet::animation(QScriptContext *context, QScriptEngine *engine)
{ {
if (context->argumentCount() != 1) { if (context->argumentCount() != 1) {
@ -767,7 +768,7 @@ QScriptValue SimpleJavaScriptApplet::loadui(QScriptContext *context, QScriptEngi
QWidget *w = loader.load(&f); QWidget *w = loader.load(&f);
f.close(); f.close();
return engine->newQObject(w); return engine->newQObject(w, QScriptEngine::AutoOwnership);
} }
QString SimpleJavaScriptApplet::findImageFile(QScriptEngine *engine, const QString &file) QString SimpleJavaScriptApplet::findImageFile(QScriptEngine *engine, const QString &file)