shiboken: Refactor command line arguments handling

In main, replace the class ArgsHandler by plain QMap handling.

Remove the args parameter of Generator::doSetup() and
add a new virtual handleOption(key, value) to the generators
instead. Add missing initialization.

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

1 files changed, 7 insertions, 2 deletions

diff --git a/sources/shiboken2/generator/generator.cpp b/sources/shiboken2/generator/generator.cpp
index 1e2f03932..97c314275 100644
--- a/sources/shiboken2/generator/generator.cpp
+++ b/sources/shiboken2/generator/generator.cpp
@@ -62,7 +62,7 @@ Generator::~Generator()
     delete m_d;
 }
 
-bool Generator::setup(const ApiExtractor& extractor, const QMap< QString, QString > args)
+bool Generator::setup(const ApiExtractor& extractor)
 {
     m_d->apiextractor = &extractor;
     TypeEntryHash allEntries = TypeDatabase::instance()->allEntries();
@@ -84,7 +84,7 @@ bool Generator::setup(const ApiExtractor& extractor, const QMap< QString, QStrin
 
     collectInstantiatedContainersAndSmartPointers();
 
-    return doSetup(args);
+    return doSetup();
 }
 
 QString Generator::getSimplifiedContainerTypeName(const AbstractMetaType* type)
@@ -197,6 +197,11 @@ Generator::OptionDescriptions Generator::options() const
     return OptionDescriptions();
 }
 
+bool Generator::handleOption(const QString & /* key */, const QString & /* value */)
+{
+    return false;
+}
+
 AbstractMetaClassList Generator::classes() const
 {
     return m_d->apiextractor->classes();