2 files changed, 63 insertions, 0 deletions

diff --git a/apiextractor.cpp b/apiextractor.cpp
index 8a2805383..b81689baf 100644
--- a/apiextractor.cpp
+++ b/apiextractor.cpp
@@ -57,11 +57,22 @@ void ApiExtractor::addTypesystemSearchPath ( const QString& path )
     TypeDatabase::instance()->addTypesystemPath(path);
 }
 
+void ApiExtractor::addTypesystemSearchPath ( const QStringList& paths )
+{
+    foreach (QString path, paths)
+        addTypesystemSearchPath(path);
+}
+
 void ApiExtractor::addIncludePath ( const QString& path )
 {
     m_includePaths << path;
 }
 
+void ApiExtractor::addIncludePath ( const QStringList& paths )
+{
+    m_includePaths << paths;
+}
+
 void ApiExtractor::setCppFileName(const QString& cppFileName)
 {
     m_cppFileName = cppFileName;
@@ -87,6 +98,46 @@ void ApiExtractor::setSilent ( bool value )
     ReportHandler::setSilent(value);
 }
 
+AbstractMetaEnumList ApiExtractor::globalEnums() const
+{
+    Q_ASSERT(m_builder);
+    return m_builder->globalEnums();
+}
+
+AbstractMetaFunctionList ApiExtractor::globalFunctions() const
+{
+    Q_ASSERT(m_builder);
+    return m_builder->globalFunctions();
+}
+
+AbstractMetaClassList ApiExtractor::classes() const
+{
+    Q_ASSERT(m_builder);
+    return m_builder->classes();
+}
+
+PrimitiveTypeEntryList ApiExtractor::primitiveTypes() const
+{
+    return TypeDatabase::instance()->primitiveTypes();
+}
+
+ContainerTypeEntryList ApiExtractor::containerTypes() const
+{
+    return TypeDatabase::instance()->containerTypes();
+}
+
+QSet<QString> ApiExtractor::qtMetaTypeDeclaredTypeNames() const
+{
+    Q_ASSERT(m_builder);
+    return m_builder->qtMetaTypeDeclaredTypeNames();
+}
+
+int ApiExtractor::classCount() const
+{
+    Q_ASSERT(m_builder);
+    return m_builder->classes().count();
+}
+
 bool ApiExtractor::run()
 {
     if (m_builder)
diff --git a/apiextractor.h b/apiextractor.h
index 8cad8f1da..2c65ed461 100644
--- a/apiextractor.h
+++ b/apiextractor.h
@@ -25,6 +25,7 @@
 #define APIEXTRACTOR_H
 
 #include "reporthandler.h"
+#include "abstractmetalang.h"
 #include <QStringList>
 
 class AbstractMetaBuilder;
@@ -42,7 +43,18 @@ public:
     void setSuppressWarnings(bool value);
     void setSilent(bool value);
     void addTypesystemSearchPath(const QString& path);
+    void addTypesystemSearchPath(const QStringList& paths);
     void addIncludePath(const QString& path);
+    void addIncludePath(const QStringList& paths);
+
+    AbstractMetaEnumList globalEnums() const;
+    AbstractMetaFunctionList globalFunctions() const;
+    AbstractMetaClassList classes() const;
+    PrimitiveTypeEntryList primitiveTypes() const;
+    ContainerTypeEntryList containerTypes() const;
+    QSet<QString> qtMetaTypeDeclaredTypeNames() const;
+
+    int classCount() const;
 
     bool run();
 private: