shiboken/meta builder: Remove member m_namespacePrefix

It is only used for nested namespace names.

Change-Id: Id808b6db3b20c861ed3180d6df956f31702afbde
Reviewed-by: Christian Tismer <tismer@stackless.com>

2 files changed, 4 insertions, 6 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
index 6c0ab3702..cac96cb43 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
@@ -759,9 +759,10 @@ void AbstractMetaBuilderPrivate::addAbstractMetaClass(AbstractMetaClass *cls,
 AbstractMetaClass *AbstractMetaBuilderPrivate::traverseNamespace(const FileModelItem &dom,
                                                                  const NamespaceModelItem &namespaceItem)
 {
-    QString namespaceName =
-        (!m_namespacePrefix.isEmpty() ? m_namespacePrefix + colonColon() : QString())
-        + namespaceItem->name();
+    QString namespaceName = currentScope()->qualifiedName().join(colonColon());
+    if (!namespaceName.isEmpty())
+        namespaceName.append(colonColon());
+    namespaceName.append(namespaceItem->name());
     NamespaceTypeEntry *type = TypeDatabase::instance()->findNamespaceType(namespaceName);
 
     if (TypeDatabase::instance()->isClassRejected(namespaceName)) {
@@ -788,7 +789,6 @@ AbstractMetaClass *AbstractMetaBuilderPrivate::traverseNamespace(const FileModel
     traverseEnums(namespaceItem, metaClass, namespaceItem->enumsDeclarations());
 
     pushScope(namespaceItem);
-    m_namespacePrefix = currentScope()->qualifiedName().join(colonColon());
 
     const ClassList &classes = namespaceItem->classes();
     for (const ClassModelItem &cls : classes) {
@@ -823,7 +823,6 @@ AbstractMetaClass *AbstractMetaBuilderPrivate::traverseNamespace(const FileModel
     }
 
     popScope();
-    m_namespacePrefix = currentScope()->qualifiedName().join(colonColon());
 
     if (!type->include().isValid())
         setInclude(type, namespaceItem->fileName());
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
index b7d4dc7bc..b0a89324f 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
@@ -186,7 +186,6 @@ public:
     QHash<const TypeEntry *, AbstractMetaEnum *> m_enums;
 
     QList<ScopeModelItem> m_scopes;
-    QString m_namespacePrefix;
 
     QSet<AbstractMetaClass *> m_setupInheritanceDone;