1 files changed, 9 insertions, 10 deletions
diff --git a/sources/shiboken2/ApiExtractor/apiextractor.h b/sources/shiboken2/ApiExtractor/apiextractor.h
index c8f50f2a5..9c79ae7a5 100644
--- a/sources/shiboken2/ApiExtractor/apiextractor.h
+++ b/sources/shiboken2/ApiExtractor/apiextractor.h
@@ -29,7 +29,6 @@
 #ifndef APIEXTRACTOR_H
 #define APIEXTRACTOR_H
 
-#include "reporthandler.h"
 #include "dependency.h"
 #include "abstractmetalang_typedefs.h"
 #include "apiextractormacros.h"
@@ -37,6 +36,7 @@
 #include "typedatabase_typedefs.h"
 #include "typesystem_typedefs.h"
 #include "clangparser/compilersupport.h"
+#include <QFileInfoList>
 #include <QStringList>
 
 class AbstractMetaBuilder;
@@ -65,9 +65,8 @@ public:
 
     void setTypeSystem(const QString& typeSystemFileName);
     QString typeSystem() const { return m_typeSystemFileName; }
-    void setCppFileName(const QString& cppFileName);
-    QString cppFileName() const { return m_cppFileName; }
-    void setDebugLevel(ReportHandler::DebugLevel debugLevel);
+    void setCppFileNames(const QFileInfoList &cppFileNames);
+    QFileInfoList cppFileNames() const { return m_cppFileNames; }
     void setSkipDeprecated(bool value);
     void setSuppressWarnings(bool value);
     void setSilent(bool value);
@@ -82,10 +81,10 @@ public:
     LanguageLevel languageLevel() const;
     void setLanguageLevel(LanguageLevel languageLevel);
 
-    AbstractMetaEnumList globalEnums() const;
-    AbstractMetaFunctionList globalFunctions() const;
-    AbstractMetaClassList classes() const;
-    AbstractMetaClassList smartPointers() const;
+    const AbstractMetaEnumList &globalEnums() const;
+    const AbstractMetaFunctionList &globalFunctions() const;
+    const AbstractMetaClassList &classes() const;
+    const AbstractMetaClassList &smartPointers() const;
     AbstractMetaClassList classesTopologicalSorted(const Dependencies &additionalDependencies = Dependencies()) const;
     PrimitiveTypeEntryList primitiveTypes() const;
     ContainerTypeEntryList containerTypes() const;
@@ -94,10 +93,10 @@ public:
 
     int classCount() const;
 
-    bool run();
+    bool run(bool usePySideExtensions);
 private:
     QString m_typeSystemFileName;
-    QString m_cppFileName;
+    QFileInfoList m_cppFileNames;
     HeaderPaths m_includePaths;
     AbstractMetaBuilder* m_builder = nullptr;
     QString m_logDirectory;