summaryrefslogtreecommitdiffstats
path: root/src/script/bridge/qscriptobject.cpp
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-10-26 09:18:38 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-10-26 09:18:38 (GMT)
commit27d4a7e457b1e40e7cd19a179d3d932b1618b4fa (patch)
treebea1d2f8e821ddf3abd032312b4309c373aa88a4 /src/script/bridge/qscriptobject.cpp
parentd576d770b9b8251f1b5b4808a84045af33e62dba (diff)
parent4e55bb8a761cc3e246c539fc5f7cce103ed4d730 (diff)
downloadQt-27d4a7e457b1e40e7cd19a179d3d932b1618b4fa.zip
Qt-27d4a7e457b1e40e7cd19a179d3d932b1618b4fa.tar.gz
Qt-27d4a7e457b1e40e7cd19a179d3d932b1618b4fa.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6
Diffstat (limited to 'src/script/bridge/qscriptobject.cpp')
-rw-r--r--src/script/bridge/qscriptobject.cpp30
1 files changed, 0 insertions, 30 deletions
diff --git a/src/script/bridge/qscriptobject.cpp b/src/script/bridge/qscriptobject.cpp
index 55644fe..1fdf0b1 100644
--- a/src/script/bridge/qscriptobject.cpp
+++ b/src/script/bridge/qscriptobject.cpp
@@ -70,36 +70,6 @@ QScriptObject::~QScriptObject()
delete d;
}
-JSC::JSValue QScriptObject::data() const
-{
- if (!d)
- return JSC::JSValue();
- return d->data;
-}
-
-void QScriptObject::setData(JSC::JSValue data)
-{
- if (!d)
- d = new Data();
- d->data = data;
-}
-
-QScriptObjectDelegate *QScriptObject::delegate() const
-{
- if (!d)
- return 0;
- return d->delegate;
-}
-
-void QScriptObject::setDelegate(QScriptObjectDelegate *delegate)
-{
- if (!d)
- d = new Data();
- else
- delete d->delegate;
- d->delegate = delegate;
-}
-
bool QScriptObject::getOwnPropertySlot(JSC::ExecState* exec,
const JSC::Identifier& propertyName,
JSC::PropertySlot& slot)