feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Change variable name from metaProperty to property for all QDeclarativeProperties

Browse Source 
Reviewed-by: kkoehne
This commit is contained in:
Kai Koehne
2010-04-20 16:46:33 +02:00
parent 19d7fd0e11
commit 5c1078dce6
1 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp
View File

@@ -320,14 +320,14 @@ QPair<QString, NodeInstance> ObjectNodeInstance::anchor(const QString &/*name*/)
} }
static bool isList(const QDeclarativeProperty &metaProperty) static bool isList(const QDeclarativeProperty &property)
{ {
return metaProperty.propertyTypeCategory() == QDeclarativeProperty::List; return property.propertyTypeCategory() == QDeclarativeProperty::List;
} }
static bool isObject(const QDeclarativeProperty &metaProperty) static bool isObject(const QDeclarativeProperty &property)
{ {
return metaProperty.propertyTypeCategory() == QDeclarativeProperty::Object; return property.propertyTypeCategory() == QDeclarativeProperty::Object;
} }
static QVariant objectToVariant(QObject *object) static QVariant objectToVariant(QObject *object)
@@ -340,12 +340,12 @@ static bool hasFullImplementedListInterface(const QDeclarativeListReference &lis
return list.isValid() && list.canCount() && list.canAt() && list.canAppend() && list.canClear(); return list.isValid() && list.canCount() && list.canAt() && list.canAppend() && list.canClear();
} }
static void removeObjectFromList(const QDeclarativeProperty &metaProperty, QObject *objectToBeRemoved, QDeclarativeEngine * engine) static void removeObjectFromList(const QDeclarativeProperty &property, QObject *objectToBeRemoved, QDeclarativeEngine * engine)
{ {
QDeclarativeListReference listReference(metaProperty.object(), metaProperty.name().toLatin1(), engine); QDeclarativeListReference listReference(property.object(), property.name().toLatin1(), engine);
if (!hasFullImplementedListInterface(listReference)) { if (!hasFullImplementedListInterface(listReference)) {
qWarning() << "Property list interface not fully implemented for Class " << metaProperty.property().typeName() << " in property " << metaProperty.name() << "!"; qWarning() << "Property list interface not fully implemented for Class " << property.property().typeName() << " in property " << property.name() << "!";
return; return;
} }
@@ -367,14 +367,14 @@ static void removeObjectFromList(const QDeclarativeProperty &metaProperty, QObje
void ObjectNodeInstance::removeFromOldProperty(QObject *object, QObject *oldParent, const QString &oldParentProperty) void ObjectNodeInstance::removeFromOldProperty(QObject *object, QObject *oldParent, const QString &oldParentProperty)
{ {
QDeclarativeProperty metaProperty(oldParent, oldParentProperty, context()); QDeclarativeProperty property(oldParent, oldParentProperty, context());
if (!metaProperty.isValid()) if (!property.isValid())
return; return;
if (isList(metaProperty)) { if (isList(property)) {
removeObjectFromList(metaProperty, object, nodeInstanceView()->engine()); removeObjectFromList(property, object, nodeInstanceView()->engine());
} else if (isObject(metaProperty)) { } else if (isObject(property)) {
if (nodeInstanceView()->hasInstanceForObject(oldParent)) { if (nodeInstanceView()->hasInstanceForObject(oldParent)) {
nodeInstanceView()->instanceForObject(oldParent).resetProperty(oldParentProperty); nodeInstanceView()->instanceForObject(oldParent).resetProperty(oldParentProperty);
} }
@@ -385,19 +385,19 @@ void ObjectNodeInstance::removeFromOldProperty(QObject *object, QObject *oldPare
void ObjectNodeInstance::addToNewProperty(QObject *object, QObject *newParent, const QString &newParentProperty) void ObjectNodeInstance::addToNewProperty(QObject *object, QObject *newParent, const QString &newParentProperty)
{ {
QDeclarativeProperty metaProperty(newParent, newParentProperty, context()); QDeclarativeProperty property(newParent, newParentProperty, context());
if (isList(metaProperty)) { if (isList(property)) {
QDeclarativeListReference list = qvariant_cast<QDeclarativeListReference>(metaProperty.read()); QDeclarativeListReference list = qvariant_cast<QDeclarativeListReference>(property.read());
if (!hasFullImplementedListInterface(list)) { if (!hasFullImplementedListInterface(list)) {
qWarning() << "Property list interface not fully implemented for Class " << metaProperty.property().typeName() << " in property " << metaProperty.name() << "!"; qWarning() << "Property list interface not fully implemented for Class " << property.property().typeName() << " in property " << property.name() << "!";
return; return;
} }
list.append(object); list.append(object);
} else if (isObject(metaProperty)) { } else if (isObject(property)) {
metaProperty.write(objectToVariant(object)); property.write(objectToVariant(object));
} }
object->setParent(newParent); object->setParent(newParent);
@@ -464,16 +464,16 @@ void ObjectNodeInstance::setPropertyVariant(const QString &name, const QVariant
void ObjectNodeInstance::setPropertyBinding(const QString &name, const QString &expression) void ObjectNodeInstance::setPropertyBinding(const QString &name, const QString &expression)
{ {
QDeclarativeProperty metaProperty(object(), name, context()); QDeclarativeProperty property(object(), name, context());
if (!metaProperty.isValid()) if (!property.isValid())
return; return;
if (metaProperty.isProperty()) { if (property.isProperty()) {
QDeclarativeBinding *binding = new QDeclarativeBinding(expression, object(), context()); QDeclarativeBinding *binding = new QDeclarativeBinding(expression, object(), context());
binding->setTarget(metaProperty); binding->setTarget(property);
binding->setNotifyOnValueChanged(true); binding->setNotifyOnValueChanged(true);
QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::setBinding(metaProperty, binding); QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::setBinding(property, binding);
if (oldBinding) if (oldBinding)
oldBinding->destroy(); oldBinding->destroy();
binding->update(); binding->update();
@@ -483,13 +483,13 @@ void ObjectNodeInstance::setPropertyBinding(const QString &name, const QString &
} }
} }
void ObjectNodeInstance::deleteObjectsInList(const QDeclarativeProperty &metaProperty) void ObjectNodeInstance::deleteObjectsInList(const QDeclarativeProperty &property)
{ {
QObjectList objectList; QObjectList objectList;
QDeclarativeListReference list = qvariant_cast<QDeclarativeListReference>(metaProperty.read()); QDeclarativeListReference list = qvariant_cast<QDeclarativeListReference>(property.read());
if (!hasFullImplementedListInterface(list)) { if (!hasFullImplementedListInterface(list)) {
qWarning() << "Property list interface not fully implemented for Class " << metaProperty.property().typeName() << " in property " << metaProperty.name() << "!"; qWarning() << "Property list interface not fully implemented for Class " << property.property().typeName() << " in property " << property.name() << "!";
return; return;
} }
@@ -594,14 +594,14 @@ QVariant ObjectNodeInstance::property(const QString &name) const
// TODO: handle model nodes // TODO: handle model nodes
QDeclarativeProperty metaProperty(object(), name, context()); QDeclarativeProperty property(object(), name, context());
if (metaProperty.property().isEnumType()) { if (property.property().isEnumType()) {
QVariant value = object()->property(name.toLatin1()); QVariant value = object()->property(name.toLatin1());
return metaProperty.property().enumerator().valueToKey(value.toInt()); return property.property().enumerator().valueToKey(value.toInt());
} }
if (metaProperty.propertyType() == QVariant::Url) { if (property.propertyType() == QVariant::Url) {
QUrl url = metaProperty.read().toUrl(); QUrl url = property.read().toUrl();
if (url.isEmpty()) if (url.isEmpty())
return QVariant(); return QVariant();
@@ -611,7 +611,7 @@ QVariant ObjectNodeInstance::property(const QString &name) const
} }
} }
return metaProperty.read(); return property.read();
} }
@@ -718,9 +718,9 @@ void ObjectNodeInstance::populateResetValueHash()
QStringList propertyNameList = propertyNameForWritableProperties(object()); QStringList propertyNameList = propertyNameForWritableProperties(object());
foreach(const QString &propertyName, propertyNameList) { foreach(const QString &propertyName, propertyNameList) {
QDeclarativeProperty metaProperty(object(), propertyName, context()); QDeclarativeProperty property(object(), propertyName, context());
if (metaProperty.isWritable()) if (property.isWritable())
m_resetValueHash.insert(propertyName, metaProperty.read()); m_resetValueHash.insert(propertyName, property.read());
} }
} }