1 files changed, 17 insertions, 16 deletions

diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.h b/sources/shiboken2/generator/shiboken2/shibokengenerator.h
index cb1bdd11f..ed8f1bbfb 100644
--- a/sources/shiboken2/generator/shiboken2/shibokengenerator.h
+++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.h
@@ -239,8 +239,8 @@ public:
      *   \param arg_count the number of function arguments
      */
     QString functionSignature(const AbstractMetaFunction* func,
-                              QString prepend = QString(),
-                              QString append = QString(),
+                              const QString &prepend = QString(),
+                              const QString &append = QString(),
                               Options options = NoOption,
                               int arg_count = -1) const;
 
@@ -292,16 +292,16 @@ public:
     static QString pythonPrimitiveTypeName(const QString& cppTypeName);
     static QString pythonPrimitiveTypeName(const PrimitiveTypeEntry* type);
 
-    static QString pythonOperatorFunctionName(QString cppOpFuncName);
+    static QString pythonOperatorFunctionName(const QString &cppOpFuncName);
     static QString pythonOperatorFunctionName(const AbstractMetaFunction* func);
-    static QString pythonRichCompareOperatorId(QString cppOpFuncName);
+    static QString pythonRichCompareOperatorId(const QString &cppOpFuncName);
     static QString pythonRichCompareOperatorId(const AbstractMetaFunction* func);
 
     static QString fixedCppTypeName(const CustomConversion::TargetToNativeConversion* toNative);
     static QString fixedCppTypeName(const AbstractMetaType* type);
     static QString fixedCppTypeName(const TypeEntry* type, QString typeName = QString());
 
-    static bool isNumber(QString cpythonApiName);
+    static bool isNumber(const QString &cpythonApiName);
     static bool isNumber(const TypeEntry* type);
     static bool isNumber(const AbstractMetaType* type);
     static bool isPyInt(const TypeEntry* type);
@@ -389,9 +389,10 @@ public:
     QString cpythonSetattroFunctionName(const AbstractMetaClass* metaClass);
     QString cpythonGetterFunctionName(const AbstractMetaField* metaField);
     QString cpythonSetterFunctionName(const AbstractMetaField* metaField);
-    QString cpythonWrapperCPtr(const AbstractMetaClass* metaClass, QString argName = QLatin1String(PYTHON_SELF_VAR));
-    QString cpythonWrapperCPtr(const AbstractMetaType *metaType, QString argName);
-    QString cpythonWrapperCPtr(const TypeEntry* type, QString argName);
+    QString cpythonWrapperCPtr(const AbstractMetaClass* metaClass,
+                               const QString &argName = QLatin1String(PYTHON_SELF_VAR));
+    QString cpythonWrapperCPtr(const AbstractMetaType *metaType, const QString &argName);
+    QString cpythonWrapperCPtr(const TypeEntry* type, const QString &argName);
 
     /// Guesses the scope to where belongs an argument's default value.
     QString guessScopeForDefaultValue(const AbstractMetaFunction *func,
@@ -414,6 +415,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,12 +464,11 @@ 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);
 
-    bool m_native_jump_table;
     static QHash<QString, QString> m_pythonPrimitiveTypeName;
     static QHash<QString, QString> m_pythonOperators;
     static QHash<QString, QString> m_formatUnits;
@@ -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;