From c5c6e99cd6024a788c069832fa9a97c1a5a8ede6 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 16 Mar 2017 10:39:46 +0100 Subject: MetaLang classes: Remove some unused fields and functions AbstractMetaFunction: - interfaceClass AbstractMetaClass: - orphanInterfaces - PrimaryInterfaceImplementor - referenceCounts() - nonVirtualShellFunctions() - hasInconsistentFunctions() - allVirtualFunctions() - allFinalFunctions() - cppInconsistentFunctions() - interfaceClass - lessThanFunctions - greaterThanFunctions - lessThanEqFunctions - greaterThanEqFunctions Change-Id: I72504ce6d996bb2f8a091ce9c749b3c11b8e936c Reviewed-by: Christian Tismer --- ApiExtractor/abstractmetalang.cpp | 36 ----------- ApiExtractor/abstractmetalang.h | 122 -------------------------------------- 2 files changed, 158 deletions(-) diff --git a/ApiExtractor/abstractmetalang.cpp b/ApiExtractor/abstractmetalang.cpp index 4b890a9d5..4120a86ca 100644 --- a/ApiExtractor/abstractmetalang.cpp +++ b/ApiExtractor/abstractmetalang.cpp @@ -499,7 +499,6 @@ AbstractMetaFunction *AbstractMetaFunction::copy() const cpy->setOriginalName(originalName()); cpy->setOwnerClass(ownerClass()); cpy->setImplementingClass(implementingClass()); - cpy->setInterfaceClass(interfaceClass()); cpy->setFunctionType(functionType()); cpy->setAttributes(attributes()); cpy->setDeclaringClass(declaringClass()); @@ -1259,7 +1258,6 @@ AbstractMetaClass::~AbstractMetaClass() qDeleteAll(m_functions); qDeleteAll(m_fields); qDeleteAll(m_enums); - qDeleteAll(m_orphanInterfaces); if (hasTemplateBaseClassInstantiations()) { foreach (AbstractMetaType* inst, templateBaseClassInstantiations()) delete inst; @@ -1296,7 +1294,6 @@ AbstractMetaClass *AbstractMetaClass::extractInterface() AbstractMetaClass *iface = new AbstractMetaClass; iface->setAttributes(attributes()); iface->setBaseClass(0); - iface->setPrimaryInterfaceImplementor(this); iface->setTypeEntry(typeEntry()->designatedInterface()); @@ -1318,7 +1315,6 @@ AbstractMetaClass *AbstractMetaClass::extractInterface() m_extractedInterface = iface; addInterface(iface); - m_orphanInterfaces << iface; } return m_extractedInterface; @@ -1339,20 +1335,6 @@ AbstractMetaFunctionList AbstractMetaClass::queryFunctionsByName(const QString & return returned; } -/******************************************************************************* - * Returns all reference count modifications for any function in the class - */ -QList AbstractMetaClass::referenceCounts() const -{ - QList returned; - - AbstractMetaFunctionList functions = this->functions(); - foreach (AbstractMetaFunction *function, functions) - returned += function->referenceCounts(this); - - return returned; -} - /******************************************************************************* * Returns a list of all the functions retrieved during parsing which should * be added to the API. @@ -1402,18 +1384,6 @@ AbstractMetaFunctionList AbstractMetaClass::virtualFunctions() const return returned; } -AbstractMetaFunctionList AbstractMetaClass::nonVirtualShellFunctions() const -{ - AbstractMetaFunctionList list = functionsInShellClass(); - AbstractMetaFunctionList returned; - foreach (AbstractMetaFunction *f, list) { - if (f->isFinalInCpp() && !f->isVirtualSlot()) - returned += f; - } - - return returned; -} - AbstractMetaFunctionList AbstractMetaClass::implicitConversions() const { if (!hasCloneOperator() && !hasExternalConversionOperators()) @@ -2206,12 +2176,6 @@ AbstractMetaFunctionList AbstractMetaClass::queryFunctions(FunctionQueryOptions return functions; } - -bool AbstractMetaClass::hasInconsistentFunctions() const -{ - return cppInconsistentFunctions().size() > 0; -} - bool AbstractMetaClass::hasSignals() const { return cppSignalFunctions().size() > 0; diff --git a/ApiExtractor/abstractmetalang.h b/ApiExtractor/abstractmetalang.h index a9502b71a..12fe9768d 100644 --- a/ApiExtractor/abstractmetalang.h +++ b/ApiExtractor/abstractmetalang.h @@ -819,7 +819,6 @@ public: m_class(0), m_implementingClass(0), m_declaringClass(0), - m_interfaceClass(0), m_propertySpec(0), m_constant(false), m_invalid(false), @@ -1153,18 +1152,6 @@ public: */ QString argumentName(int index, bool create = true, const AbstractMetaClass *cl = 0) const; - // If this function stems from an interface, this returns the - // interface that declares it. - const AbstractMetaClass *interfaceClass() const - { - return m_interfaceClass; - } - - void setInterfaceClass(const AbstractMetaClass *cl) - { - m_interfaceClass = cl; - } - void setPropertySpec(QPropertySpec *spec) { m_propertySpec = spec; @@ -1204,7 +1191,6 @@ private: const AbstractMetaClass *m_class; const AbstractMetaClass *m_implementingClass; const AbstractMetaClass *m_declaringClass; - const AbstractMetaClass *m_interfaceClass; QPropertySpec *m_propertySpec; AbstractMetaArgumentList m_arguments; uint m_constant : 1; @@ -1439,7 +1425,6 @@ public: m_baseClass(0), m_templateBaseClass(0), m_extractedInterface(0), - m_primaryInterfaceImplementor(0), m_typeEntry(0), m_stream(false) { @@ -1511,16 +1496,12 @@ public: AbstractMetaFunctionList queryFunctionsByName(const QString &name) const; AbstractMetaFunctionList queryFunctions(FunctionQueryOptions query) const; - inline AbstractMetaFunctionList allVirtualFunctions() const; - inline AbstractMetaFunctionList allFinalFunctions() const; AbstractMetaFunctionList functionsInTargetLang() const; AbstractMetaFunctionList functionsInShellClass() const; - inline AbstractMetaFunctionList cppInconsistentFunctions() const; inline AbstractMetaFunctionList cppSignalFunctions() const; AbstractMetaFunctionList publicOverrideFunctions() const; AbstractMetaFunctionList virtualOverrideFunctions() const; AbstractMetaFunctionList virtualFunctions() const; - AbstractMetaFunctionList nonVirtualShellFunctions() const; AbstractMetaFunctionList implicitConversions() const; /** @@ -1645,7 +1626,6 @@ public: QString qualifiedCppName() const; - bool hasInconsistentFunctions() const; bool hasSignals() const; bool inheritsFrom(const AbstractMetaClass *other) const; @@ -1720,16 +1700,6 @@ public: m_baseClassNames = names; } - AbstractMetaClass *primaryInterfaceImplementor() const - { - return m_primaryInterfaceImplementor; - } - - void setPrimaryInterfaceImplementor(AbstractMetaClass *cl) - { - m_primaryInterfaceImplementor = cl; - } - const ComplexTypeEntry *typeEntry() const { return m_typeEntry; @@ -1790,68 +1760,6 @@ public: QPropertySpec *propertySpecForWrite(const QString &name) const; QPropertySpec *propertySpecForReset(const QString &name) const; - QList referenceCounts() const; - - void setEqualsFunctions(const AbstractMetaFunctionList &lst) - { - m_equalsFunctions = lst; - } - - AbstractMetaFunctionList equalsFunctions() const - { - return m_equalsFunctions; - } - - void setNotEqualsFunctions(const AbstractMetaFunctionList &lst) - { - m_nequalsFunctions = lst; - } - - AbstractMetaFunctionList notEqualsFunctions() const - { - return m_nequalsFunctions; - } - - void setLessThanFunctions(const AbstractMetaFunctionList &lst) - { - m_lessThanFunctions = lst; - } - - AbstractMetaFunctionList lessThanFunctions() const - { - return m_lessThanFunctions; - } - - void setGreaterThanFunctions(const AbstractMetaFunctionList &lst) - { - m_greaterThanFunctions = lst; - } - - AbstractMetaFunctionList greaterThanFunctions() const - { - return m_greaterThanFunctions; - } - - void setLessThanEqFunctions(const AbstractMetaFunctionList &lst) - { - m_lessThanEqFunctions = lst; - } - - AbstractMetaFunctionList lessThanEqFunctions() const - { - return m_lessThanEqFunctions; - } - - void setGreaterThanEqFunctions(const AbstractMetaFunctionList &lst) - { - m_greaterThanEqFunctions = lst; - } - - AbstractMetaFunctionList greaterThanEqFunctions() const - { - return m_greaterThanEqFunctions; - } - /// Returns a list of conversion operators for this class. The conversion operators are defined in other classes of the same module. AbstractMetaFunctionList externalConversionOperators() const { @@ -1944,19 +1852,10 @@ private: AbstractMetaFieldList m_fields; AbstractMetaEnumList m_enums; AbstractMetaClassList m_interfaces; - AbstractMetaClassList m_orphanInterfaces; AbstractMetaClass *m_extractedInterface; - AbstractMetaClass *m_primaryInterfaceImplementor; QList m_propertySpecs; - AbstractMetaFunctionList m_equalsFunctions; - AbstractMetaFunctionList m_nequalsFunctions; AbstractMetaClassList m_innerClasses; - AbstractMetaFunctionList m_lessThanFunctions; - AbstractMetaFunctionList m_greaterThanFunctions; - AbstractMetaFunctionList m_lessThanEqFunctions; - AbstractMetaFunctionList m_greaterThanEqFunctions; - AbstractMetaFunctionList m_externalConversionOperators; QStringList m_baseClassNames; @@ -1965,7 +1864,6 @@ private: // FunctionModelItem m_qDebugStreamFunction; bool m_stream; - static int m_count; }; Q_DECLARE_OPERATORS_FOR_FLAGS(AbstractMetaClass::FunctionQueryOptions) @@ -2054,26 +1952,6 @@ private: int m_index; }; -inline AbstractMetaFunctionList AbstractMetaClass::allVirtualFunctions() const -{ - return queryFunctions(VirtualFunctions | NotRemovedFromTargetLang); -} - -inline AbstractMetaFunctionList AbstractMetaClass::allFinalFunctions() const -{ - return queryFunctions(FinalInTargetLangFunctions - | FinalInCppFunctions - | NotRemovedFromTargetLang); -} - -inline AbstractMetaFunctionList AbstractMetaClass::cppInconsistentFunctions() const -{ - return queryFunctions(Inconsistent - | NormalFunctions - | Visible - | NotRemovedFromTargetLang); -} - inline AbstractMetaFunctionList AbstractMetaClass::cppSignalFunctions() const { return queryFunctions(Signals -- cgit v1.2.3