Replace by the new IdentifierIntHash.
Change-Id: Ib210cd898a30ad3e2f9349387e1a74d92ed5f831
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
$$PWD/qqmlcleanup.cpp \
$$PWD/qqmlpropertycache.cpp \
$$PWD/qqmlnotifier.cpp \
- $$PWD/qqmlintegercache.cpp \
$$PWD/qqmltypenotavailable.cpp \
$$PWD/qqmltypenamecache.cpp \
$$PWD/qqmlscriptstring.cpp \
$$PWD/qqmlcleanup_p.h \
$$PWD/qqmlpropertycache_p.h \
$$PWD/qqmlnotifier_p.h \
- $$PWD/qqmlintegercache_p.h \
$$PWD/qqmltypenotavailable_p.h \
$$PWD/qqmltypenamecache_p.h \
$$PWD/qqmlscriptstring.h \
for (int ii = 0; ii < propertyCaches.count(); ++ii)
propertyCaches.at(ii)->release();
- for (int ii = 0; ii < contextCaches.count(); ++ii)
- contextCaches.at(ii)->release();
-
for (int ii = 0; ii < scripts.count(); ++ii)
scripts.at(ii)->release();
if (compileState->ids.count() == 0)
return -1;
- QQmlIntegerCache *cache = new QQmlIntegerCache();
- cache->reserve(compileState->ids.count());
+ QV4::IdentifierIntHash cache(QV8Engine::getV4(engine->handle()));
+ cache.reserve(compileState->ids.count());
for (Object *o = compileState->ids.first(); o; o = compileState->ids.next(o))
- cache->add(o->id, o->idIndex);
+ cache.add(o->id, o->idIndex);
output->contextCaches.append(cache);
return output->contextCaches.count() - 1;
#include "qqmlengine_p.h"
#include <private/qbitfield_p.h>
#include "qqmlpropertycache_p.h"
-#include "qqmlintegercache_p.h"
#include "qqmltypenamecache_p.h"
#include "qqmltypeloader_p.h"
+#include "private/qv4identifier_p.h"
#include <QtCore/qbytearray.h>
#include <QtCore/qset.h>
QList<QByteArray> datas;
QByteArray bytecode;
QList<QQmlPropertyCache *> propertyCaches;
- QList<QQmlIntegerCache *> contextCaches;
+ QList<QV4::IdentifierIntHash> contextCaches;
QList<QQmlScriptData *> scripts;
QList<QUrl> urls;
}
}
- if (!data->propertyNames) data->propertyNames = new QQmlIntegerCache();
+ if (data->propertyNames.isEmpty())
+ data->propertyNames = QV4::IdentifierIntHash(QV8Engine::getV4(engine()->handle()));
- int idx = data->propertyNames->value(name);
+ int idx = data->propertyNames.value(name);
if (idx == -1) {
- data->propertyNames->add(name, data->idValueCount + d->propertyValues.count());
+ data->propertyNames.add(name, data->idValueCount + d->propertyValues.count());
d->propertyValues.append(value);
data->refreshExpressions();
return;
}
- if (!data->propertyNames) data->propertyNames = new QQmlIntegerCache();
- int idx = data->propertyNames->value(name);
+ if (data->propertyNames.isEmpty())
+ data->propertyNames = QV4::IdentifierIntHash(QV8Engine::getV4(engine()->handle()));
+ int idx = data->propertyNames.value(name);
if (idx == -1) {
- data->propertyNames->add(name, data->idValueCount + d->propertyValues.count());
+ data->propertyNames.add(name, data->idValueCount + d->propertyValues.count());
d->propertyValues.append(QVariant::fromValue(value));
data->refreshExpressions();
QQmlContextData *data = d->data;
- if (data->propertyNames)
- idx = data->propertyNames->value(name);
+ if (data->propertyNames.count())
+ idx = data->propertyNames.value(name);
if (idx == -1) {
QByteArray utf8Name = name.toUtf8();
: parent(0), engine(0), isInternal(false), ownedByParent(false), isJSContext(false),
isPragmaLibraryContext(false), unresolvedNames(false), hasEmittedDestruction(false), isRootObjectInCreation(false),
publicContext(0), activeVMEData(0),
- propertyNames(0), contextObject(0), imports(0), childContexts(0), nextChild(0), prevChild(0),
+ contextObject(0), imports(0), childContexts(0), nextChild(0), prevChild(0),
expressions(0), contextObjects(0), contextGuards(0), idValues(0), idValueCount(0), linkedContext(0),
componentAttached(0)
{
: parent(0), engine(0), isInternal(false), ownedByParent(false), isJSContext(false),
isPragmaLibraryContext(false), unresolvedNames(false), hasEmittedDestruction(false), isRootObjectInCreation(false),
publicContext(ctxt), activeVMEData(0),
- propertyNames(0), contextObject(0), imports(0), childContexts(0), nextChild(0), prevChild(0),
+ contextObject(0), imports(0), childContexts(0), nextChild(0), prevChild(0),
expressions(0), contextObjects(0), contextGuards(0), idValues(0), idValueCount(0), linkedContext(0),
componentAttached(0)
{
}
contextGuards = 0;
- if (propertyNames)
- propertyNames->release();
-
if (imports)
imports->release();
idValues[idx].context = this;
}
-void QQmlContextData::setIdPropertyData(QQmlIntegerCache *data)
+void QQmlContextData::setIdPropertyData(const QV4::IdentifierIntHash &data)
{
- Q_ASSERT(!propertyNames);
+ Q_ASSERT(propertyNames.isEmpty());
propertyNames = data;
- propertyNames->addref();
- idValueCount = data->count();
+ idValueCount = data.count();
idValues = new ContextGuard[idValueCount];
}
QString QQmlContextData::findObjectId(const QObject *obj) const
{
- if (!propertyNames)
+ if (propertyNames.isEmpty())
return QString();
for (int ii = 0; ii < idValueCount; ii++) {
if (idValues[ii] == obj)
- return propertyNames->findId(ii);
+ return propertyNames.findId(ii);
}
if (publicContext) {
QQmlContextPrivate *p = QQmlContextPrivate::get(publicContext);
for (int ii = 0; ii < p->propertyValues.count(); ++ii)
if (p->propertyValues.at(ii) == QVariant::fromValue((QObject *)obj))
- return propertyNames->findId(ii);
+ return propertyNames.findId(ii);
}
if (linkedContext)
#include "qqmlcontext.h"
#include "qqmldata_p.h"
-#include "qqmlintegercache_p.h"
#include "qqmltypenamecache_p.h"
#include "qqmlnotifier_p.h"
#include "qqmllist.h"
#include <private/qflagpointer_p.h>
#include <private/qqmlguard_p.h>
+#include <private/qv4identifier_p.h>
QT_BEGIN_NAMESPACE
void *activeVMEData;
// Property name cache
- QQmlIntegerCache *propertyNames;
+ QV4::IdentifierIntHash propertyNames;
// Context object
QObject *contextObject;
ContextGuard *idValues;
int idValueCount;
void setIdProperty(int, QObject *);
- void setIdPropertyData(QQmlIntegerCache *);
+ void setIdPropertyData(const QV4::IdentifierIntHash &);
// Linked contexts. this owns linkedContext.
QQmlContextData *linkedContext;
while (context) {
// Search context properties
- if (context->propertyNames) {
- int propertyIdx = context->propertyNames->value(name);
+ if (context->propertyNames.count()) {
+ int propertyIdx = context->propertyNames.value(name);
if (propertyIdx != -1) {
while (context) {
// Search context properties
- if (context->propertyNames && -1 != context->propertyNames->value(name))
+ if (context->propertyNames.count() && -1 != context->propertyNames.value(name))
return;
// Search scope object
+++ /dev/null
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qqmlintegercache_p.h"
-
-QT_BEGIN_NAMESPACE
-
-QQmlIntegerCache::QQmlIntegerCache()
-{
-}
-
-QQmlIntegerCache::~QQmlIntegerCache()
-{
-}
-
-QString QQmlIntegerCache::findId(int value) const
-{
- for (StringCache::ConstIterator iter = stringCache.begin();
- iter != stringCache.end(); ++iter) {
- if (iter.value() == value)
- return iter.key();
- }
- return QString();
-}
-
-void QQmlIntegerCache::reserve(int size)
-{
- stringCache.reserve(size);
-}
-
-void QQmlIntegerCache::add(const QString &id, int value)
-{
- Q_ASSERT(!stringCache.contains(id));
-
- stringCache.insert(id, value);
-}
-
-int QQmlIntegerCache::value(const QString &id)
-{
- int *rv = stringCache.value(id);
- return rv?*rv:-1;
-}
-
-QT_END_NAMESPACE
+++ /dev/null
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQMLINTEGERCACHE_P_H
-#define QQMLINTEGERCACHE_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <private/qqmlrefcount_p.h>
-#include <private/qhashedstring_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QQmlType;
-class QQmlEngine;
-class QQmlIntegerCache : public QQmlRefCount
-{
-public:
- QQmlIntegerCache();
- virtual ~QQmlIntegerCache();
-
- inline int count() const;
- void add(const QString &, int);
- void reserve(int);
-
- int value(const QString &);
- inline int value(const QV4::String *);
-
- QString findId(int value) const;
-
-private:
- typedef QStringHash<int> StringCache;
- StringCache stringCache;
-};
-
-int QQmlIntegerCache::value(const QV4::String *name)
-{
- int *result = stringCache.value(name);
- return result?*result:-1;
-}
-
-int QQmlIntegerCache::count() const
-{
- return stringCache.count();
-}
-
-QT_END_NAMESPACE
-
-#endif // QQMLINTEGERCACHE_P_H
-
projects / platform / upstream / qtdeclarative.git / commitdiff