From 329619e86070cf3af19be2bf4ca242eb8eeb8d70 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 30 Oct 2018 15:30:57 +0100
Subject: shiboken: Remove defunct code trying to merge namespaces

Remove the function _NamespaceModelItem::uniqueNamespaces()
which created a QSet of_NamespaceModelItem *. Hashing by pointer
values does not have any effect.

Change-Id: I723024f0004aacecf4f06a1baa10678848d4a56b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp | 8 +++-----
 sources/shiboken2/ApiExtractor/parser/codemodel.cpp    | 8 --------
 sources/shiboken2/ApiExtractor/parser/codemodel.h      | 3 +--
 3 files changed, 4 insertions(+), 15 deletions(-)

(limited to 'sources')

diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
index 9653831cc..f6724e61d 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
@@ -475,7 +475,7 @@ void AbstractMetaBuilderPrivate::traverseDom(const FileModelItem &dom)
         }
     }
 
-    const QSet<NamespaceModelItem> &namespaceTypeValues = dom->uniqueNamespaces();
+    const auto &namespaceTypeValues = dom->namespaces();
     ReportHandler::setProgressReference(namespaceTypeValues);
     for (const NamespaceModelItem &item : namespaceTypeValues) {
         ReportHandler::progress(QStringLiteral("Generating namespace model (%1)...")
@@ -817,8 +817,7 @@ AbstractMetaClass *AbstractMetaBuilderPrivate::traverseNamespace(const FileModel
     }
 
     // Traverse namespaces recursively
-    const QSet<NamespaceModelItem> &innerNamespaces = namespaceItem->uniqueNamespaces();
-    for (const NamespaceModelItem &ni : innerNamespaces) {
+    for (const NamespaceModelItem &ni : namespaceItem->namespaces()) {
         AbstractMetaClass* mjc = traverseNamespace(dom, ni);
         if (mjc) {
             metaClass->addInnerClass(mjc);
@@ -1215,8 +1214,7 @@ void AbstractMetaBuilderPrivate::traverseNamespaceMembers(NamespaceModelItem ite
     traverseScopeMembers(item, metaClass);
 
     // Inner namespaces
-    const QSet<NamespaceModelItem> &innerNamespaces = item->uniqueNamespaces();
-    for (const NamespaceModelItem &ni : innerNamespaces)
+    for (const NamespaceModelItem &ni : item->namespaces())
         traverseNamespaceMembers(ni);
 
     m_currentClass = oldCurrentClass;
diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
index 173f6dd23..8bc9b24ac 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
+++ b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
@@ -887,14 +887,6 @@ _NamespaceModelItem::~_NamespaceModelItem()
 {
 }
 
-QSet<NamespaceModelItem> _NamespaceModelItem::uniqueNamespaces() const
-{
-    QSet<NamespaceModelItem> result;
-    for (const NamespaceModelItem &n : m_namespaces)
-        result.insert(n);
-    return result;
-}
-
 void _NamespaceModelItem::addNamespace(NamespaceModelItem item)
 {
     m_namespaces.append(item);
diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.h b/sources/shiboken2/ApiExtractor/parser/codemodel.h
index 7bd82bd1d..0296a8cb2 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel.h
+++ b/sources/shiboken2/ApiExtractor/parser/codemodel.h
@@ -434,8 +434,7 @@ public:
         : _ScopeModelItem(model, name, kind) {}
     ~_NamespaceModelItem();
 
-    NamespaceList namespaces() const { return m_namespaces; }
-    QSet<NamespaceModelItem> uniqueNamespaces() const;
+    const NamespaceList &namespaces() const { return m_namespaces; }
 
     void addNamespace(NamespaceModelItem item);
 
-- 
cgit v1.2.3