diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-24 12:02:18 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-24 21:49:47 +0200 |
commit | d6d220b5d319b37d5940cc87ea615f8c1fb5e4eb (patch) | |
tree | 21e6b43b96493a85c735c8e4397c3ed752adc076 /sources | |
parent | 03b9069a7e408568e98cc826c0cb7ea2e5035f1c (diff) |
shiboken2: Remove unused code from AbstractMetaField
Remove the getter/setter functions and related code.
Apparently this was some early, unfinished attempt
at properties.
Task-number: PYSIDE-1019
Change-Id: Iff196da7b7bfb7b30b724405405decf36201b259
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources')
-rw-r--r-- | sources/shiboken2/ApiExtractor/abstractmetalang.cpp | 93 | ||||
-rw-r--r-- | sources/shiboken2/ApiExtractor/abstractmetalang.h | 10 |
2 files changed, 0 insertions, 103 deletions
diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp index 0caaaf40c..2c693c70e 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp +++ b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp @@ -1568,16 +1568,6 @@ void AbstractMetaClass::setFunctions(const AbstractMetaFunctionList &functions) } } -bool AbstractMetaClass::hasFieldAccessors() const -{ - for (const AbstractMetaField *field : m_fields) { - if (field->getter() || field->setter()) - return true; - } - - return false; -} - bool AbstractMetaClass::hasDefaultToStringFunction() const { const AbstractMetaFunctionList &funcs = queryFunctionsByName(QLatin1String("toString")); @@ -1773,12 +1763,6 @@ static bool functions_contains(const AbstractMetaFunctionList &l, const Abstract AbstractMetaField::AbstractMetaField() = default; -AbstractMetaField::~AbstractMetaField() -{ - delete m_setter; - delete m_getter; -} - AbstractMetaField *AbstractMetaField::copy() const { auto *returned = new AbstractMetaField; @@ -1810,55 +1794,6 @@ bool AbstractMetaField::isModifiedRemoved(int types) const return false; } -static QString upCaseFirst(const QString &str) -{ - Q_ASSERT(!str.isEmpty()); - QString s = str; - s[0] = s.at(0).toUpper(); - return s; -} - -static AbstractMetaFunction *createXetter(const AbstractMetaField *g, const QString &name, - AbstractMetaAttributes::Attributes type) -{ - auto *f = new AbstractMetaFunction; - - f->setName(name); - f->setOriginalName(name); - f->setOwnerClass(g->enclosingClass()); - f->setImplementingClass(g->enclosingClass()); - f->setDeclaringClass(g->enclosingClass()); - - AbstractMetaAttributes::Attributes attr = AbstractMetaAttributes::FinalInTargetLang | type; - if (g->isStatic()) - attr |= AbstractMetaAttributes::Static; - if (g->isPublic()) - attr |= AbstractMetaAttributes::Public; - else if (g->isProtected()) - attr |= AbstractMetaAttributes::Protected; - else - attr |= AbstractMetaAttributes::Private; - f->setAttributes(attr); - f->setOriginalAttributes(attr); - - const FieldModificationList &mods = g->modifications(); - for (const FieldModification &mod : mods) { - if (mod.isRenameModifier()) - f->setName(mod.renamedTo()); - if (mod.isAccessModifier()) { - if (mod.isPrivate()) - f->setVisibility(AbstractMetaAttributes::Private); - else if (mod.isProtected()) - f->setVisibility(AbstractMetaAttributes::Protected); - else if (mod.isPublic()) - f->setVisibility(AbstractMetaAttributes::Public); - else if (mod.isFriendly()) - f->setVisibility(AbstractMetaAttributes::Friendly); - } - } - return f; -} - FieldModificationList AbstractMetaField::modifications() const { const FieldModificationList &mods = enclosingClass()->typeEntry()->fieldModifications(); @@ -1872,22 +1807,6 @@ FieldModificationList AbstractMetaField::modifications() const return returned; } -const AbstractMetaFunction *AbstractMetaField::setter() const -{ - if (!m_setter) { - m_setter = createXetter(this, - QLatin1String("set") + upCaseFirst(name()), - AbstractMetaAttributes::SetterFunction); - AbstractMetaArgumentList arguments; - auto *argument = new AbstractMetaArgument; - argument->setType(type()->copy()); - argument->setName(name()); - arguments.append(argument); - m_setter->setArguments(arguments); - } - return m_setter; -} - const AbstractMetaClass *EnclosingClassMixin::targetLangEnclosingClass() const { auto result = m_enclosingClass; @@ -1896,18 +1815,6 @@ const AbstractMetaClass *EnclosingClassMixin::targetLangEnclosingClass() const return result; } -const AbstractMetaFunction *AbstractMetaField::getter() const -{ - if (!m_getter) { - m_getter = createXetter(this, - name(), - AbstractMetaAttributes::GetterFunction); - m_getter->setType(type()); - } - - return m_getter; -} - #ifndef QT_NO_DEBUG_STREAM static void formatMetaAttributes(QDebug &d, AbstractMetaAttributes::Attributes value) { diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.h b/sources/shiboken2/ApiExtractor/abstractmetalang.h index c17051f45..268546d6c 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetalang.h +++ b/sources/shiboken2/ApiExtractor/abstractmetalang.h @@ -717,10 +717,6 @@ class AbstractMetaField : public AbstractMetaVariable, public AbstractMetaAttrib { public: AbstractMetaField(); - ~AbstractMetaField(); - - const AbstractMetaFunction *getter() const; - const AbstractMetaFunction *setter() const; FieldModificationList modifications() const; @@ -733,10 +729,6 @@ public: static AbstractMetaField * find(const AbstractMetaFieldList &haystack, const QString &needle); - -private: - mutable AbstractMetaFunction *m_getter = nullptr; - mutable AbstractMetaFunction *m_setter = nullptr; }; #ifndef QT_NO_DEBUG_STREAM @@ -1538,8 +1530,6 @@ public: m_templateArgs = args; } - bool hasFieldAccessors() const; - // only valid during metabuilder's run QStringList baseClassNames() const { |