src/declarative/qml/qdeclarative.h
changeset 33 3e2da88830cd
parent 30 5dc02b23752f
equal deleted inserted replaced
30:5dc02b23752f 33:3e2da88830cd
    65 
    65 
    66 #define QML_DECLARE_INTERFACE_HASMETATYPE(INTERFACE) \
    66 #define QML_DECLARE_INTERFACE_HASMETATYPE(INTERFACE) \
    67     QML_DECLARE_TYPE_HASMETATYPE(INTERFACE)
    67     QML_DECLARE_TYPE_HASMETATYPE(INTERFACE)
    68 
    68 
    69 enum { /* TYPEINFO flags */
    69 enum { /* TYPEINFO flags */
    70     QML_HAS_ATTACHED_PROPERTIES = 0x01,
    70     QML_HAS_ATTACHED_PROPERTIES = 0x01
    71 };
    71 };
    72 
    72 
    73 #define QML_DECLARE_TYPEINFO(TYPE, FLAGS) \
    73 #define QML_DECLARE_TYPEINFO(TYPE, FLAGS) \
    74 QT_BEGIN_NAMESPACE \
    74 QT_BEGIN_NAMESPACE \
    75 template <> \
    75 template <> \
   114         0, 0,
   114         0, 0,
   115 
   115 
   116         0
   116         0
   117     };
   117     };
   118 
   118 
   119     return QDeclarativePrivate::registerType(type);
   119     return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
   120 }
   120 }
   121 
   121 
   122 int qmlRegisterTypeNotAvailable(const char *uri, int versionMajor, int versionMinor, const char *qmlName, const QString& message);
   122 int qmlRegisterTypeNotAvailable(const char *uri, int versionMajor, int versionMinor, const char *qmlName, const QString& message);
   123 
   123 
   124 template<typename T>
   124 template<typename T>
   149         0, 0,
   149         0, 0,
   150 
   150 
   151         0
   151         0
   152     };
   152     };
   153 
   153 
   154     return QDeclarativePrivate::registerType(type);
   154     return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
   155 }
   155 }
   156 
   156 
   157 template<typename T>
   157 template<typename T>
   158 int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const char *qmlName)
   158 int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const char *qmlName)
   159 {
   159 {
   182         0, 0,
   182         0, 0,
   183 
   183 
   184         0
   184         0
   185     };
   185     };
   186 
   186 
   187     return QDeclarativePrivate::registerType(type);
   187     return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
   188 }
   188 }
   189 
   189 
   190 template<typename T, typename E>
   190 template<typename T, typename E>
   191 int qmlRegisterExtendedType()
   191 int qmlRegisterExtendedType()
   192 {
   192 {
   215         QDeclarativePrivate::createParent<E>, &E::staticMetaObject,
   215         QDeclarativePrivate::createParent<E>, &E::staticMetaObject,
   216 
   216 
   217         0
   217         0
   218     };
   218     };
   219 
   219 
   220     return QDeclarativePrivate::registerType(type);
   220     return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
   221 }
   221 }
   222 
   222 
   223 template<typename T, typename E>
   223 template<typename T, typename E>
   224 int qmlRegisterExtendedType(const char *uri, int versionMajor, int versionMinor, 
   224 int qmlRegisterExtendedType(const char *uri, int versionMajor, int versionMinor, 
   225                             const char *qmlName)
   225                             const char *qmlName)
   256         QDeclarativePrivate::createParent<E>, &E::staticMetaObject,
   256         QDeclarativePrivate::createParent<E>, &E::staticMetaObject,
   257 
   257 
   258         0
   258         0
   259     };
   259     };
   260 
   260 
   261     return QDeclarativePrivate::registerType(type);
   261     return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
   262 }
   262 }
   263 
   263 
   264 template<typename T>
   264 template<typename T>
   265 int qmlRegisterInterface(const char *typeName)
   265 int qmlRegisterInterface(const char *typeName)
   266 {
   266 {
   276         qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
   276         qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
   277 
   277 
   278         qobject_interface_iid<T *>()
   278         qobject_interface_iid<T *>()
   279     };
   279     };
   280 
   280 
   281     return QDeclarativePrivate::registerType(interface);
   281     return QDeclarativePrivate::qmlregister(QDeclarativePrivate::InterfaceRegistration, &interface);
   282 }
   282 }
   283 
   283 
   284 template<typename T>
   284 template<typename T>
   285 int qmlRegisterCustomType(const char *uri, int versionMajor, int versionMinor, 
   285 int qmlRegisterCustomType(const char *uri, int versionMajor, int versionMinor, 
   286                           const char *qmlName, QDeclarativeCustomParser *parser)
   286                           const char *qmlName, QDeclarativeCustomParser *parser)
   310         0, 0,
   310         0, 0,
   311 
   311 
   312         parser
   312         parser
   313     };
   313     };
   314 
   314 
   315     return QDeclarativePrivate::registerType(type);
   315     return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
   316 }
   316 }
   317 
   317 
   318 class QDeclarativeContext;
   318 class QDeclarativeContext;
   319 class QDeclarativeEngine;
   319 class QDeclarativeEngine;
   320 Q_DECLARATIVE_EXPORT void qmlExecuteDeferred(QObject *);
   320 Q_DECLARATIVE_EXPORT void qmlExecuteDeferred(QObject *);