shiboken: Fix Clang warnings

- Add Q_FALLTHROUGH()
- Fix warnings about passing messages as format to qFatal()
- Fix warnings about old-style casts
- Fix warnings about comma operator
- Fix warning about unreachable return

Change-Id: Iaf31259c0f8156204f4d10ee0e594b89abbba5d3
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>

1 files changed, 7 insertions, 5 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
index 20f201ec6..4105b4378 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
@@ -422,7 +422,7 @@ void AbstractMetaBuilderPrivate::fixQObjectForScope(const FileModelItem &dom,
         TypeEntry* entry = types->findType(qualifiedName);
         if (entry) {
             if (isQObject(dom, qualifiedName) && entry->isComplex())
-                ((ComplexTypeEntry*) entry)->setQObject(true);
+                static_cast<ComplexTypeEntry *>(entry)->setQObject(true);
         }
     }
 
@@ -616,7 +616,7 @@ void AbstractMetaBuilderPrivate::traverseDom(const FileModelItem &dom)
                     }
                 }
             } else if (entry->isEnum() && (entry->generateCode() & TypeEntry::GenerateTargetLang)) {
-                const QString name = ((EnumTypeEntry*) entry)->targetLangQualifier();
+                const QString name = static_cast<const EnumTypeEntry *>(entry)->targetLangQualifier();
                 AbstractMetaClass *cls = AbstractMetaClass::findClass(m_metaClasses, name);
 
                 bool enumFound = false;
@@ -2200,15 +2200,17 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateType(const AddedFunction:
 
         QString msg = QStringLiteral("Type '%1' wasn't found in the type database.\n").arg(typeName);
 
-        if (candidates.isEmpty())
-            qFatal(qPrintable(QString(msg + QLatin1String("Declare it in the type system using the proper <*-type> tag."))), NULL);
+        if (candidates.isEmpty()) {
+            qFatal("%sDeclare it in the type system using the proper <*-type> tag.",
+                   qPrintable(msg));
+        }
 
         msg += QLatin1String("Remember to inform the full qualified name for the type you want to use.\nCandidates are:\n");
         candidates.sort();
         for (const QString& candidate : qAsConst(candidates)) {
             msg += QLatin1String("    ") + candidate + QLatin1Char('\n');
         }
-        qFatal(qPrintable(msg), NULL);
+        qFatal("%s", qPrintable(msg));
     }
 
     AbstractMetaType *metaType = new AbstractMetaType;