diff options
| -rw-r--r-- | sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp | 3 | ||||
| -rw-r--r-- | sources/shiboken2/ApiExtractor/abstractmetalang.cpp | 25 | ||||
| -rw-r--r-- | sources/shiboken2/ApiExtractor/abstractmetalang.h | 21 |
3 files changed, 3 insertions, 46 deletions
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp index 3d2afd8bf..8192291bd 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp +++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp @@ -2224,9 +2224,6 @@ AbstractMetaFunction *AbstractMetaBuilderPrivate::traverseFunction(FunctionModel if (functionItem->isAbstract()) *metaFunction += AbstractMetaAttributes::Abstract; - if (!metaFunction->isAbstract()) - *metaFunction += AbstractMetaAttributes::Native; - if (!functionItem->isVirtual()) *metaFunction += AbstractMetaAttributes::Final; diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp index d38eb8587..4827bcb0d 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp +++ b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp @@ -1843,9 +1843,7 @@ static AbstractMetaFunction *createXetter(const AbstractMetaField *g, const QStr f->setImplementingClass(g->enclosingClass()); f->setDeclaringClass(g->enclosingClass()); - AbstractMetaAttributes::Attributes attr = AbstractMetaAttributes::Native - | AbstractMetaAttributes::Final - | type; + AbstractMetaAttributes::Attributes attr = AbstractMetaAttributes::Final | type; if (g->isStatic()) attr |= AbstractMetaAttributes::Static; if (g->isPublic()) @@ -2025,10 +2023,7 @@ void AbstractMetaClass::addDefaultConstructor() f->setArguments(AbstractMetaArgumentList()); f->setDeclaringClass(this); - AbstractMetaAttributes::Attributes attr = AbstractMetaAttributes::Native; - attr |= AbstractMetaAttributes::Public; - attr |= AbstractMetaAttributes::Final; - f->setAttributes(attr); + f->setAttributes(AbstractMetaAttributes::Public | AbstractMetaAttributes::Final); f->setImplementingClass(this); f->setOriginalAttributes(f->attributes()); @@ -2056,8 +2051,7 @@ void AbstractMetaClass::addDefaultCopyConstructor(bool isPrivate) arg->setName(name()); f->addArgument(arg); - AbstractMetaAttributes::Attributes attr = AbstractMetaAttributes::Native; - attr |= AbstractMetaAttributes::Final; + AbstractMetaAttributes::Attributes attr = AbstractMetaAttributes::Final; if (isPrivate) attr |= AbstractMetaAttributes::Private; else @@ -2549,19 +2543,6 @@ void AbstractMetaClass::fixFunctions() (*this) -= AbstractMetaAttributes::Final; } - for (AbstractMetaFunction *f1 : qAsConst(funcs)) { - for (AbstractMetaFunction *f2 : qAsConst(funcs)) { - if (f1 != f2) { - const AbstractMetaFunction::CompareResult cmp = f1->compareTo(f2); - if ((cmp & AbstractMetaFunction::EqualName) - && !f1->isFinalInCpp() - && f2->isFinalInCpp()) { - *f2 += AbstractMetaAttributes::FinalOverload; - } - } - } - } - setFunctions(funcs); } diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.h b/sources/shiboken2/ApiExtractor/abstractmetalang.h index 2643ac0ed..25953b49b 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetalang.h +++ b/sources/shiboken2/ApiExtractor/abstractmetalang.h @@ -113,7 +113,6 @@ public: Friendly = 0x00000008, Visibility = 0x0000000f, - Native = 0x00000010, Abstract = 0x00000020, Static = 0x00000040, @@ -124,15 +123,10 @@ public: GetterFunction = 0x00000400, SetterFunction = 0x00000800, - FinalOverload = 0x00001000, - InterfaceFunction = 0x00002000, - PropertyReader = 0x00004000, PropertyWriter = 0x00008000, PropertyResetter = 0x00010000, - Fake = 0x00020000, - Invokable = 0x00040000, HasRejectedConstructor = 0x00080000, @@ -182,11 +176,6 @@ public: m_attributes &= ~attribute; } - bool isNative() const - { - return m_attributes & Native; - } - bool isFinal() const { return (m_attributes & Final) == Final; @@ -217,16 +206,6 @@ public: return m_attributes & ForceShellImplementation; } - bool isInterfaceFunction() const - { - return m_attributes & InterfaceFunction; - } - - bool isFinalOverload() const - { - return m_attributes & FinalOverload; - } - bool isInvokable() const { return m_attributes & Invokable; |