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>

7 files changed, 190 insertions, 179 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();
diff --git a/sources/shiboken2/generator/generator.h b/sources/shiboken2/generator/generator.h
index 010ed868c..6028afa64 100644
--- a/sources/shiboken2/generator/generator.h
+++ b/sources/shiboken2/generator/generator.h
@@ -166,9 +166,10 @@ public:
     Generator();
     virtual ~Generator();
 
-    bool setup(const ApiExtractor& extractor, const QMap<QString, QString> args);
+    bool setup(const ApiExtractor& extractor);
 
     virtual OptionDescriptions options() const;
+    virtual bool handleOption(const QString &key, const QString &value);
 
     /// Returns the classes used to generate the binding code.
     AbstractMetaClassList classes() const;
@@ -348,7 +349,7 @@ protected:
     virtual QString fileNameForContext(GeneratorContext &context) const = 0;
 
 
-    virtual bool doSetup(const QMap<QString, QString>& args) = 0;
+    virtual bool doSetup() = 0;
 
     /**
      *   Write the bindding code for an AbstractMetaClass.
diff --git a/sources/shiboken2/generator/main.cpp b/sources/shiboken2/generator/main.cpp
index 7ee43710e..6dcd61a5c 100644
--- a/sources/shiboken2/generator/main.cpp
+++ b/sources/shiboken2/generator/main.cpp
@@ -54,85 +54,14 @@ static inline QString typesystemPathOption() { return QStringLiteral("typesystem
 static inline QString helpOption() { return QStringLiteral("help"); }
 static const char helpHint[] = "Note: use --help or -h for more information.\n";
 
-namespace {
+typedef QMap<QString, QString> CommandArgumentMap;
 
-class ArgsHandler
+static QString msgLeftOverArguments(const CommandArgumentMap &remainingArgs)
 {
-public:
-    explicit ArgsHandler(const QMap<QString, QString>& other);
-    virtual ~ArgsHandler();
-
-    inline QMap<QString, QString>& args() const
-    {
-        return *m_args;
-    }
-
-    inline bool argExists(const QString& s) const
-    {
-        return m_args->contains(s);
-    }
-
-    QString removeArg(const QString& s);
-    bool argExistsRemove(const QString& s);
-
-    inline QString argValue(const QString& s) const
-    {
-        return m_args->value(s);
-    }
-
-    inline bool noArgs() const
-    {
-        return m_args->isEmpty();
-    }
-
-    QString errorMessage() const;
-
-private:
-    QMap<QString, QString>* m_args;
-};
-
-ArgsHandler::ArgsHandler(const QMap<QString, QString>& other)
-    : m_args(new QMap<QString, QString>(other))
-{
-}
-
-ArgsHandler::~ArgsHandler()
-{
-    delete m_args;
-}
-
-QString ArgsHandler::removeArg(const QString& s)
-{
-    QString retval;
-
-    if (argExists(s)) {
-        retval = argValue(s);
-        m_args->remove(s);
-    }
-
-    return retval;
-}
-
-bool ArgsHandler::argExistsRemove(const QString& s)
-{
-    bool retval = false;
-
-    if (argExists(s)) {
-        retval = true;
-        m_args->remove(s);
-    }
-
-    return retval;
-}
-
-QString ArgsHandler::errorMessage() const
-{
-    typedef QMap<QString, QString>::ConstIterator StringMapConstIt;
-
     QString message;
     QTextStream str(&message);
     str << "shiboken: Called with wrong arguments:";
-    for (StringMapConstIt it = m_args->cbegin(), end = m_args->cend(); it != end; ++it) {
+    for (auto it = remainingArgs.cbegin(), end = remainingArgs.cend(); it != end; ++it) {
         str << ' ' << it.key();
         if (!it.value().isEmpty())
             str << ' ' << it.value();
@@ -140,7 +69,6 @@ QString ArgsHandler::errorMessage() const
     str << "\nCommand line: " << QCoreApplication::arguments().join(QLatin1Char(' '));
     return message;
 }
-}
 
 typedef Generator::OptionDescriptions OptionDescriptions;
 
@@ -233,9 +161,9 @@ static bool processProjectFile(QFile& projectFile, QMap<QString, QString>& args)
     return true;
 }
 
-static QMap<QString, QString> getInitializedArguments()
+static CommandArgumentMap getInitializedArguments()
 {
-    QMap<QString, QString> args;
+    CommandArgumentMap args;
     QStringList arguments = QCoreApplication::arguments();
     QString appName = arguments.constFirst();
     arguments.removeFirst();
@@ -277,9 +205,9 @@ static QMap<QString, QString> getInitializedArguments()
 // Concatenate values of path arguments that can occur multiple times on the
 // command line.
 static void addPathOptionValue(const QString &option, const QString &value,
-                               QMap<QString, QString> &args)
+                               CommandArgumentMap &args)
 {
-    const QMap<QString, QString>::iterator it = args.find(option);
+    const CommandArgumentMap::iterator it = args.find(option);
     if (it != args.end())
         it.value().append(QLatin1String(PATH_SPLITTER) + value);
     else
@@ -445,12 +373,15 @@ static QString msgInvalidVersion(const QString &package, const QString &version)
 }
 
 static void parseIncludePathOption(const QString &option, HeaderType headerType,
-                                   ArgsHandler &args,
+                                   CommandArgumentMap &args,
                                    ApiExtractor &extractor)
 {
-    const QString path = args.removeArg(option);
-    if (!path.isEmpty()) {
-        const QStringList includePathListList = path.split(QLatin1String(PATH_SPLITTER));
+    const CommandArgumentMap::iterator it = args.find(option);
+    if (it != args.end()) {
+        const QString path = it.value();
+        const QStringList includePathListList =
+            it.value().split(QLatin1String(PATH_SPLITTER), QString::SkipEmptyParts);
+        args.erase(it);
         for (const QString &s : includePathListList)
             extractor.addIncludePath(HeaderPath{QFile::encodeName(s), headerType});
     }
@@ -466,19 +397,24 @@ int main(int argc, char *argv[])
     qCDebug(lcShiboken()).noquote().nospace() << QCoreApplication::arguments().join(QLatin1Char(' '));
 
     // Store command arguments in a map
-    QMap<QString, QString> args = getCommandLineArgs();
-    ArgsHandler argsHandler(args);
+    CommandArgumentMap args = getCommandLineArgs();
     Generators generators;
 
-    if (argsHandler.argExistsRemove(QLatin1String("version"))) {
+    CommandArgumentMap::iterator ait = args.find(QLatin1String("version"));
+    if (ait != args.end()) {
+        args.erase(ait);
         printVerAndBanner();
         return EXIT_SUCCESS;
     }
 
-    QString generatorSet = argsHandler.removeArg(QLatin1String("generator-set"));
-    // Also check QLatin1String("generatorSet") command line argument for backward compatibility.
-    if (generatorSet.isEmpty())
-        generatorSet = argsHandler.removeArg(QLatin1String("generatorSet"));
+    QString generatorSet;
+    ait = args.find(QLatin1String("generator-set"));
+    if (ait == args.end()) // Also check QLatin1String("generatorSet") command line argument for backward compatibility.
+        ait = args.find(QLatin1String("generatorSet"));
+    if (ait != args.end()) {
+        generatorSet = ait.value();
+        args.erase(ait);
+    }
 
     // Pre-defined generator sets.
     if (generatorSet == QLatin1String("qtdoc")) {
@@ -494,28 +430,33 @@ int main(int argc, char *argv[])
         return EXIT_FAILURE;
     }
 
-    if (argsHandler.argExistsRemove(QLatin1String("help"))) {
+    ait = args.find(QLatin1String("help"));
+    if (ait != args.end()) {
+        args.erase(ait);
         printUsage();
         return EXIT_SUCCESS;
     }
 
     QString licenseComment;
-    QString licenseFileName = argsHandler.removeArg(QLatin1String("license-file"));
-    if (!licenseFileName.isEmpty()) {
-        if (QFile::exists(licenseFileName)) {
-            QFile licenseFile(licenseFileName);
-            if (licenseFile.open(QIODevice::ReadOnly))
-                licenseComment = QString::fromUtf8(licenseFile.readAll());
+    ait = args.find(QLatin1String("license-file"));
+    if (ait != args.end()) {
+        QFile licenseFile(ait.value());
+        args.erase(ait);
+        if (licenseFile.open(QIODevice::ReadOnly)) {
+            licenseComment = QString::fromUtf8(licenseFile.readAll());
         } else {
-            errorPrint(QStringLiteral("Couldn't find the file containing the license heading: %1").
-                       arg(licenseFileName));
+            errorPrint(QStringLiteral("Could not open the file \"%1\" containing the license heading: %2").
+                       arg(QDir::toNativeSeparators(licenseFile.fileName()), licenseFile.errorString()));
             return EXIT_FAILURE;
         }
     }
 
-    QString outputDirectory = argsHandler.removeArg(QLatin1String("output-directory"));
-    if (outputDirectory.isEmpty())
-        outputDirectory = QLatin1String("out");
+    QString outputDirectory = QLatin1String("out");
+    ait = args.find(QLatin1String("output-directory"));
+    if (ait != args.end()) {
+        outputDirectory = ait.value();
+        args.erase(ait);
+    }
 
     if (!QDir(outputDirectory).exists()) {
         if (!QDir().mkpath(outputDirectory)) {
@@ -529,11 +470,15 @@ int main(int argc, char *argv[])
     ApiExtractor extractor;
     extractor.setLogDirectory(outputDirectory);
 
-    if (argsHandler.argExistsRemove(QLatin1String("silent"))) {
+    ait = args.find(QLatin1String("silent"));
+    if (ait != args.end()) {
         extractor.setSilent(true);
+        args.erase(ait);
     } else {
-        QString level = argsHandler.removeArg(QLatin1String("debug-level"));
-        if (!level.isEmpty()) {
+        ait = args.find(QLatin1String("debug-level"));
+        if (ait != args.end()) {
+            const QString level = ait.value();
+            args.erase(ait);
             if (level == QLatin1String("sparse"))
                 extractor.setDebugLevel(ReportHandler::SparseDebug);
             else if (level == QLatin1String("medium"))
@@ -542,11 +487,15 @@ int main(int argc, char *argv[])
                 extractor.setDebugLevel(ReportHandler::FullDebug);
         }
     }
-    if (argsHandler.argExistsRemove(QLatin1String("no-suppress-warnings")))
+    ait = args.find(QLatin1String("no-suppress-warnings"));
+    if (ait != args.end()) {
+        args.erase(ait);
         extractor.setSuppressWarnings(false);
-
-    if (argsHandler.argExists(QLatin1String("api-version"))) {
-        const QStringList &versions = argsHandler.removeArg(QLatin1String("api-version")).split(QLatin1Char('|'));
+    }
+    ait = args.find(QLatin1String("api-version"));
+    if (ait != args.end()) {
+        const QStringList &versions = ait.value().split(QLatin1Char('|'));
+        args.erase(ait);
         for (const QString &fullVersion : versions) {
             QStringList parts = fullVersion.split(QLatin1Char(','));
             QString package;
@@ -560,54 +509,65 @@ int main(int argc, char *argv[])
         }
     }
 
-    if (argsHandler.argExists(QLatin1String("drop-type-entries")))
-        extractor.setDropTypeEntries(argsHandler.removeArg(QLatin1String("drop-type-entries")));
+    ait = args.find(QLatin1String("drop-type-entries"));
+    if (ait != args.end()) {
+        extractor.setDropTypeEntries(ait.value());
+        args.erase(ait);
+    }
 
-    QString path = argsHandler.removeArg(QLatin1String("typesystem-paths"));
-    if (!path.isEmpty())
-        extractor.addTypesystemSearchPath(path.split(QLatin1String(PATH_SPLITTER)));
+    ait = args.find(QLatin1String("typesystem-paths"));
+    if (ait != args.end()) {
+        extractor.addTypesystemSearchPath(ait.value().split(QLatin1String(PATH_SPLITTER)));
+        args.erase(ait);
+    }
 
     parseIncludePathOption(includePathOption(), HeaderType::Standard,
-                           argsHandler, extractor);
+                           args, extractor);
     parseIncludePathOption(frameworkIncludePathOption(), HeaderType::Framework,
-                           argsHandler, extractor);
+                           args, extractor);
     parseIncludePathOption(systemIncludePathOption(), HeaderType::System,
-                           argsHandler, extractor);
+                           args, extractor);
 
-    QString cppFileName = argsHandler.removeArg(QLatin1String("arg-1"));
+    ait = args.find(QLatin1String("arg-1"));
+    if (ait == args.end()) {
+        errorPrint(QLatin1String("Required argument header-file is missing."));
+        return EXIT_FAILURE;
+    }
+    const QString cppFileName = ait.value();
+    args.erase(ait);
     const QFileInfo cppFileNameFi(cppFileName);
     if (!cppFileNameFi.isFile() && !cppFileNameFi.isSymLink()) {
         errorPrint(QLatin1Char('"') + cppFileName + QLatin1String("\" does not exist."));
         return EXIT_FAILURE;
     }
 
-    QString typeSystemFileName = argsHandler.removeArg(QLatin1String("arg-2"));
+    ait = args.find(QLatin1String("arg-2"));
+    if (ait == args.end()) {
+        errorPrint(QLatin1String("Required argument typesystem-file is missing."));
+        return EXIT_FAILURE;
+    }
+    const QString typeSystemFileName = ait.value();
+    args.erase(ait);
     QString messagePrefix = QFileInfo(typeSystemFileName).baseName();
     if (messagePrefix.startsWith(QLatin1String("typesystem_")))
         messagePrefix.remove(0, 11);
     ReportHandler::setPrefix(QLatin1Char('(') + messagePrefix + QLatin1Char(')'));
 
-    /* Make sure to remove the project file's arguments (if any) and
-     * --project-file, also the arguments of each generator before
-     * checking if there isn't any existing arguments in argsHandler.
-     */
-    argsHandler.removeArg(QLatin1String("project-file"));
-    QMap<QString, QString> projectFileArgs = getInitializedArguments();
-    if (!projectFileArgs.isEmpty()) {
-        QMap<QString, QString>::const_iterator it =
-                                projectFileArgs.constBegin();
-        for ( ; it != projectFileArgs.constEnd(); ++it)
-            argsHandler.removeArg(it.key());
-    }
-    for (const GeneratorPtr &generator : qAsConst(generators)) {
-        const OptionDescriptions &options = generator->options();
-        for (const auto &od : options)
-            argsHandler.removeArg(od.first);
-    }
-
-    const QString languageLevel = argsHandler.removeArg(languageLevelOption());
-    if (!languageLevel.isEmpty()) {
-        const QByteArray languageLevelBA = languageLevel.toLatin1();
+    // Pass option to all generators (Cpp/Header generator have the same options)
+    for (ait = args.begin(); ait != args.end(); ) {
+        bool found = false;
+        for (const GeneratorPtr &generator : qAsConst(generators))
+            found |= generator->handleOption(ait.key(), ait.value());
+        if (found)
+            ait = args.erase(ait);
+        else
+            ++ait;
+    }
+
+    ait = args.find(languageLevelOption());
+    if (ait != args.end()) {
+        const QByteArray languageLevelBA = ait.value().toLatin1();
+        args.erase(ait);
         const LanguageLevel level = clang::languageLevelFromOption(languageLevelBA.constData());
         if (level == LanguageLevel::Default) {
             std::cout << "Invalid argument for language level: \""
@@ -617,8 +577,17 @@ int main(int argc, char *argv[])
         extractor.setLanguageLevel(level);
     }
 
-    if (!argsHandler.noArgs()) {
-        errorPrint(argsHandler.errorMessage());
+    /* Make sure to remove the project file's arguments (if any) and
+     * --project-file, also the arguments of each generator before
+     * checking if there isn't any existing arguments in argsHandler.
+     */
+    args.remove(QLatin1String("project-file"));
+    CommandArgumentMap projectFileArgs = getInitializedArguments();
+    for (auto it = projectFileArgs.cbegin(), end = projectFileArgs.cend(); it != end; ++it)
+        args.remove(it.key());
+
+    if (!args.isEmpty()) {
+        errorPrint(msgLeftOverArguments(args));
         std::cout << helpHint;
         return EXIT_FAILURE;
     }
@@ -644,12 +613,10 @@ int main(int argc, char *argv[])
     for (const GeneratorPtr &g : qAsConst(generators)) {
         g->setOutputDirectory(outputDirectory);
         g->setLicenseComment(licenseComment);
-         if (g->setup(extractor, args)) {
-             if (!g->generate()) {
-                 errorPrint(QLatin1String("Error running generator: ")
-                            + QLatin1String(g->name()) + QLatin1Char('.'));
-                 return EXIT_FAILURE;
-             }
+         if (!g->setup(extractor) || !g->generate()) {
+             errorPrint(QLatin1String("Error running generator: ")
+                        + QLatin1String(g->name()) + QLatin1Char('.'));
+             return EXIT_FAILURE;
          }
     }
 
diff --git a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
index 3ed278871..775b541b1 100644
--- a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
+++ b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
@@ -2259,22 +2259,19 @@ void QtDocGenerator::writeAdditionalDocumentation()
            successCount, count);
 }
 
-bool QtDocGenerator::doSetup(const QMap<QString, QString>& args)
-{
-    m_libSourceDir = args.value(QLatin1String("library-source-dir"));
-    m_docDataDir = args.value(QLatin1String("documentation-data-dir"));
 #ifdef __WIN32__
 #   define PATH_SEP ';'
 #else
 #   define PATH_SEP ':'
 #endif
-    m_codeSnippetDirs = args.value(QLatin1String("documentation-code-snippets-dir"), m_libSourceDir).split(QLatin1Char(PATH_SEP));
-    m_extraSectionDir = args.value(QLatin1String("documentation-extra-sections-dir"));
 
-    m_docParser = args.value(QLatin1String("doc-parser")) == QLatin1String("doxygen")
-        ? static_cast<DocParser*>(new DoxygenParser)
-        : static_cast<DocParser*>(new QtDocParser);
-    qCDebug(lcShiboken).noquote().nospace() << "doc-parser: " << args.value(QLatin1String("doc-parser"));
+bool QtDocGenerator::doSetup()
+{
+    if (m_codeSnippetDirs.isEmpty())
+        m_codeSnippetDirs = m_libSourceDir.split(QLatin1Char(PATH_SEP));
+
+    if (!m_docParser)
+        m_docParser = new QtDocParser;
 
     if (m_libSourceDir.isEmpty() || m_docDataDir.isEmpty()) {
         qCWarning(lcShiboken) << "Documentation data dir and/or Qt source dir not informed, "
@@ -2284,7 +2281,6 @@ bool QtDocGenerator::doSetup(const QMap<QString, QString>& args)
         m_docParser->setDocumentationDataDirectory(m_docDataDir);
         m_docParser->setLibrarySourceDirectory(m_libSourceDir);
     }
-    m_additionalDocumentationList = args.value(additionalDocumentationOption());
     return true;
 }
 
@@ -2308,3 +2304,33 @@ Generator::OptionDescriptions QtDocGenerator::options() const
                                    "(for example, tutorials)."));
 }
 
+bool QtDocGenerator::handleOption(const QString &key, const QString &value)
+{
+    if (key == QLatin1String("library-source-dir")) {
+        m_libSourceDir = value;
+        return true;
+    }
+    if (key == QLatin1String("documentation-data-dir")) {
+        m_docDataDir = value;
+        return true;
+    }
+    if (key == QLatin1String("documentation-code-snippets-dir")) {
+        m_codeSnippetDirs = value.split(QLatin1Char(PATH_SEP));
+        return true;
+    }
+    if (key == QLatin1String("documentation-extra-sections-dir")) {
+        m_extraSectionDir = value;
+        return true;
+    }
+    if (key == QLatin1String("doc-parser")) {
+        qCDebug(lcShiboken).noquote().nospace() << "doc-parser: " << value;
+        if (value == QLatin1String("doxygen"))
+            m_docParser = new DoxygenParser;
+        return true;
+    }
+    if (key == additionalDocumentationOption()) {
+        m_additionalDocumentationList = value;
+        return true;
+    }
+    return false;
+}
diff --git a/sources/shiboken2/generator/qtdoc/qtdocgenerator.h b/sources/shiboken2/generator/qtdoc/qtdocgenerator.h
index e467abe90..978668c4c 100644
--- a/sources/shiboken2/generator/qtdoc/qtdocgenerator.h
+++ b/sources/shiboken2/generator/qtdoc/qtdocgenerator.h
@@ -209,7 +209,7 @@ public:
 
     QString docDataDir() const { return m_docDataDir; }
 
-    bool doSetup(const QMap<QString, QString>& args) override;
+    bool doSetup() override;
 
     const char* name() const override
     {
@@ -217,6 +217,7 @@ public:
     }
 
     OptionDescriptions options() const override;
+    bool handleOption(const QString &key, const QString &value) override;
 
     QStringList codeSnippetDirs() const
     {
diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
index 0965a373a..1d3f52ba4 100644
--- a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
@@ -2431,6 +2431,23 @@ Generator::OptionDescriptions ShibokenGenerator::options() const
                                    "the value of boolean casts"));
 }
 
+bool ShibokenGenerator::handleOption(const QString &key, const QString & /* value */)
+{
+    if (key == QLatin1String(PARENT_CTOR_HEURISTIC))
+        return (m_useCtorHeuristic = true);
+    if (key == QLatin1String(ENABLE_PYSIDE_EXTENSIONS))
+        return (m_usePySideExtensions = true);
+    if (key == QLatin1String(RETURN_VALUE_HEURISTIC))
+        return (m_userReturnValueHeuristic = true);
+    if (key == QLatin1String(DISABLE_VERBOSE_ERROR_MESSAGES))
+        return (m_verboseErrorMessagesDisabled = true);
+    if (key == QLatin1String(USE_ISNULL_AS_NB_NONZERO))
+        return (m_useIsNullAsNbNonZero = true);
+    if (key == QLatin1String(AVOID_PROTECTED_HACK))
+        return (m_avoidProtectedHack = true);
+    return false;
+}
+
 static void getCode(QStringList& code, const CodeSnipList& codeSnips)
 {
     for (const CodeSnip &snip : qAsConst(codeSnips))
@@ -2456,15 +2473,8 @@ static void getCode(QStringList& code, const TypeEntry* type)
         code.append(toNative->conversion());
 }
 
-bool ShibokenGenerator::doSetup(const QMap<QString, QString>& args)
+bool ShibokenGenerator::doSetup()
 {
-    m_useCtorHeuristic = args.contains(QLatin1String(PARENT_CTOR_HEURISTIC));
-    m_usePySideExtensions = args.contains(QLatin1String(ENABLE_PYSIDE_EXTENSIONS));
-    m_userReturnValueHeuristic = args.contains(QLatin1String(RETURN_VALUE_HEURISTIC));
-    m_verboseErrorMessagesDisabled = args.contains(QLatin1String(DISABLE_VERBOSE_ERROR_MESSAGES));
-    m_useIsNullAsNbNonZero = args.contains(QLatin1String(USE_ISNULL_AS_NB_NONZERO));
-    m_avoidProtectedHack = args.contains(QLatin1String(AVOID_PROTECTED_HACK));
-
     TypeDatabase* td = TypeDatabase::instance();
     QStringList snips;
     const PrimitiveTypeEntryList &primitiveTypeList = primitiveTypes();
diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.h b/sources/shiboken2/generator/shiboken2/shibokengenerator.h
index cb1bdd11f..d06803e82 100644
--- a/sources/shiboken2/generator/shiboken2/shibokengenerator.h
+++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.h
@@ -414,6 +414,7 @@ public:
     QString getModuleHeaderFileName(const QString& moduleName = QString()) const;
 
     OptionDescriptions options() const override;
+    bool handleOption(const QString &key, const QString &value) override;
 
     /// Returns true if the user enabled the so called "parent constructor heuristic".
     bool useCtorHeuristic() const;
@@ -462,7 +463,7 @@ public:
      */
     static QString getDefaultValue(const AbstractMetaFunction* func, const AbstractMetaArgument* arg);
 protected:
-    bool doSetup(const QMap<QString, QString>& args);
+    bool doSetup() override;
     void collectContainerTypesFromConverterMacros(const QString& code, bool toPythonMacro);
     // verify whether the class is copyable
     bool isCopyable(const AbstractMetaClass* metaClass);
@@ -517,12 +518,12 @@ protected:
     static QString msgCouldNotFindMinimalConstructor(const QString &where, const QString &type);
 
 private:
-    bool m_useCtorHeuristic;
-    bool m_userReturnValueHeuristic;
-    bool m_usePySideExtensions;
-    bool m_verboseErrorMessagesDisabled;
-    bool m_useIsNullAsNbNonZero;
-    bool m_avoidProtectedHack;
+    bool m_useCtorHeuristic = false;
+    bool m_userReturnValueHeuristic = false;
+    bool m_usePySideExtensions = false;
+    bool m_verboseErrorMessagesDisabled = false;
+    bool m_useIsNullAsNbNonZero = false;
+    bool m_avoidProtectedHack = false;
 
     typedef QHash<QString, AbstractMetaType*> AbstractMetaTypeCache;
     AbstractMetaTypeCache m_metaTypeFromStringCache;