summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmlpackage.cpp
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-04-29 07:01:56 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-04-29 07:01:56 (GMT)
commit9bcade632b72da7384d0b006c8d9db26d2f4baa1 (patch)
tree8fa48e5fa27db70268894989c8baa4f623383d70 /src/declarative/util/qmlpackage.cpp
parentc01d432060dccca5bc22dc5fd86eae97e1df8231 (diff)
parent86aa54ba75101121a55d340620d2273b82e6143d (diff)
downloadQt-9bcade632b72da7384d0b006c8d9db26d2f4baa1.zip
Qt-9bcade632b72da7384d0b006c8d9db26d2f4baa1.tar.gz
Qt-9bcade632b72da7384d0b006c8d9db26d2f4baa1.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qmlpackage.cpp')
-rw-r--r--src/declarative/util/qmlpackage.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/declarative/util/qmlpackage.cpp b/src/declarative/util/qmlpackage.cpp
index 264d186..aa7ed38 100644
--- a/src/declarative/util/qmlpackage.cpp
+++ b/src/declarative/util/qmlpackage.cpp
@@ -109,10 +109,10 @@ QmlList<QObject *> *QmlPackage::data()
bool QmlPackage::hasPart(const QString &name)
{
Q_D(QmlPackage);
- for(int ii = 0; ii < d->dataList.count(); ++ii) {
+ for (int ii = 0; ii < d->dataList.count(); ++ii) {
QObject *obj = d->dataList.at(ii);
QmlPackageAttached *a = QmlPackageAttached::attached.value(obj);
- if(a && a->name() == name)
+ if (a && a->name() == name)
return true;
}
return false;
@@ -121,17 +121,17 @@ bool QmlPackage::hasPart(const QString &name)
QObject *QmlPackage::part(const QString &name)
{
Q_D(QmlPackage);
- if(name.isEmpty() && !d->dataList.isEmpty())
+ if (name.isEmpty() && !d->dataList.isEmpty())
return d->dataList.at(0);
- for(int ii = 0; ii < d->dataList.count(); ++ii) {
+ for (int ii = 0; ii < d->dataList.count(); ++ii) {
QObject *obj = d->dataList.at(ii);
QmlPackageAttached *a = QmlPackageAttached::attached.value(obj);
- if(a && a->name() == name)
+ if (a && a->name() == name)
return obj;
}
- if(name == QLatin1String("default") && !d->dataList.isEmpty())
+ if (name == QLatin1String("default") && !d->dataList.isEmpty())
return d->dataList.at(0);
return 0;