diff options
author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-12-04 14:31:17 (GMT) |
---|---|---|
committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-12-04 14:31:17 (GMT) |
commit | e524071986aba68956ff4cf18439e3d61ff90ec4 (patch) | |
tree | 5c7e609be153c4f0cbb708e6315d57fc1f9cf16b /src/declarative/util/qmlpropertychanges.cpp | |
parent | ee9aee5d85345880d8269c02cfd3c2d86e89c9d3 (diff) | |
download | Qt-e524071986aba68956ff4cf18439e3d61ff90ec4.zip Qt-e524071986aba68956ff4cf18439e3d61ff90ec4.tar.gz Qt-e524071986aba68956ff4cf18439e3d61ff90ec4.tar.bz2 |
small cleanup
make use of QVariant::userType over Qvariant::type
make use of char for 1-string character
QCoreApplication::translate is static
Diffstat (limited to 'src/declarative/util/qmlpropertychanges.cpp')
-rw-r--r-- | src/declarative/util/qmlpropertychanges.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qmlpropertychanges.cpp b/src/declarative/util/qmlpropertychanges.cpp index b9ec67a..48e026e 100644 --- a/src/declarative/util/qmlpropertychanges.cpp +++ b/src/declarative/util/qmlpropertychanges.cpp @@ -209,7 +209,7 @@ QmlPropertyChangesParser::compileList(QList<QPair<QByteArray, QVariant> > &list, QmlCustomParserProperty prop = qvariant_cast<QmlCustomParserProperty>(value); - QByteArray pre = propName + "."; + QByteArray pre = propName + '.'; compileList(list, pre, prop); } else { @@ -384,7 +384,7 @@ QmlPropertyChanges::ActionList QmlPropertyChanges::actions() a.restore = restoreEntryValues(); if (a.property.propertyType() == QVariant::Url && - (a.toValue.type() == QVariant::String || a.toValue.type() == QVariant::ByteArray) && !a.toValue.isNull()) + (a.toValue.userType() == QVariant::String || a.toValue.userType() == QVariant::ByteArray) && !a.toValue.isNull()) a.toValue.setValue(qmlContext(this)->resolvedUrl(QUrl(a.toValue.toString()))); list << a; |