diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-07 14:25:54 +1000 |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-07 14:26:46 +1000 |
| commit | ec50ac021ba0908bfaeb5fbf1838ffb59ad829d5 (patch) | |
| tree | 1a6365c8b7487e4f5cf7e489aba8005797005e3c /src/declarative/qml/qdeclarativetypenamescriptclass_p.h | |
| parent | b3beb6ded506f1701b68642d981c63295bc6c6a2 (diff) | |
Cleanup (remove QDeclarativeScriptClass)
QDeclarativeScriptClass only existed to make compiling against 4.6 and
4.7 easier.
Diffstat (limited to 'src/declarative/qml/qdeclarativetypenamescriptclass_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativetypenamescriptclass_p.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/declarative/qml/qdeclarativetypenamescriptclass_p.h b/src/declarative/qml/qdeclarativetypenamescriptclass_p.h index 8e07f024ce..310e14e1c6 100644 --- a/src/declarative/qml/qdeclarativetypenamescriptclass_p.h +++ b/src/declarative/qml/qdeclarativetypenamescriptclass_p.h @@ -54,16 +54,15 @@ // #include "private/qdeclarativeengine_p.h" +#include <private/qscriptdeclarativeclass_p.h> #include <QtScript/qscriptclass.h> -#include <private/qdeclarativescriptclass_p.h> - QT_BEGIN_NAMESPACE class QDeclarativeEngine; class QDeclarativeType; class QDeclarativeTypeNameCache; -class QDeclarativeTypeNameScriptClass : public QDeclarativeScriptClass +class QDeclarativeTypeNameScriptClass : public QScriptDeclarativeClass { public: QDeclarativeTypeNameScriptClass(QDeclarativeEngine *); @@ -77,7 +76,7 @@ protected: virtual QScriptClass::QueryFlags queryProperty(Object *, const Identifier &, QScriptClass::QueryFlags flags); - virtual ScriptValue property(Object *, const Identifier &); + virtual Value property(Object *, const Identifier &); virtual void setProperty(Object *, const Identifier &name, const QScriptValue &); private: |