feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Remove isAvailableInVersion

Browse Source 
Task-numbers: QDS-9420, QDS-9421
Change-Id: Ic93cb6e24c4049d6982344a9d8420b8e567c8265
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Aleksei German
2023-04-28 14:04:28 +02:00
parent b92f741e60
commit 945832ce9b
2 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/designercore/include/nodemetainfo.h
View File

@@ -67,8 +67,6 @@ public:
QString componentFileName() const; QString componentFileName() const;
bool availableInVersion(int majorVersion, int minorVersion) const;
bool isBasedOn(const NodeMetaInfo &metaInfo) const; bool isBasedOn(const NodeMetaInfo &metaInfo) const;
bool isBasedOn(const NodeMetaInfo &metaInfo1, const NodeMetaInfo &metaInfo2) const; bool isBasedOn(const NodeMetaInfo &metaInfo1, const NodeMetaInfo &metaInfo2) const;
bool isBasedOn(const NodeMetaInfo &metaInfo1, bool isBasedOn(const NodeMetaInfo &metaInfo1,

18
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
View File

@@ -1659,19 +1659,6 @@ const Storage::Info::Type &NodeMetaInfo::typeData() const
} }
#endif #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 bool NodeMetaInfo::isSubclassOf(const TypeName &type, int majorVersion, int minorVersion) const
{ {
if (!isValid()) { if (!isValid()) {
@@ -1682,7 +1669,7 @@ bool NodeMetaInfo::isSubclassOf(const TypeName &type, int majorVersion, int mino
if (typeName().isEmpty()) if (typeName().isEmpty())
return false; return false;
if (typeName() == type && availableInVersion(majorVersion, minorVersion)) if (typeName() == type)
return true; return true;
if (m_privateData->prototypeCachePositives().contains( if (m_privateData->prototypeCachePositives().contains(
@@ -1695,8 +1682,7 @@ bool NodeMetaInfo::isSubclassOf(const TypeName &type, int majorVersion, int mino
const NodeMetaInfos superClassList = superClasses(); const NodeMetaInfos superClassList = superClasses();
for (const NodeMetaInfo &superClass : superClassList) { for (const NodeMetaInfo &superClass : superClassList) {
if (superClass.m_privateData->cleverCheckType(type) if (superClass.m_privateData->cleverCheckType(type)) {
&& superClass.availableInVersion(majorVersion, minorVersion)) {
m_privateData->prototypeCachePositives().insert( m_privateData->prototypeCachePositives().insert(
stringIdentifier(type, majorVersion, minorVersion)); stringIdentifier(type, majorVersion, minorVersion));
return true; return true;