aboutsummaryrefslogtreecommitdiffstats
path: root/sources/shiboken2/ApiExtractor
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-06-27 14:11:40 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-06-28 09:32:11 +0000
commitf1194ffa7df1f7a58b77c3e0754d49cd55393433 (patch)
treed0ee13e007857a9af04f11c13747615fcc41b109 /sources/shiboken2/ApiExtractor
parent215b23b5452f7ace4190b284afc2bf14d9d2cdfa (diff)
shiboken: Remove unused code from the generators
Change-Id: I88c4148000acba2ba1e2013fe587e7f5fbe6c2ca Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken2/ApiExtractor')
-rw-r--r--sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp16
-rw-r--r--sources/shiboken2/ApiExtractor/abstractmetabuilder.h2
-rw-r--r--sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h3
-rw-r--r--sources/shiboken2/ApiExtractor/apiextractor.cpp6
-rw-r--r--sources/shiboken2/ApiExtractor/apiextractor.h1
5 files changed, 0 insertions, 28 deletions
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
index 1d8a349f1..493e37754 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
@@ -159,11 +159,6 @@ AbstractMetaEnumList AbstractMetaBuilder::globalEnums() const
return d->m_globalEnums;
}
-QSet<QString> AbstractMetaBuilder::qtMetaTypeDeclaredTypeNames() const
-{
- return d->m_qmetatypeDeclaredTypenames;
-}
-
static QString msgNoFunctionForModification(const QString &signature,
const QString &originalSignature,
const QString &className,
@@ -1046,16 +1041,6 @@ AbstractMetaClass *AbstractMetaBuilderPrivate::traverseClass(const FileModelItem
ComplexTypeEntry* type = TypeDatabase::instance()->findComplexType(fullClassName);
AbstractMetaBuilder::RejectReason reason = AbstractMetaBuilder::NoReason;
- if (fullClassName == QLatin1String("QMetaTypeId")) {
- // QtScript: record which types have been declared
- int lpos = classItem->name().indexOf(QLatin1Char('<'));
- int rpos = classItem->name().lastIndexOf(QLatin1Char('>'));
- if ((lpos != -1) && (rpos != -1)) {
- QString declaredTypename = classItem->name().mid(lpos + 1, rpos - lpos - 1);
- m_qmetatypeDeclaredTypenames.insert(declaredTypename);
- }
- }
-
if (TypeDatabase::instance()->isClassRejected(fullClassName)) {
reason = AbstractMetaBuilder::GenerationDisabled;
} else if (!type) {
@@ -3307,7 +3292,6 @@ static void debugFormatSequence(QDebug &d, const char *key, const Container& c,
void AbstractMetaBuilder::formatDebug(QDebug &debug) const
{
debug << "m_globalHeader=" << d->m_globalHeader.absoluteFilePath();
- debugFormatSequence(debug, "qtMetaTypeDeclaredTypeNames", d->m_qmetatypeDeclaredTypenames);
debugFormatSequence(debug, "globalEnums", d->m_globalEnums, "\n");
debugFormatSequence(debug, "globalFunctions", d->m_globalFunctions, "\n");
if (const int scopeCount = d->m_scopes.size()) {
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.h b/sources/shiboken2/ApiExtractor/abstractmetabuilder.h
index c8381d12b..a0ca71b94 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.h
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.h
@@ -61,8 +61,6 @@ public:
AbstractMetaClassList smartPointers() const;
AbstractMetaFunctionList globalFunctions() const;
AbstractMetaEnumList globalEnums() const;
- // QtScript
- QSet<QString> qtMetaTypeDeclaredTypeNames() const;
/**
* Sorts a list of classes topologically, if an AbstractMetaClass object
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
index 6cbfd8d9d..59e3cfc94 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
@@ -182,9 +182,6 @@ public:
QSet<AbstractMetaClass *> m_setupInheritanceDone;
- // QtScript
- QSet<QString> m_qmetatypeDeclaredTypenames;
-
QString m_logDirectory;
QFileInfo m_globalHeader;
};
diff --git a/sources/shiboken2/ApiExtractor/apiextractor.cpp b/sources/shiboken2/ApiExtractor/apiextractor.cpp
index 2dadda57a..171011cd4 100644
--- a/sources/shiboken2/ApiExtractor/apiextractor.cpp
+++ b/sources/shiboken2/ApiExtractor/apiextractor.cpp
@@ -159,12 +159,6 @@ ContainerTypeEntryList ApiExtractor::containerTypes() const
return TypeDatabase::instance()->containerTypes();
}
-QSet<QString> ApiExtractor::qtMetaTypeDeclaredTypeNames() const
-{
- Q_ASSERT(m_builder);
- return m_builder->qtMetaTypeDeclaredTypeNames();
-}
-
static const AbstractMetaEnum* findEnumOnClasses(AbstractMetaClassList metaClasses, const EnumTypeEntry* typeEntry)
{
const AbstractMetaEnum* result = 0;
diff --git a/sources/shiboken2/ApiExtractor/apiextractor.h b/sources/shiboken2/ApiExtractor/apiextractor.h
index af84223a6..674e5a742 100644
--- a/sources/shiboken2/ApiExtractor/apiextractor.h
+++ b/sources/shiboken2/ApiExtractor/apiextractor.h
@@ -86,7 +86,6 @@ public:
AbstractMetaClassList classesTopologicalSorted(const Dependencies &additionalDependencies = Dependencies()) const;
PrimitiveTypeEntryList primitiveTypes() const;
ContainerTypeEntryList containerTypes() const;
- QSet<QString> qtMetaTypeDeclaredTypeNames() const;
const AbstractMetaEnum* findAbstractMetaEnum(const EnumTypeEntry* typeEntry) const;
const AbstractMetaEnum* findAbstractMetaEnum(const TypeEntry* typeEntry) const;