aboutsummaryrefslogtreecommitdiffstats
path: root/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'sources/shiboken2/ApiExtractor/abstractmetalang.cpp')
-rw-r--r--sources/shiboken2/ApiExtractor/abstractmetalang.cpp25
1 files changed, 3 insertions, 22 deletions
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);
}