diff options
Diffstat (limited to 'src/declarative/qml/qdeclarativepropertycache.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativepropertycache.cpp | 29 | 
1 files changed, 17 insertions, 12 deletions
| diff --git a/src/declarative/qml/qdeclarativepropertycache.cpp b/src/declarative/qml/qdeclarativepropertycache.cpp index 888945b..f04a706 100644 --- a/src/declarative/qml/qdeclarativepropertycache.cpp +++ b/src/declarative/qml/qdeclarativepropertycache.cpp @@ -106,9 +106,25 @@ void QDeclarativePropertyCache::Data::load(const QMetaMethod &m)  } +/*! +Creates a new empty QDeclarativePropertyCache. +*/  QDeclarativePropertyCache::QDeclarativePropertyCache(QDeclarativeEngine *e)  : QDeclarativeCleanup(e), engine(e)  { +    Q_ASSERT(engine); +} + +/*! +Creates a new QDeclarativePropertyCache of \a metaObject. +*/ +QDeclarativePropertyCache::QDeclarativePropertyCache(QDeclarativeEngine *e, const QMetaObject *metaObject) +: QDeclarativeCleanup(e), engine(e) +{ +    Q_ASSERT(engine); +    Q_ASSERT(metaObject); + +    update(engine, metaObject);  }  QDeclarativePropertyCache::~QDeclarativePropertyCache() @@ -135,7 +151,7 @@ void QDeclarativePropertyCache::clear()  }  QDeclarativePropertyCache::Data QDeclarativePropertyCache::create(const QMetaObject *metaObject,  -                                                const QString &property) +                                                                  const QString &property)  {      Q_ASSERT(metaObject); @@ -245,17 +261,6 @@ void QDeclarativePropertyCache::append(QDeclarativeEngine *engine, const QMetaOb      }  } -// ### Optimize - check engine for the parent meta object etc. -QDeclarativePropertyCache *QDeclarativePropertyCache::create(QDeclarativeEngine *engine, const QMetaObject *metaObject) -{ -    Q_ASSERT(engine); -    Q_ASSERT(metaObject); - -    QDeclarativePropertyCache *cache = new QDeclarativePropertyCache(engine); -    cache->update(engine, metaObject); -    return cache; -} -  void QDeclarativePropertyCache::update(QDeclarativeEngine *engine, const QMetaObject *metaObject)  {      Q_ASSERT(engine); | 
