1 files changed, 11 insertions, 19 deletions

diff --git a/sources/shiboken6/ApiExtractor/apiextractor.h b/sources/shiboken6/ApiExtractor/apiextractor.h
index fd84f6870..feae9454c 100644
--- a/sources/shiboken6/ApiExtractor/apiextractor.h
+++ b/sources/shiboken6/ApiExtractor/apiextractor.h
@@ -5,10 +5,10 @@
 #define APIEXTRACTOR_H
 
 #include "abstractmetalang_typedefs.h"
-#include "abstractmetatype.h"
 #include "apiextractorflags.h"
 #include "header_paths.h"
 #include "clangparser/compilersupport.h"
+#include "typesystem_typedefs.h"
 
 #include <QtCore/QFileInfoList>
 #include <QtCore/QStringList>
@@ -20,6 +20,8 @@ class AbstractMetaClass;
 class AbstractMetaEnum;
 class AbstractMetaFunction;
 class ComplexTypeEntry;
+struct OptionDescription;
+class OptionsParser;
 
 QT_BEGIN_NAMESPACE
 class QDebug;
@@ -36,27 +38,17 @@ public:
     ApiExtractor();
     ~ApiExtractor();
 
+    static QList<OptionDescription> options();
+    std::shared_ptr<OptionsParser> createOptionsParser();
+
     void setTypeSystem(const QString& typeSystemFileName);
     QString typeSystem() const;
     void setCppFileNames(const QFileInfoList &cppFileNames);
     QFileInfoList cppFileNames() const;
-    void setSkipDeprecated(bool value);
-    static void setSuppressWarnings(bool value);
-    static void setSilent(bool value);
-    static void addTypesystemSearchPath(const QString &path);
-    static void addTypesystemSearchPath(const QStringList& paths);
-    static void setTypesystemKeywords(const QStringList& keywords);
-    void addIncludePath(const HeaderPath& path);
-    void addIncludePath(const HeaderPaths& paths);
     HeaderPaths includePaths() const;
     void setLogDirectory(const QString& logDir);
-    static bool setApiVersion(const QString &package, const QString &version);
-    static void setDropTypeEntries(const QStringList &dropEntries);
     LanguageLevel languageLevel() const;
-    void setLanguageLevel(LanguageLevel languageLevel);
     QStringList clangOptions() const;
-    void setClangOptions(const QStringList &co);
-    static void setUseGlobalHeader(bool h);
 
     const AbstractMetaEnumList &globalEnums() const;
     const AbstractMetaFunctionCList &globalFunctions() const;
@@ -74,13 +66,13 @@ public:
     static AbstractMetaFunctionPtr
         inheritTemplateMember(const AbstractMetaFunctionCPtr &function,
                               const AbstractMetaTypeList &templateTypes,
-                              const AbstractMetaClass *templateClass,
-                              AbstractMetaClass *subclass);
+                              const AbstractMetaClassCPtr &templateClass,
+                              const AbstractMetaClassPtr &subclass);
 
     /// Forwards to AbstractMetaBuilder::inheritTemplateClass()
-    static AbstractMetaClass *
-        inheritTemplateClass(ComplexTypeEntry *te,
-                             const AbstractMetaClass *templateClass,
+    static AbstractMetaClassPtr
+        inheritTemplateClass(const ComplexTypeEntryPtr &te,
+                             const AbstractMetaClassCPtr &templateClass,
                              const AbstractMetaTypeList &templateTypes,
                              InheritTemplateFlags flags = {});