From f76a2fa667e19f2a42b2b22ea893a9d29dd74028 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Thu, 16 Jul 2009 11:27:57 +0200 Subject: fix enumeration of QObject wrapper objects Don't add method names, only signatures. Respect the SkipMethodsInEnumeration option. --- src/script/bridge/qscriptqobject.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp index 85e255c..23d61e3 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.cpp @@ -1485,15 +1485,13 @@ void QObjectDelegate::getPropertyNames(QScriptObject *object, JSC::ExecState *ex } } - { + if (!(opt & QScriptEngine::SkipMethodsInEnumeration)) { int i = (opt & QScriptEngine::ExcludeSuperClassMethods) ? meta->methodOffset() : 0; for ( ; i < meta->methodCount(); ++i) { QMetaMethod method = meta->method(i); if (hasMethodAccess(method, i, opt)) { QMetaMethod method = meta->method(i); - QString name = QString::fromLatin1(methodName(method)); - propertyNames.add(JSC::Identifier(exec, qtStringToJSCUString(name))); QString sig = QString::fromLatin1(method.signature()); propertyNames.add(JSC::Identifier(exec, qtStringToJSCUString(sig))); } -- cgit v0.12