diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-07-02 16:28:10 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-17 07:44:23 +0200 |
commit | ba94fbedd648b04a28d67b920db2883e73459d1f (patch) | |
tree | 77c59634a448a2a6a4400aee635696afa03a29fd /src/qml/qml/qqmlpropertycache.cpp | |
parent | 4866eccdd0df6f7d8006940327010aee24866882 (diff) |
Trim trailing whitespace
Change-Id: Iafc5a94bb07c499b581bfec300d01e0fde165146
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlpropertycache.cpp')
-rw-r--r-- | src/qml/qml/qqmlpropertycache.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index 8570df78a1..6b41c7a337 100644 --- a/src/qml/qml/qqmlpropertycache.cpp +++ b/src/qml/qml/qqmlpropertycache.cpp @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE #define Q_INT16_MAX 32767 -class QQmlPropertyCacheMethodArguments +class QQmlPropertyCacheMethodArguments { public: QQmlPropertyCacheMethodArguments *next; @@ -94,7 +94,7 @@ static QQmlPropertyData::Flags fastFlagsForProperty(const QMetaProperty &p) return flags; } -// Flags that do depend on the property's QMetaProperty::userType() and thus are slow to +// Flags that do depend on the property's QMetaProperty::userType() and thus are slow to // load static QQmlPropertyData::Flags flagsForPropertyType(int propType, QQmlEngine *engine) { @@ -114,7 +114,7 @@ static QQmlPropertyData::Flags flagsForPropertyType(int propType, QQmlEngine *en } else if (propType == qMetaTypeId<QQmlV8Handle>()) { flags |= QQmlPropertyData::IsV8Handle; } else { - QQmlMetaType::TypeCategory cat = + QQmlMetaType::TypeCategory cat = engine ? QQmlEnginePrivate::get(engine)->typeCategory(propType) : QQmlMetaType::typeCategory(propType); @@ -599,8 +599,8 @@ QQmlPropertyCache::copyAndAppend(QQmlEngine *engine, const QMetaObject *metaObje return rv; } -void QQmlPropertyCache::append(QQmlEngine *engine, const QMetaObject *metaObject, - int revision, +void QQmlPropertyCache::append(QQmlEngine *engine, const QMetaObject *metaObject, + int revision, QQmlPropertyData::Flag propertyFlags, QQmlPropertyData::Flag methodFlags, QQmlPropertyData::Flag signalFlags) @@ -666,7 +666,7 @@ void QQmlPropertyCache::append(QQmlEngine *engine, const QMetaObject *metaObject if (ii == destroyedIdx1 || ii == destroyedIdx2 || ii == deleteLaterIdx) continue; QMetaMethod m = metaObject->method(ii); - if (m.access() == QMetaMethod::Private) + if (m.access() == QMetaMethod::Private) continue; // Extract method name @@ -772,7 +772,7 @@ void QQmlPropertyCache::append(QQmlEngine *engine, const QMetaObject *metaObject data->lazyLoad(p, engine); data->flags |= propertyFlags; - if (!dynamicMetaObject) + if (!dynamicMetaObject) data->flags |= QQmlPropertyData::IsDirect; Q_ASSERT((allowedRevisionCache.count() - 1) < Q_INT16_MAX); @@ -889,7 +889,7 @@ QQmlPropertyCache::property(int index) const { if (index < 0 || index >= (propertyIndexCacheStart + propertyIndexCache.count())) return 0; - + if (index < propertyIndexCacheStart) return _parent->property(index); @@ -962,7 +962,7 @@ QString QQmlPropertyData::name(const QMetaObject *metaObject) QStringList QQmlPropertyCache::propertyNames() const { QStringList keys; - for (StringCache::ConstIterator iter = stringCache.begin(); iter != stringCache.end(); ++iter) + for (StringCache::ConstIterator iter = stringCache.begin(); iter != stringCache.end(); ++iter) keys.append(iter.key()); return keys; } @@ -981,7 +981,7 @@ static int EnumType(const QMetaObject *metaobj, const QByteArray &str, int type) if (scopeIdx != -1) { scope = str.left(scopeIdx); name = str.mid(scopeIdx + 2); - } else { + } else { name = str; } const QMetaObject *meta; @@ -1015,7 +1015,7 @@ QList<QByteArray> QQmlPropertyCache::signalParameterNames(QObject *object, int i // Returns an array of the arguments for method \a index. The first entry in the array // is the number of arguments. -int *QQmlPropertyCache::methodParameterTypes(QObject *object, int index, +int *QQmlPropertyCache::methodParameterTypes(QObject *object, int index, QVarLengthArray<int, 9> &dummy, QByteArray *unknownTypeError) { @@ -1034,7 +1034,7 @@ int *QQmlPropertyCache::methodParameterTypes(QObject *object, int index, QQmlPropertyData *rv = const_cast<QQmlPropertyData *>(&c->methodIndexCache.at(index - c->methodIndexCacheStart)); - if (rv->arguments) + if (rv->arguments) return static_cast<A *>(rv->arguments)->arguments; const QMetaObject *metaObject = c->createMetaObject(); @@ -1246,7 +1246,7 @@ qQmlPropertyCacheProperty(QQmlEngine *engine, QObject *obj, const T &name, QQmlP } QQmlPropertyData * -QQmlPropertyCache::property(QQmlEngine *engine, QObject *obj, +QQmlPropertyCache::property(QQmlEngine *engine, QObject *obj, const QHashedV8String &name, QQmlPropertyData &local) { return qQmlPropertyCacheProperty<QHashedV8String>(engine, obj, name, local); |