1 files changed, 12 insertions, 36 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
index 4566ed3bc..f6c9e407c 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
@@ -410,6 +410,7 @@ FileModelItem AbstractMetaBuilderPrivate::buildDom(QByteArrayList arguments,
                                                    unsigned clangFlags)
 {
     clang::Builder builder;
+    builder.setSystemIncludes(TypeDatabase::instance()->systemIncludes());
     if (level == LanguageLevel::Default)
         level = clang::emulatedCompilerLanguageLevel();
     arguments.prepend(QByteArrayLiteral("-std=")
@@ -549,11 +550,8 @@ void AbstractMetaBuilderPrivate::traverseDom(const FileModelItem &dom)
         if (!entry->isPrimitive()) {
             if ((entry->isValue() || entry->isObject())
                 && !types->shouldDropTypeEntry(entry->qualifiedCppName())
-                && !entry->isString()
-                && !entry->isChar()
                 && !entry->isContainer()
                 && !entry->isCustom()
-                && !entry->isVariant()
                 && (entry->generateCode() & TypeEntry::GenerateTargetLang)
                 && !AbstractMetaClass::findClass(m_metaClasses, entry)) {
                 qCWarning(lcShiboken).noquote().nospace()
@@ -758,6 +756,11 @@ AbstractMetaClass *AbstractMetaBuilderPrivate::traverseNamespace(const FileModel
         return nullptr;
     }
 
+    if (namespaceItem->type() == NamespaceType::Inline) {
+        type->setInlineNamespace(true);
+        TypeDatabase::instance()->addInlineNamespaceLookups(type);
+    }
+
     // Continue populating namespace?
     AbstractMetaClass *metaClass = AbstractMetaClass::findClass(m_metaClasses, type);
     if (!metaClass) {
@@ -1215,7 +1218,7 @@ AbstractMetaField *AbstractMetaBuilderPrivate::traverseField(const VariableModel
 
     metaField->setType(metaType);
 
-    AbstractMetaAttributes::Attributes attr = nullptr;
+    AbstractMetaAttributes::Attributes attr;
     if (field->isStatic())
         attr |= AbstractMetaAttributes::Static;
 
@@ -1292,38 +1295,11 @@ static bool _compareAbstractMetaTypes(const AbstractMetaType *type,
         && (type == nullptr || type->compare(*other, flags));
 }
 
-static bool _compareAbstractMetaFunctions(const AbstractMetaFunction *func,
-                                          const AbstractMetaFunction *other,
-                                          AbstractMetaType::ComparisonFlags argumentFlags = {})
-{
-    if (!func && !other)
-        return true;
-    if (!func || !other)
-        return false;
-    if (func->name() != other->name())
-        return false;
-    const int argumentsCount = func->arguments().count();
-    if (argumentsCount != other->arguments().count()
-        || func->isConstant() != other->isConstant()
-        || func->isStatic() != other->isStatic()
-        || !_compareAbstractMetaTypes(func->type(), other->type())) {
-        return false;
-    }
-    for (int i = 0; i < argumentsCount; ++i) {
-        if (!_compareAbstractMetaTypes(func->arguments().at(i)->type(),
-                                       other->arguments().at(i)->type(),
-                                       argumentFlags)) {
-            return false;
-        }
-    }
-    return true;
-}
-
 AbstractMetaFunctionList AbstractMetaBuilderPrivate::classFunctionList(const ScopeModelItem &scopeItem,
                                                                        AbstractMetaClass::Attributes *constructorAttributes,
                                                                        AbstractMetaClass *currentClass)
 {
-    *constructorAttributes = nullptr;
+    *constructorAttributes = {};
     AbstractMetaFunctionList result;
     const FunctionList &scopeFunctionList = scopeItem->functions();
     result.reserve(scopeFunctionList.size());
@@ -2913,7 +2889,7 @@ static void writeRejectLogFile(const QString &name,
 
 
     for (int reason = 0; reason < AbstractMetaBuilder::NoReason; ++reason) {
-        s << QString(72, QLatin1Char('*')) << endl;
+        s << QString(72, QLatin1Char('*')) << Qt::endl;
         switch (reason) {
         case AbstractMetaBuilder::NotInTypeSystem:
             s << "Not in type system";
@@ -2946,16 +2922,16 @@ static void writeRejectLogFile(const QString &name,
             break;
         }
 
-        s << endl;
+        s << Qt::endl;
 
         for (QMap<QString, AbstractMetaBuilder::RejectReason>::const_iterator it = rejects.constBegin();
              it != rejects.constEnd(); ++it) {
             if (it.value() != reason)
                 continue;
-            s << " - " << it.key() << endl;
+            s << " - " << it.key() << Qt::endl;
         }
 
-        s << QString(72, QLatin1Char('*')) << endl << endl;
+        s << QString(72, QLatin1Char('*')) << Qt::endl << Qt::endl;
     }
 
 }