diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2019-09-03 17:50:16 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-09-04 15:44:52 +0200 |
commit | 258143c07a900c895f597dd135fa6eea51b65111 (patch) | |
tree | e156d5dfdd6f9313664d94ef1e0a96ee79a5245c | |
parent | e81ff5732f7884c5c1d9efb1f63ac7ad0dabbcb5 (diff) |
QQmlType: Remove dead code
QQmlType::superType() is a private method that isn't called from
anywhere.
Change-Id: I5aa291b44c0cb72f8cf46ef765d4742496482477
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r-- | src/qml/qml/qqmltype.cpp | 17 | ||||
-rw-r--r-- | src/qml/qml/qqmltype_p.h | 1 |
2 files changed, 0 insertions, 18 deletions
diff --git a/src/qml/qml/qqmltype.cpp b/src/qml/qml/qqmltype.cpp index 2a6831d898..252ff26a64 100644 --- a/src/qml/qml/qqmltype.cpp +++ b/src/qml/qml/qqmltype.cpp @@ -154,23 +154,6 @@ bool QQmlType::availableInVersion(const QHashedStringRef &module, int vmajor, in return module == d->module && vmajor == d->version_maj && vminor >= d->version_min; } -// returns the nearest _registered_ super class -QQmlType QQmlType::superType() const -{ - if (!d) - return QQmlType(); - if (!d->haveSuperType && d->baseMetaObject) { - const QMetaObject *mo = d->baseMetaObject->superClass(); - while (mo && !d->superType.isValid()) { - d->superType = QQmlMetaType::qmlType(mo, d->module, d->version_maj, d->version_min); - mo = mo->superClass(); - } - d->haveSuperType = true; - } - - return d->superType; -} - QQmlType QQmlType::resolveCompositeBaseType(QQmlEnginePrivate *engine) const { Q_ASSERT(isComposite()); diff --git a/src/qml/qml/qqmltype_p.h b/src/qml/qml/qqmltype_p.h index 158fefad2c..4dec20600b 100644 --- a/src/qml/qml/qqmltype_p.h +++ b/src/qml/qml/qqmltype_p.h @@ -182,7 +182,6 @@ public: }; private: - QQmlType superType() const; QQmlType resolveCompositeBaseType(QQmlEnginePrivate *engine) const; int resolveCompositeEnumValue(QQmlEnginePrivate *engine, const QString &name, bool *ok) const; QQmlPropertyCache *compositePropertyCache(QQmlEnginePrivate *engine) const; |