diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2017-04-21 14:54:00 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2017-04-24 09:17:47 +0000 |
| commit | 19e1eacfb2e81eb3b817de982bf09519c6802a60 (patch) | |
| tree | 568cb4644863ce5d5ff802f122cb43aa68e9f414 /src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | |
| parent | bd9a80717e8785465d245d82d4cf0243d43e7b41 (diff) | |
QmlDesigner: white space only changes
Change-Id: I8df6b1f53fce79fdf9eed022bc189754e668589b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index 17b1cf0862..865ccbd465 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -1003,7 +1003,7 @@ static QByteArray getPackage(const QByteArray &name) bool NodeMetaInfoPrivate::cleverCheckType(const TypeName &otherType) const { if (otherType == qualfiedTypeName()) - return true; + return true; if (isFileComponent()) return false; @@ -1177,8 +1177,8 @@ QString NodeMetaInfoPrivate::lookupName() const QStringList NodeMetaInfoPrivate::lookupNameComponent() const { - QString tempString = fullQualifiedImportAliasType(); - return tempString.split('.'); + QString tempString = fullQualifiedImportAliasType(); + return tempString.split('.'); } @@ -1415,7 +1415,6 @@ QStringList NodeMetaInfo::propertyKeysForEnum(const PropertyName &propertyName) QVariant NodeMetaInfo::propertyCastedValue(const PropertyName &propertyName, const QVariant &value) const { - const QVariant variant = value; QVariant copyVariant = variant; if (propertyIsEnumType(propertyName) @@ -1489,10 +1488,12 @@ TypeName NodeMetaInfo::typeName() const { return m_privateData->qualfiedTypeName(); } + int NodeMetaInfo::majorVersion() const { return m_privateData->majorVersion(); } + int NodeMetaInfo::minorVersion() const { return m_privateData->minorVersion(); @@ -1537,8 +1538,7 @@ bool NodeMetaInfo::isSubclassOf(const TypeName &type, int majorVersion, int mino if (typeName().isEmpty()) return false; - if (typeName() == type - && availableInVersion(majorVersion, minorVersion)) + if (typeName() == type && availableInVersion(majorVersion, minorVersion)) return true; if (m_privateData->prototypeCachePositives().contains(Internal::stringIdentifier(type, majorVersion, minorVersion))) @@ -1549,8 +1549,8 @@ bool NodeMetaInfo::isSubclassOf(const TypeName &type, int majorVersion, int mino foreach (const NodeMetaInfo &superClass, superClasses()) { if (superClass.m_privateData->cleverCheckType(type) - && superClass.availableInVersion(majorVersion, minorVersion)) { - m_privateData->prototypeCachePositives().insert(Internal::stringIdentifier(type, majorVersion, minorVersion)); + && superClass.availableInVersion(majorVersion, minorVersion)) { + m_privateData->prototypeCachePositives().insert(Internal::stringIdentifier(type, majorVersion, minorVersion)); return true; } } |