Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Rename QDeclarativePropertyCache::Data to QDeclarativePropertyData
This class is now too large to be nicely nested.

Change-Id: I32cfa5caa524b8bf447d1f8c53ef2763f60bdac1
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
  • Loading branch information
Aaron Kennedy authored and Qt by Nokia committed Oct 26, 2011
1 parent 4ae7aec commit 0609277
Show file tree
Hide file tree
Showing 19 changed files with 343 additions and 329 deletions.
4 changes: 2 additions & 2 deletions src/declarative/debugger/qdeclarativeenginedebugservice.cpp
Expand Up @@ -674,8 +674,8 @@ void QDeclarativeEngineDebugService::setMethodBody(int objectId, const QString &
if (!contextData)
return;

QDeclarativePropertyCache::Data dummy;
QDeclarativePropertyCache::Data *prop =
QDeclarativePropertyData dummy;
QDeclarativePropertyData *prop =
QDeclarativePropertyCache::property(context->engine(), object, method, dummy);

if (!prop || !prop->isVMEFunction())
Expand Down
2 changes: 1 addition & 1 deletion src/declarative/items/qquickvisualadaptormodel.cpp
Expand Up @@ -688,7 +688,7 @@ QString QQuickVisualAdaptorModel::stringValue(int index, const QString &name)

QDeclarativeData *ddata = QDeclarativeData::get(data);
if (ddata && ddata->propertyCache) {
QDeclarativePropertyCache::Data *prop = ddata->propertyCache->property(name);
QDeclarativePropertyData *prop = ddata->propertyCache->property(name);
if (prop) {
if (prop->propType == QVariant::String) {
void *args[] = { &val, 0 };
Expand Down
40 changes: 20 additions & 20 deletions src/declarative/qml/qdeclarativecompiler.cpp
Expand Up @@ -1125,8 +1125,8 @@ void QDeclarativeCompiler::genObject(QDeclarativeScript::Object *obj)
reinterpret_cast<const QDeclarativeVMEMetaData *>(obj->synthdata.constData());
for (int ii = 0; ii < vmeMetaData->aliasCount; ++ii) {
int index = obj->metaObject()->propertyOffset() + vmeMetaData->propertyCount + ii;
QDeclarativePropertyCache::Data *data = propertyCache->property(index);
data->setFlags(data->getFlags() | QDeclarativePropertyCache::Data::IsAlias);
QDeclarativePropertyData *data = propertyCache->property(index);
data->setFlags(data->getFlags() | QDeclarativePropertyData::IsAlias);
}
}

Expand Down Expand Up @@ -1529,7 +1529,7 @@ bool QDeclarativeCompiler::buildSignal(QDeclarativeScript::Property *prop, QDecl

bool notInRevision = false;

QDeclarativePropertyCache::Data *sig = signal(obj, QStringRef(&name), &notInRevision);
QDeclarativePropertyData *sig = signal(obj, QStringRef(&name), &notInRevision);

if (sig == 0) {

Expand Down Expand Up @@ -1634,7 +1634,7 @@ bool QDeclarativeCompiler::buildProperty(QDeclarativeScript::Property *prop,
} else {
// Setup regular property data
bool notInRevision = false;
QDeclarativePropertyCache::Data *d =
QDeclarativePropertyData *d =
prop->name().isEmpty()?0:property(obj, prop->name(), &notInRevision);

if (d == 0 && notInRevision) {
Expand All @@ -1650,7 +1650,7 @@ bool QDeclarativeCompiler::buildProperty(QDeclarativeScript::Property *prop,
prop->core = *d;
} else if (prop->isDefault) {
QMetaProperty p = QDeclarativeMetaType::defaultProperty(metaObject);
QDeclarativePropertyCache::Data defaultPropertyData;
QDeclarativePropertyData defaultPropertyData;
defaultPropertyData.load(p, engine);
if (p.name())
prop->setName(QLatin1String(p.name()));
Expand Down Expand Up @@ -2056,7 +2056,7 @@ bool QDeclarativeCompiler::buildValueTypeProperty(QObject *type,

for (Property *prop = obj->properties.first(); prop; prop = obj->properties.next(prop)) {

QDeclarativePropertyCache::Data *d = property(obj, prop->name());
QDeclarativePropertyData *d = property(obj, prop->name());
if (d == 0)
COMPILE_EXCEPTION(prop, tr("Cannot assign to non-existent property \"%1\"").arg(prop->name().toString()));

Expand Down Expand Up @@ -2627,7 +2627,7 @@ bool QDeclarativeCompiler::buildDynamicMeta(QDeclarativeScript::Object *obj, Dyn

if (!resolveAlias) {
// No point doing this for both the alias and non alias cases
QDeclarativePropertyCache::Data *d = property(obj, p->name);
QDeclarativePropertyData *d = property(obj, p->name);
if (d && d->isFinal())
COMPILE_EXCEPTION(p, tr("Cannot override FINAL property"));
}
Expand Down Expand Up @@ -2988,16 +2988,16 @@ bool QDeclarativeCompiler::buildDynamicMeta(QDeclarativeScript::Object *obj, Dyn
if (obj->type != -1) {
QDeclarativePropertyCache *cache = output->types[obj->type].createPropertyCache(engine)->copy();
cache->append(engine, &obj->extObject,
QDeclarativePropertyCache::Data::NoFlags,
QDeclarativePropertyCache::Data::IsVMEFunction,
QDeclarativePropertyCache::Data::IsVMESignal);
QDeclarativePropertyData::NoFlags,
QDeclarativePropertyData::IsVMEFunction,
QDeclarativePropertyData::IsVMESignal);

// now we modify the flags appropriately for var properties.
int propertyOffset = obj->extObject.propertyOffset();
QDeclarativePropertyCache::Data *currPropData = 0;
QDeclarativePropertyData *currPropData = 0;
for (int pvi = firstPropertyVarIndex; pvi < totalPropCount; ++pvi) {
currPropData = cache->property(pvi + propertyOffset);
currPropData->setFlags(currPropData->getFlags() | QDeclarativePropertyCache::Data::IsVMEProperty);
currPropData->setFlags(currPropData->getFlags() | QDeclarativePropertyData::IsVMEProperty);
}

obj->synthCache = cache;
Expand Down Expand Up @@ -3275,7 +3275,7 @@ int QDeclarativeCompiler::genContextCache()
return output->contextCaches.count() - 1;
}

QDeclarativePropertyCache::Data
QDeclarativePropertyData
QDeclarativeCompiler::genValueTypeData(QDeclarativeScript::Property *valueTypeProp,
QDeclarativeScript::Property *prop)
{
Expand Down Expand Up @@ -3498,7 +3498,7 @@ QStringList QDeclarativeCompiler::deferredProperties(QDeclarativeScript::Object
return rv;
}

QDeclarativePropertyCache::Data *
QDeclarativePropertyData *
QDeclarativeCompiler::property(QDeclarativeScript::Object *object, int index)
{
QDeclarativePropertyCache *cache = 0;
Expand All @@ -3513,7 +3513,7 @@ QDeclarativeCompiler::property(QDeclarativeScript::Object *object, int index)
return cache->property(index);
}

QDeclarativePropertyCache::Data *
QDeclarativePropertyData *
QDeclarativeCompiler::property(QDeclarativeScript::Object *object, const QHashedStringRef &name, bool *notInRevision)
{
if (notInRevision) *notInRevision = false;
Expand All @@ -3527,7 +3527,7 @@ QDeclarativeCompiler::property(QDeclarativeScript::Object *object, const QHashed
else
cache = QDeclarativeEnginePrivate::get(engine)->cache(object->metaObject());

QDeclarativePropertyCache::Data *d = cache->property(name);
QDeclarativePropertyData *d = cache->property(name);

// Find the first property
while (d && d->isFunction())
Expand All @@ -3542,7 +3542,7 @@ QDeclarativeCompiler::property(QDeclarativeScript::Object *object, const QHashed
}

// This code must match the semantics of QDeclarativePropertyPrivate::findSignalByName
QDeclarativePropertyCache::Data *
QDeclarativePropertyData *
QDeclarativeCompiler::signal(QDeclarativeScript::Object *object, const QHashedStringRef &name, bool *notInRevision)
{
if (notInRevision) *notInRevision = false;
Expand All @@ -3557,7 +3557,7 @@ QDeclarativeCompiler::signal(QDeclarativeScript::Object *object, const QHashedSt
cache = QDeclarativeEnginePrivate::get(engine)->cache(object->metaObject());


QDeclarativePropertyCache::Data *d = cache->property(name);
QDeclarativePropertyData *d = cache->property(name);
if (notInRevision) *notInRevision = false;

while (d && !(d->isFunction()))
Expand Down Expand Up @@ -3585,7 +3585,7 @@ QDeclarativeCompiler::signal(QDeclarativeScript::Object *object, const QHashedSt
int QDeclarativeCompiler::indexOfSignal(QDeclarativeScript::Object *object, const QString &name,
bool *notInRevision)
{
QDeclarativePropertyCache::Data *d = signal(object, QStringRef(&name), notInRevision);
QDeclarativePropertyData *d = signal(object, QStringRef(&name), notInRevision);
return d?d->coreIndex:-1;
}

Expand All @@ -3598,7 +3598,7 @@ int QDeclarativeCompiler::indexOfProperty(QDeclarativeScript::Object *object, co
int QDeclarativeCompiler::indexOfProperty(QDeclarativeScript::Object *object, const QHashedStringRef &name,
bool *notInRevision)
{
QDeclarativePropertyCache::Data *d = property(object, name, notInRevision);
QDeclarativePropertyData *d = property(object, name, notInRevision);
return d?d->coreIndex:-1;
}

Expand Down
14 changes: 7 additions & 7 deletions src/declarative/qml/qdeclarativecompiler_p.h
Expand Up @@ -373,8 +373,8 @@ class Q_AUTOTEST_EXPORT QDeclarativeCompiler
QDeclarativeScript::Property *valueTypeProperty = 0);
int genContextCache();

QDeclarativePropertyCache::Data genValueTypeData(QDeclarativeScript::Property *prop,
QDeclarativeScript::Property *valueTypeProp);
QDeclarativePropertyData genValueTypeData(QDeclarativeScript::Property *prop,
QDeclarativeScript::Property *valueTypeProp);

int componentTypeRef();

Expand All @@ -385,11 +385,11 @@ class Q_AUTOTEST_EXPORT QDeclarativeCompiler

QStringList deferredProperties(QDeclarativeScript::Object *);

QDeclarativePropertyCache::Data *property(QDeclarativeScript::Object *, int);
QDeclarativePropertyCache::Data *property(QDeclarativeScript::Object *, const QHashedStringRef &,
bool *notInRevision = 0);
QDeclarativePropertyCache::Data *signal(QDeclarativeScript::Object *, const QHashedStringRef &,
bool *notInRevision = 0);
QDeclarativePropertyData *property(QDeclarativeScript::Object *, int);
QDeclarativePropertyData *property(QDeclarativeScript::Object *, const QHashedStringRef &,
bool *notInRevision = 0);
QDeclarativePropertyData *signal(QDeclarativeScript::Object *, const QHashedStringRef &,
bool *notInRevision = 0);
int indexOfProperty(QDeclarativeScript::Object *, const QHashedStringRef &, bool *notInRevision = 0);
int indexOfProperty(QDeclarativeScript::Object *, const QString &, bool *notInRevision = 0);
int indexOfSignal(QDeclarativeScript::Object *, const QString &, bool *notInRevision = 0);
Expand Down
4 changes: 2 additions & 2 deletions src/declarative/qml/qdeclarativecontext.cpp
Expand Up @@ -381,8 +381,8 @@ QVariant QDeclarativeContext::contextProperty(const QString &name) const
QByteArray utf8Name = name.toUtf8();
if (data->contextObject) {
QObject *obj = data->contextObject;
QDeclarativePropertyCache::Data local;
QDeclarativePropertyCache::Data *property =
QDeclarativePropertyData local;
QDeclarativePropertyData *property =
QDeclarativePropertyCache::property(data->engine, obj, name, local);

if (property) value = obj->metaObject()->property(property->coreIndex).read(obj);
Expand Down
4 changes: 2 additions & 2 deletions src/declarative/qml/qdeclarativeengine.cpp
Expand Up @@ -1659,12 +1659,12 @@ QDeclarativePropertyCache *QDeclarativeEnginePrivate::createCache(QDeclarativeTy
!overloadError && iter != raw->stringCache.end();
++iter) {

QDeclarativePropertyCache::Data *d = *iter;
QDeclarativePropertyData *d = *iter;
if (raw->isAllowedInRevision(d))
continue; // Not excluded - no problems

// check that a regular "name" overload isn't happening
QDeclarativePropertyCache::Data *current = d;
QDeclarativePropertyData *current = d;
while (!overloadError && current) {
current = d->overrideData(current);
if (current && raw->isAllowedInRevision(current))
Expand Down
6 changes: 3 additions & 3 deletions src/declarative/qml/qdeclarativeinstruction_p.h
Expand Up @@ -211,13 +211,13 @@ union QDeclarativeInstruction
};
struct instr_assignValueSource {
QML_INSTR_HEADER
QDeclarativePropertyCache::RawData property;
QDeclarativePropertyRawData property;
int owner;
int castValue;
};
struct instr_assignValueInterceptor {
QML_INSTR_HEADER
QDeclarativePropertyCache::RawData property;
QDeclarativePropertyRawData property;
int owner;
int castValue;
};
Expand All @@ -238,7 +238,7 @@ union QDeclarativeInstruction
};
struct instr_assignBinding {
QML_INSTR_HEADER
QDeclarativePropertyCache::RawData property;
QDeclarativePropertyRawData property;
int value;
short context;
short owner;
Expand Down
4 changes: 2 additions & 2 deletions src/declarative/qml/qdeclarativelist.cpp
Expand Up @@ -135,8 +135,8 @@ QDeclarativeListReference::QDeclarativeListReference(QObject *object, const char
{
if (!object || !property) return;

QDeclarativePropertyCache::Data local;
QDeclarativePropertyCache::Data *data =
QDeclarativePropertyData local;
QDeclarativePropertyData *data =
QDeclarativePropertyCache::property(engine, object, QLatin1String(property), local);

if (!data || !data->isQList()) return;
Expand Down

0 comments on commit 0609277

Please sign in to comment.