shiboken: Small code cleanup

Fix some left-over nullptr issues, C-style casts and some signedness
issues.

Remove some unused functions and parameters. Remove empty statements.

Add defined() around macros, fixing warnings like:
warning: '_WINDOWS' is not defined, evaluates to 0

Change-Id: Idaa4334cb0edb3661ca766c248ec18ab85b0ee8e
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

13 files changed, 25 insertions, 50 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
index e48d2b17c..59ea3b079 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
@@ -270,7 +270,7 @@ void AbstractMetaBuilderPrivate::registerToStringCapability(const FunctionModelI
             const ArgumentModelItem &arg = arguments.at(1);
             if (AbstractMetaClass *cls = argumentToClass(arg, currentClass)) {
                 if (arg->type().indirections() < 2)
-                    cls->setToStringCapability(true, arg->type().indirections());
+                    cls->setToStringCapability(true, int(arg->type().indirections()));
             }
         }
     }
@@ -1287,14 +1287,6 @@ void AbstractMetaBuilderPrivate::fixReturnTypeOfConversionOperator(AbstractMetaF
     metaFunction->replaceType(metaType);
 }
 
-static bool _compareAbstractMetaTypes(const AbstractMetaType *type,
-                                      const AbstractMetaType *other,
-                                      AbstractMetaType::ComparisonFlags flags = {})
-{
-    return (type != nullptr) == (other != nullptr)
-        && (type == nullptr || type->compare(*other, flags));
-}
-
 AbstractMetaFunctionList AbstractMetaBuilderPrivate::classFunctionList(const ScopeModelItem &scopeItem,
                                                                        AbstractMetaClass::Attributes *constructorAttributes,
                                                                        AbstractMetaClass *currentClass)
diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
index b07ea0f0e..27f60904c 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
@@ -268,7 +268,7 @@ QString AbstractMetaType::pythonSignature() const
     // PYSIDE-921: Handle container returntypes correctly.
     // This is now a clean reimplementation.
     if (m_cachedPythonSignature.isEmpty())
-        m_cachedPythonSignature = formatPythonSignature(false);
+        m_cachedPythonSignature = formatPythonSignature();
     return m_cachedPythonSignature;
 }
 
@@ -2530,7 +2530,7 @@ QString AbstractMetaType::formatSignature(bool minimal) const
     return result;
 }
 
-QString AbstractMetaType::formatPythonSignature(bool minimal) const
+QString AbstractMetaType::formatPythonSignature() const
 {
     /*
      * This is a version of the above, more suitable for Python.
@@ -2553,7 +2553,7 @@ QString AbstractMetaType::formatPythonSignature(bool minimal) const
         result += package() + QLatin1Char('.');
     if (isArray()) {
         // Build nested array dimensions a[2][3] in correct order
-        result += m_arrayElementType->formatPythonSignature(true);
+        result += m_arrayElementType->formatPythonSignature();
         const int arrayPos = result.indexOf(QLatin1Char('['));
         if (arrayPos != -1)
             result.insert(arrayPos, formatArraySize(m_arrayElementCount));
@@ -2567,7 +2567,7 @@ QString AbstractMetaType::formatPythonSignature(bool minimal) const
         for (int i = 0, size = m_instantiations.size(); i < size; ++i) {
             if (i > 0)
                 result += QLatin1String(", ");
-            result += m_instantiations.at(i)->formatPythonSignature(true);
+            result += m_instantiations.at(i)->formatPythonSignature();
         }
         result += QLatin1Char(']');
     }
diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.h b/sources/shiboken2/ApiExtractor/abstractmetalang.h
index 3ef135cf9..01e146557 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetalang.h
+++ b/sources/shiboken2/ApiExtractor/abstractmetalang.h
@@ -538,7 +538,7 @@ public:
 private:
     TypeUsagePattern determineUsagePattern() const;
     QString formatSignature(bool minimal) const;
-    QString formatPythonSignature(bool minimal) const;
+    QString formatPythonSignature() const;
 
     const TypeEntry *m_typeEntry = nullptr;
     AbstractMetaTypeList m_instantiations;
diff --git a/sources/shiboken2/ApiExtractor/apiextractor.cpp b/sources/shiboken2/ApiExtractor/apiextractor.cpp
index 78fa9e313..6d29ed1e0 100644
--- a/sources/shiboken2/ApiExtractor/apiextractor.cpp
+++ b/sources/shiboken2/ApiExtractor/apiextractor.cpp
@@ -166,24 +166,6 @@ ContainerTypeEntryList ApiExtractor::containerTypes() const
     return TypeDatabase::instance()->containerTypes();
 }
 
-static const AbstractMetaEnum* findEnumOnClasses(AbstractMetaClassList metaClasses, const EnumTypeEntry* typeEntry)
-{
-    const AbstractMetaEnum *result = nullptr;
-    for (const AbstractMetaClass* metaClass : qAsConst(metaClasses)) {
-        const AbstractMetaEnumList &enums = metaClass->enums();
-        for (const AbstractMetaEnum *metaEnum : enums) {
-            if (metaEnum->typeEntry() == typeEntry) {
-                result = metaEnum;
-                break;
-            }
-        }
-        if (result)
-            break;
-        result = findEnumOnClasses(metaClass->innerClasses(), typeEntry);
-    }
-    return result;
-}
-
 const AbstractMetaEnum* ApiExtractor::findAbstractMetaEnum(const TypeEntry* typeEntry) const
 {
     return m_builder->findEnum(typeEntry);
diff --git a/sources/shiboken2/ApiExtractor/graph.cpp b/sources/shiboken2/ApiExtractor/graph.cpp
index 95a80197e..53e20ebba 100644
--- a/sources/shiboken2/ApiExtractor/graph.cpp
+++ b/sources/shiboken2/ApiExtractor/graph.cpp
@@ -101,7 +101,7 @@ bool Graph::containsEdge(int from, int to)
 
 void Graph::addEdge(int from, int to)
 {
-    Q_ASSERT(to < (int)m_d->edges.size());
+    Q_ASSERT(to < m_d->edges.size());
     m_d->edges[from].insert(to);
 }
 
diff --git a/sources/shiboken2/ApiExtractor/reporthandler.cpp b/sources/shiboken2/ApiExtractor/reporthandler.cpp
index c0c323029..d83154ba8 100644
--- a/sources/shiboken2/ApiExtractor/reporthandler.cpp
+++ b/sources/shiboken2/ApiExtractor/reporthandler.cpp
@@ -35,7 +35,7 @@
 #include <cstdarg>
 #include <cstdio>
 
-#if _WINDOWS || NOCOLOR
+#if defined(_WINDOWS) || defined(NOCOLOR)
     #define COLOR_END ""
     #define COLOR_WHITE ""
     #define COLOR_YELLOW ""
diff --git a/sources/shiboken2/ApiExtractor/typesystem.h b/sources/shiboken2/ApiExtractor/typesystem.h
index 2ac3fd356..8d162a732 100644
--- a/sources/shiboken2/ApiExtractor/typesystem.h
+++ b/sources/shiboken2/ApiExtractor/typesystem.h
@@ -228,7 +228,7 @@ struct ArgumentModification
 
 struct Modification
 {
-    enum Modifiers {
+    enum Modifiers : uint {
         InvalidModifier =       0x0000,
         Private =               0x0001,
         Protected =             0x0002,
diff --git a/sources/shiboken2/ApiExtractor/typesystemparser.cpp b/sources/shiboken2/ApiExtractor/typesystemparser.cpp
index 47a15acd9..e2450e6b4 100644
--- a/sources/shiboken2/ApiExtractor/typesystemparser.cpp
+++ b/sources/shiboken2/ApiExtractor/typesystemparser.cpp
@@ -827,7 +827,7 @@ bool TypeSystemParser::endElement(const QStringRef &localName)
             break;
         default:
             break; // nada
-        };
+        }
         break;
     default:
         break;
@@ -903,7 +903,7 @@ bool TypeSystemParser::characters(const String &ch)
                 break;
             default:
                 Q_ASSERT(false);
-            };
+            }
             return true;
         }
     }
@@ -2857,7 +2857,7 @@ bool TypeSystemParser::startElement(const QXmlStreamReader &reader)
             break;
         default:
             Q_ASSERT(false);
-        };
+        }
 
         if (element->entry) {
             if (!m_database->addType(element->entry, &m_error))
diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
index d65367e5a..e0fe88775 100644
--- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
@@ -44,8 +44,7 @@
 #include <QMetaType>
 
 #include <algorithm>
-
-#include <algorithm>
+#include <cstring>
 
 static const char CPP_ARG0[] = "cppArg0";
 
@@ -2605,9 +2604,11 @@ void CppGenerator::writeOverloadedFunctionDecisorEngine(QTextStream &s, const Ov
 
         if (usePyArgs && signatureFound) {
             AbstractMetaArgumentList args = refFunc->arguments();
-            int lastArgIsVarargs = (int) (args.size() > 1 && args.constLast()->type()->isVarargs());
-            int numArgs = args.size() - OverloadData::numberOfRemovedArguments(refFunc) - lastArgIsVarargs;
-            typeChecks.prepend(QString::fromLatin1("numArgs %1 %2").arg(lastArgIsVarargs ? QLatin1String(">=") : QLatin1String("==")).arg(numArgs));
+            const bool isVarargs = args.size() > 1 && args.constLast()->type()->isVarargs();
+            int numArgs = args.size() - OverloadData::numberOfRemovedArguments(refFunc);
+            if (isVarargs)
+                --numArgs;
+            typeChecks.prepend(QString::fromLatin1("numArgs %1 %2").arg(isVarargs ? QLatin1String(">=") : QLatin1String("==")).arg(numArgs));
         } else if (sequenceArgCount > 1) {
             typeChecks.prepend(QString::fromLatin1("numArgs >= %1").arg(startArg + sequenceArgCount));
         } else if (refFunc->isOperatorOverload() && !refFunc->isCallOperator()) {
@@ -3250,7 +3251,7 @@ void CppGenerator::writeMethodCall(QTextStream &s, const AbstractMetaFunction *f
                 std::swap(firstArg, secondArg);
 
             QString op = func->originalName();
-            op = op.right(op.size() - (sizeof("operator")/sizeof(char)-1));
+            op.remove(0, int(std::strlen("operator")));
 
             if (func->isBinaryOperator()) {
                 if (func->isReverseOperator())
@@ -4066,7 +4067,7 @@ void CppGenerator::writeSequenceMethods(QTextStream &s,
 
         writeCppSelfDefinition(s, func, context);
 
-        const AbstractMetaArgument *lastArg = func->arguments().isEmpty() ? 0 : func->arguments().constLast();
+        const AbstractMetaArgument *lastArg = func->arguments().isEmpty() ? nullptr : func->arguments().constLast();
         writeCodeSnips(s, snips,TypeSystem::CodeSnipPositionAny, TypeSystem::TargetLangCode, func, lastArg);
         s<< "}\n\n";
     }
@@ -5887,7 +5888,7 @@ void CppGenerator::writeParentChildManagement(QTextStream &s, const AbstractMeta
         writeReturnValueHeuristics(s, func);
 }
 
-void CppGenerator::writeReturnValueHeuristics(QTextStream &s, const AbstractMetaFunction *func, const QString &self)
+void CppGenerator::writeReturnValueHeuristics(QTextStream &s, const AbstractMetaFunction *func)
 {
     AbstractMetaType *type = func->type();
     if (!useReturnValueHeuristic()
diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.h b/sources/shiboken2/generator/shiboken2/cppgenerator.h
index fd272eaad..2134adeda 100644
--- a/sources/shiboken2/generator/shiboken2/cppgenerator.h
+++ b/sources/shiboken2/generator/shiboken2/cppgenerator.h
@@ -306,7 +306,7 @@ private:
 
     void writeParentChildManagement(QTextStream &s, const AbstractMetaFunction *func, bool userHeuristicForReturn);
     bool writeParentChildManagement(QTextStream &s, const AbstractMetaFunction *func, int argIndex, bool userHeuristicPolicy);
-    void writeReturnValueHeuristics(QTextStream &s, const AbstractMetaFunction *func, const QString &self = QLatin1String("self"));
+    void writeReturnValueHeuristics(QTextStream &s, const AbstractMetaFunction *func);
     void writeInitQtMetaTypeFunctionBody(QTextStream &s, GeneratorContext &context) const;
 
     /**
diff --git a/sources/shiboken2/generator/shiboken2/overloaddata.cpp b/sources/shiboken2/generator/shiboken2/overloaddata.cpp
index 56b64bbd5..bd39e9444 100644
--- a/sources/shiboken2/generator/shiboken2/overloaddata.cpp
+++ b/sources/shiboken2/generator/shiboken2/overloaddata.cpp
@@ -106,7 +106,7 @@ struct OverloadSortData
             return;
         map[typeName] = counter;
         if (!reverseMap.contains(counter))
-            reverseMap[counter] = 0;
+            reverseMap[counter] = nullptr;
         counter++;
     }
 
diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
index 647ceb67f..320f19dcf 100644
--- a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
@@ -2349,7 +2349,7 @@ static bool isGroupable(const AbstractMetaFunction *func)
         return false;
     // weird operator overloads
     if (func->name() == QLatin1String("operator[]") || func->name() == QLatin1String("operator->"))  // FIXME: what about cast operators?
-        return false;;
+        return false;
     return true;
 }
 
diff --git a/sources/shiboken2/libshiboken/helper.cpp b/sources/shiboken2/libshiboken/helper.cpp
index ed595169f..c14bde15c 100644
--- a/sources/shiboken2/libshiboken/helper.cpp
+++ b/sources/shiboken2/libshiboken/helper.cpp
@@ -208,7 +208,7 @@ int warning(PyObject *category, int stacklevel, const char *format, ...)
 {
     va_list args;
     va_start(args, format);
-#if _WIN32
+#ifdef _WIN32
     va_list args2 = args;
 #else
     va_list args2;