From 51e8256e86e5fc988d39ba8c0b6f3935d7a7d183 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Mon, 19 Apr 2021 12:15:47 +0200 Subject: [PATCH] QmlDesigner: Remove unused member function in NodeMetaInfo Change-Id: I568ebdce5a01b0f6185ac5dcb74676c727651ebe Reviewed-by: Thomas Hartmann --- .../designercore/include/nodemetainfo.h | 4 - .../designercore/metainfo/nodemetainfo.cpp | 77 ------------------- 2 files changed, 81 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h index 869d327f5f2..3cafe30e7cd 100644 --- a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h +++ b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h @@ -76,7 +76,6 @@ public: bool propertyIsEnumType(const PropertyName &propertyName) const; bool propertyIsPrivate(const PropertyName &propertyName) const; bool propertyIsPointer(const PropertyName &propertyName) const; - QString propertyEnumScope(const PropertyName &propertyName) const; QStringList propertyKeysForEnum(const PropertyName &propertyName) const; QVariant propertyCastedValue(const PropertyName &propertyName, const QVariant &value) const; @@ -91,11 +90,8 @@ public: int majorVersion() const; int minorVersion() const; - QString componentSource() const; QString componentFileName() const; - bool hasCustomParser() const; - bool availableInVersion(int majorVersion, int minorVersion) const; bool isSubclassOf(const TypeName &type, int majorVersion = -1, int minorVersion = -1) const; diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index 9aec482f06b..1d8aac500cb 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -603,7 +603,6 @@ public: bool isPropertyPointer(const PropertyName &propertyName) const; bool isPropertyList(const PropertyName &propertyName) const; bool isPropertyEnum(const PropertyName &propertyName) const; - QString propertyEnumScope(const PropertyName &propertyName) const; QStringList keysForEnum(const QString &enumName) const; bool cleverCheckType(const TypeName &otherType) const; QVariant::Type variantTypeId(const PropertyName &properyName) const; @@ -615,7 +614,6 @@ public: QByteArray cppPackageName() const; - QString componentSource() const; QString componentFileName() const; QString importDirectoryPath() const; @@ -998,55 +996,6 @@ bool NodeMetaInfoPrivate::isPropertyEnum(const PropertyName &propertyName) const return qmlObjectValue->getEnum(QString::fromUtf8(propertyType(propertyName))).isValid(); } -QString NodeMetaInfoPrivate::propertyEnumScope(const PropertyName &propertyName) const -{ - if (!isValid()) - return QString(); - - ensureProperties(); - - if (propertyType(propertyName).contains("Qt::")) - return QStringLiteral("Qt"); - - if (propertyName.contains('.')) { - const PropertyNameList parts = propertyName.split('.'); - const PropertyName &objectName = parts.constFirst(); - const PropertyName &rawPropertyName = parts.constLast(); - const TypeName objectType = propertyType(objectName); - - if (isValueType(objectType)) - return QString(); - - QSharedPointer objectInfo(create(m_model, objectType)); - if (objectInfo->isValid()) - return objectInfo->propertyEnumScope(rawPropertyName); - else - return QString(); - } - - const CppComponentValue *qmlObjectValue = getNearestCppComponentValue(); - if (!qmlObjectValue) - return QString(); - const CppComponentValue *definedIn = nullptr; - qmlObjectValue->getEnum(QString::fromUtf8(propertyType(propertyName)), &definedIn); - if (definedIn) { - QString nonCppPackage; - foreach (const LanguageUtils::FakeMetaObject::Export &qmlExport, definedIn->metaObject()->exports()) { - if (qmlExport.package != QStringLiteral("")) - nonCppPackage = qmlExport.package; - } - - const LanguageUtils::FakeMetaObject::Export qmlExport = - definedIn->metaObject()->exportInPackage(nonCppPackage); - if (qmlExport.isValid()) - return qmlExport.type; - - return definedIn->className(); - } - - return QString(); -} - static QByteArray getUnqualifiedName(const QByteArray &name) { const QList nameComponents = name.split('.'); @@ -1186,17 +1135,6 @@ QByteArray NodeMetaInfoPrivate::cppPackageName() const return QByteArray(); } -QString NodeMetaInfoPrivate::componentSource() const -{ - if (isFileComponent()) { - const ASTObjectValue * astObjectValue = value_cast(getObjectValue()); - if (astObjectValue) - return astObjectValue->document()->source().mid(astObjectValue->typeName()->identifierToken.begin(), - astObjectValue->initializer()->rbraceToken.end()); - } - return QString(); -} - QString NodeMetaInfoPrivate::componentFileName() const { if (isFileComponent()) { @@ -1505,11 +1443,6 @@ bool NodeMetaInfo::propertyIsPointer(const PropertyName &propertyName) const return m_privateData->isPropertyPointer(propertyName); } -QString NodeMetaInfo::propertyEnumScope(const PropertyName &propertyName) const -{ - return m_privateData->propertyEnumScope(propertyName); -} - QStringList NodeMetaInfo::propertyKeysForEnum(const PropertyName &propertyName) const { return m_privateData->keysForEnum(QString::fromUtf8(propertyTypeName(propertyName))); @@ -1598,11 +1531,6 @@ int NodeMetaInfo::minorVersion() const return m_privateData->minorVersion(); } -QString NodeMetaInfo::componentSource() const -{ - return m_privateData->componentSource(); -} - QString NodeMetaInfo::componentFileName() const { return m_privateData->componentFileName(); @@ -1613,11 +1541,6 @@ QString NodeMetaInfo::importDirectoryPath() const return m_privateData->importDirectoryPath(); } -bool NodeMetaInfo::hasCustomParser() const -{ - return false; -} - bool NodeMetaInfo::availableInVersion(int majorVersion, int minorVersion) const { if (majorVersion == -1 && minorVersion == -1)