diff options
| author | Robin Burchell <robin.burchell@collabora.com> | 2012-01-06 19:20:55 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-12 16:21:35 +0100 |
| commit | d402acbc892a8cf447acece100357694188a69e6 (patch) | |
| tree | f00e50e5f5bb9ddb8de04cd53401978b1bffcca2 /src/qtquick1 | |
| parent | 39f9b5def185337b2087cadeb3e137dfbeb85fa4 (diff) | |
Remove out-of-line uses of qMalloc/qFree/qRealloc.
Per http://codereview.qt-project.org/#change,11562, we are trying to remove these
in favour of direct allocation, or (in the case of inline code) specialised
out-of-line wrappers.
Change-Id: I113609c4f97dc5c8020a72cbd398572cdb5b7505
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'src/qtquick1')
| -rw-r--r-- | src/qtquick1/util/qdeclarativeopenmetaobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qtquick1/util/qdeclarativeopenmetaobject.cpp b/src/qtquick1/util/qdeclarativeopenmetaobject.cpp index 8d1ab462f4..39583cfe2d 100644 --- a/src/qtquick1/util/qdeclarativeopenmetaobject.cpp +++ b/src/qtquick1/util/qdeclarativeopenmetaobject.cpp @@ -77,7 +77,7 @@ QDeclarative1OpenMetaObjectType::QDeclarative1OpenMetaObjectType(const QMetaObje QDeclarative1OpenMetaObjectType::~QDeclarative1OpenMetaObjectType() { if (d->mem) - qFree(d->mem); + free(d->mem); if (d->cache) d->cache->release(); delete d; @@ -100,7 +100,7 @@ int QDeclarative1OpenMetaObjectType::createProperty(const QByteArray &name) d->mob.addSignal("__" + QByteArray::number(id) + "()"); QMetaPropertyBuilder build = d->mob.addProperty(name, "QVariant", id); propertyCreated(id, build); - qFree(d->mem); + free(d->mem); d->mem = d->mob.toMetaObject(); d->names.insert(name, id); QSet<QDeclarative1OpenMetaObject*>::iterator it = d->referers.begin(); |