diff options
author | Martin Jones <martin.jones@nokia.com> | 2009-04-29 00:10:35 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2009-04-29 00:10:35 (GMT) |
commit | dc5a2f46bd9676e69ed81d0b83199a533d1fca21 (patch) | |
tree | 9eb4b410c5243cceb45962bb880da865b80ea891 /src/declarative/qml/qmlparser.cpp | |
parent | 978cf2724888f13ba1a0ebab65056c05fe112dad (diff) | |
parent | 1cb0906f04ed49de26575252740b8bb5190e3025 (diff) | |
download | Qt-dc5a2f46bd9676e69ed81d0b83199a533d1fca21.zip Qt-dc5a2f46bd9676e69ed81d0b83199a533d1fca21.tar.gz Qt-dc5a2f46bd9676e69ed81d0b83199a533d1fca21.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/fx/qfximageitem.cpp
src/declarative/fx/qfxpathview.cpp
src/declarative/util/qmllistmodel.cpp
Diffstat (limited to 'src/declarative/qml/qmlparser.cpp')
-rw-r--r-- | src/declarative/qml/qmlparser.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/declarative/qml/qmlparser.cpp b/src/declarative/qml/qmlparser.cpp index 1dd0d4e..ecb6f0b 100644 --- a/src/declarative/qml/qmlparser.cpp +++ b/src/declarative/qml/qmlparser.cpp @@ -70,16 +70,16 @@ QmlParser::Object::Object() QmlParser::Object::~Object() { - if(defaultProperty) defaultProperty->release(); + if (defaultProperty) defaultProperty->release(); foreach(Property *prop, properties) prop->release(); - if(dynamicPropertiesProperty) dynamicPropertiesProperty->release(); - if(dynamicSignalsProperty) dynamicSignalsProperty->release(); + if (dynamicPropertiesProperty) dynamicPropertiesProperty->release(); + if (dynamicSignalsProperty) dynamicSignalsProperty->release(); } const QMetaObject *Object::metaObject() const { - if(extObject && metatype) + if (extObject && metatype) return extObject; else return metatype; @@ -87,15 +87,15 @@ const QMetaObject *Object::metaObject() const QmlParser::Property *Object::getDefaultProperty() { - if(!defaultProperty) + if (!defaultProperty) defaultProperty = new Property; return defaultProperty; } Property *QmlParser::Object::getProperty(const QByteArray &name, bool create) { - if(!properties.contains(name)) { - if(create) + if (!properties.contains(name)) { + if (create) properties.insert(name, new Property(name)); else return 0; @@ -140,12 +140,12 @@ QmlParser::Property::~Property() { foreach(Value *value, values) value->release(); - if(value) value->release(); + if (value) value->release(); } Object *QmlParser::Property::getValue() { - if(!value) value = new Object; + if (!value) value = new Object; return value; } @@ -167,7 +167,7 @@ QmlParser::Value::Value() QmlParser::Value::~Value() { - if(object) object->release(); + if (object) object->release(); } QT_END_NAMESPACE |