diff options
| author | Aleksei German <aleksei.german@qt.io> | 2023-04-28 14:04:28 +0200 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2023-04-28 12:19:41 +0000 |
| commit | faa081927bbc11bab90c6d34e667087fd32dc4c9 (patch) | |
| tree | d89bc35a41a55f15b81ff7e87420b31d50291bb0 | |
| parent | fcf769f2cbaa2d3b5c5785f6c184660fd599b23c (diff) | |
| download | qt-creator-faa081927bbc11bab90c6d34e667087fd32dc4c9.tar.gz | |
QmlDesigner: Remove isAvailableInVersion
Task-numbers: QDS-9420, QDS-9421
Change-Id: Ic93cb6e24c4049d6982344a9d8420b8e567c8265
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| -rw-r--r-- | src/plugins/qmldesigner/designercore/include/nodemetainfo.h | 2 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | 18 |
2 files changed, 2 insertions, 18 deletions
diff --git a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h index 69ac5f2a97..4c692565fd 100644 --- a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h +++ b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h @@ -67,8 +67,6 @@ public: QString componentFileName() const; - bool availableInVersion(int majorVersion, int minorVersion) const; - bool isBasedOn(const NodeMetaInfo &metaInfo) const; bool isBasedOn(const NodeMetaInfo &metaInfo1, const NodeMetaInfo &metaInfo2) const; bool isBasedOn(const NodeMetaInfo &metaInfo1, diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index bebd01b422..aafb355b68 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -1659,19 +1659,6 @@ const Storage::Info::Type &NodeMetaInfo::typeData() const } #endif -bool NodeMetaInfo::availableInVersion(int majorVersion, int minorVersion) const -{ - if (!isValid()) - return false; - - if (majorVersion == -1 && minorVersion == -1) - return true; - - return (m_privateData->majorVersion() >= majorVersion) - || (majorVersion == m_privateData->majorVersion() - && m_privateData->minorVersion() >= minorVersion); -} - bool NodeMetaInfo::isSubclassOf(const TypeName &type, int majorVersion, int minorVersion) const { if (!isValid()) { @@ -1682,7 +1669,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) return true; if (m_privateData->prototypeCachePositives().contains( @@ -1695,8 +1682,7 @@ bool NodeMetaInfo::isSubclassOf(const TypeName &type, int majorVersion, int mino const NodeMetaInfos superClassList = superClasses(); for (const NodeMetaInfo &superClass : superClassList) { - if (superClass.m_privateData->cleverCheckType(type) - && superClass.availableInVersion(majorVersion, minorVersion)) { + if (superClass.m_privateData->cleverCheckType(type)) { m_privateData->prototypeCachePositives().insert( stringIdentifier(type, majorVersion, minorVersion)); return true; |