TypeDatabase: Clean up public API

Remove some unused/deprecated functions, move some
implementations into the source file.
Move some functions into the private section.

Change-Id: I542a38f66208e484c7c8720b30cae290a3f25fbe
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

2 files changed, 37 insertions, 110 deletions

diff --git a/ApiExtractor/typedatabase.cpp b/ApiExtractor/typedatabase.cpp
index 56f7d67..7ce8c2c 100644
--- a/ApiExtractor/typedatabase.cpp
+++ b/ApiExtractor/typedatabase.cpp
@@ -41,12 +41,16 @@ typedef QMap<QString, QByteArray> ApiVersionMap;
 
 Q_GLOBAL_STATIC(ApiVersionMap, apiVersions)
 
-TypeDatabase::TypeDatabase() : m_suppressWarnings(true), m_apiVersion(0)
+TypeDatabase::TypeDatabase() : m_suppressWarnings(true)
 {
     addType(new VoidTypeEntry());
     addType(new VarargsTypeEntry());
 }
 
+TypeDatabase::~TypeDatabase()
+{
+}
+
 TypeDatabase* TypeDatabase::instance(bool newInstance)
 {
     static TypeDatabase* db = 0;
@@ -130,22 +134,6 @@ FunctionTypeEntry* TypeDatabase::findFunctionType(const QString& name) const
     return 0;
 }
 
-
-PrimitiveTypeEntry* TypeDatabase::findTargetLangPrimitiveType(const QString& targetLangName) const
-{
-    for (TypeEntryHash::const_iterator it = m_entries.cbegin(), end = m_entries.cend(); it != end; ++it) {
-        foreach (TypeEntry* e, it.value()) {
-            if (e && e->isPrimitive()) {
-                PrimitiveTypeEntry *pe = static_cast<PrimitiveTypeEntry*>(e);
-                if (pe->targetLangName() == targetLangName && pe->preferredConversion())
-                    return pe;
-            }
-        }
-    }
-
-    return 0;
-}
-
 TypeEntry* TypeDatabase::findType(const QString& name) const
 {
     QList<TypeEntry *> entries = findTypes(name);
@@ -158,6 +146,11 @@ TypeEntry* TypeDatabase::findType(const QString& name) const
     return 0;
 }
 
+QList<TypeEntry *> TypeDatabase::findTypes(const QString &name) const
+{
+    return m_entries.value(name);
+}
+
 SingleTypeEntryHash TypeDatabase::entries() const
 {
     TypeEntryHash entries = allEntries();
@@ -208,9 +201,6 @@ void TypeDatabase::addRejection(const QString& className, const QString& functio
 
 bool TypeDatabase::isClassRejected(const QString& className) const
 {
-    if (!m_rebuildClasses.isEmpty())
-        return !m_rebuildClasses.contains(className);
-
     foreach (const TypeRejection& r, m_rejections) {
         if (r.class_name == className && r.function_name == QLatin1String("*")
             && r.field_name == QLatin1String("*") && r.enum_name == QLatin1String("*")) {
@@ -284,6 +274,11 @@ void TypeDatabase::addTemplate(TemplateEntry *t)
     m_templates[t->name()] = t;
 }
 
+void TypeDatabase::addGlobalUserFunctions(const AddedFunctionList &functions)
+{
+    m_globalUserFunctions << functions;
+}
+
 AddedFunctionList TypeDatabase::findGlobalUserFunctions(const QString& name) const
 {
     AddedFunctionList addedFunctions;
@@ -294,6 +289,10 @@ AddedFunctionList TypeDatabase::findGlobalUserFunctions(const QString& name) con
     return addedFunctions;
 }
 
+void TypeDatabase::addGlobalUserFunctionModifications(const FunctionModificationList &functionModifications)
+{
+    m_functionMods << functionModifications;
+}
 
 QString TypeDatabase::globalNamespaceClassName(const TypeEntry * /*entry*/)
 {
@@ -312,6 +311,11 @@ FunctionModificationList TypeDatabase::functionModifications(const QString& sign
     return lst;
 }
 
+void TypeDatabase::addSuppressedWarning(const QString &s)
+{
+    m_suppressedWarnings.append(s);
+}
+
 bool TypeDatabase::isSuppressedWarning(const QString& s) const
 {
     if (!m_suppressWarnings)
@@ -379,9 +383,6 @@ bool TypeDatabase::parseFile(const QString &filename, bool generate)
 
 bool TypeDatabase::parseFile(QIODevice* device, bool generate)
 {
-    if (m_apiVersion) // backwards compatibility with deprecated API
-        setApiVersion(QLatin1String("*"), QByteArray::number(m_apiVersion));
-
     QXmlInputSource source(device);
     QXmlSimpleReader reader;
     Handler handler(this, generate);
@@ -434,11 +435,6 @@ NamespaceTypeEntry* TypeDatabase::findNamespaceType(const QString& name) const
     return 0;
 }
 
-bool TypeDatabase::supportedApiVersion(double version) const
-{
-    return version <= m_apiVersion;
-}
-
 bool TypeDatabase::shouldDropTypeEntry(const QString& fullTypeName) const
 {
     return m_dropTypeEntries.contains(fullTypeName);
diff --git a/ApiExtractor/typedatabase.h b/ApiExtractor/typedatabase.h
index 0132bb1..d53da45 100644
--- a/ApiExtractor/typedatabase.h
+++ b/ApiExtractor/typedatabase.h
@@ -59,9 +59,9 @@ class PrimitiveTypeEntry;
 class TypeDatabase
 {
     TypeDatabase();
-    TypeDatabase(const TypeDatabase&);
-    TypeDatabase& operator=(const TypeDatabase&);
+    Q_DISABLE_COPY(TypeDatabase)
 public:
+    ~TypeDatabase();
 
     /**
     * Return the type system instance.
@@ -76,11 +76,6 @@ public:
 
     void addRequiredTargetImport(const QString& moduleName);
 
-    QStringList typesystemPaths() const
-    {
-        return m_typesystemPaths;
-    }
-
     void addTypesystemPath(const QString& typesystem_paths);
 
     IncludeList extraIncludes(const QString& className) const;
@@ -94,20 +89,10 @@ public:
 
     TypeEntry* findType(const QString& name) const;
 
-    QList<TypeEntry *> findTypes(const QString &name) const
-    {
-        return m_entries.value(name);
-    }
-
-    TypeEntryHash allEntries() const
-    {
-        return m_entries;
-    }
+    TypeEntryHash allEntries() const { return m_entries; }
 
     SingleTypeEntryHash entries() const;
 
-    PrimitiveTypeEntry* findTargetLangPrimitiveType(const QString& targetLangName) const;
-
     QList<const PrimitiveTypeEntry*> primitiveTypes() const;
 
     QList<const ContainerTypeEntry*> containerTypes() const;
@@ -121,100 +106,48 @@ public:
 
     void addType(TypeEntry* e);
 
-    SingleTypeEntryHash flagsEntries() const
-    {
-        return m_flagsEntries;
-    }
     FlagsTypeEntry* findFlagsType(const QString& name) const;
     void addFlagsType(FlagsTypeEntry* fte);
 
-    TemplateEntry* findTemplate(const QString& name) const
-    {
-        return m_templates[name];
-    }
+    TemplateEntry *findTemplate(const QString& name) const { return m_templates[name]; }
 
     void addTemplate(TemplateEntry* t);
 
-    AddedFunctionList globalUserFunctions() const
-    {
-        return m_globalUserFunctions;
-    }
+    AddedFunctionList globalUserFunctions() const { return m_globalUserFunctions; }
 
-    void addGlobalUserFunctions(const AddedFunctionList& functions)
-    {
-        m_globalUserFunctions << functions;
-    }
+    void addGlobalUserFunctions(const AddedFunctionList &functions);
 
     AddedFunctionList findGlobalUserFunctions(const QString& name) const;
 
-    void addGlobalUserFunctionModifications(const FunctionModificationList& functionModifications)
-    {
-        m_functionMods << functionModifications;
-    }
-
-    void addGlobalUserFunctionModification(const FunctionModification& functionModification)
-    {
-        m_functionMods << functionModification;
-    }
+    void addGlobalUserFunctionModifications(const FunctionModificationList &functionModifications);
 
     FunctionModificationList functionModifications(const QString& signature) const;
 
-    void setSuppressWarnings(bool on)
-    {
-        m_suppressWarnings = on;
-    }
+    void setSuppressWarnings(bool on) { m_suppressWarnings = on; }
 
-    void addSuppressedWarning(const QString& s)
-    {
-        m_suppressedWarnings.append(s);
-    }
+    void addSuppressedWarning(const QString &s);
 
     bool isSuppressedWarning(const QString& s) const;
 
-    void setRebuildClasses(const QStringList &cls)
-    {
-        m_rebuildClasses = cls;
-    }
-
     static QString globalNamespaceClassName(const TypeEntry *te);
-    QString filename() const
-    {
-        return QLatin1String("typesystem.txt");
-    }
 
-    QString modifiedTypesystemFilepath(const QString& tsFile) const;
     bool parseFile(const QString &filename, bool generate = true);
     bool parseFile(QIODevice* device, bool generate = true);
 
-    APIEXTRACTOR_DEPRECATED(double apiVersion() const)
-    {
-        return m_apiVersion;
-    }
-
-    APIEXTRACTOR_DEPRECATED(void setApiVersion(double version))
-    {
-        m_apiVersion = version;
-    }
     void setApiVersion(const QString& package, const QByteArray& version);
 
-    APIEXTRACTOR_DEPRECATED(bool supportedApiVersion(double version) const);
     bool checkApiVersion(const QString& package, const QByteArray& version) const;
 
-    const QStringList& dropTypeEntries() const
-    {
-        return m_dropTypeEntries;
-    }
-
-    bool hasDroppedTypeEntries() const
-    {
-        return !m_dropTypeEntries.isEmpty();
-    }
+    bool hasDroppedTypeEntries() const { return !m_dropTypeEntries.isEmpty(); }
 
     bool shouldDropTypeEntry(const QString& fullTypeName) const;
 
     void setDropTypeEntries(QStringList dropTypeEntries);
 
 private:
+    QList<TypeEntry *> findTypes(const QString &name) const;
+    QString modifiedTypesystemFilepath(const QString &tsFile) const;
+
     bool m_suppressWarnings;
     TypeEntryHash m_entries;
     SingleTypeEntryHash m_flagsEntries;
@@ -230,9 +163,7 @@ private:
     QHash<QString, bool> m_parsedTypesystemFiles;
 
     QList<TypeRejection> m_rejections;
-    QStringList m_rebuildClasses;
 
-    double m_apiVersion;
     QStringList m_dropTypeEntries;
 };