From c19c886f910e1035677c8b2738588243df7337c1 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Mon, 4 Nov 2019 15:26:46 +0100
Subject: shiboken: Remove unused code

Change-Id: Idf421747a41fbc7c58e8cc84023426bc12b47544
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
---
 sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp |  7 -------
 sources/shiboken2/ApiExtractor/abstractmetalang.cpp    |  1 -
 sources/shiboken2/ApiExtractor/abstractmetalang.h      | 17 -----------------
 sources/shiboken2/ApiExtractor/typesystem.cpp          | 13 -------------
 sources/shiboken2/ApiExtractor/typesystem.h            |  2 --
 5 files changed, 40 deletions(-)

(limited to 'sources/shiboken2')

diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
index ae3cdd86b..73a887577 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
@@ -1418,13 +1418,6 @@ void AbstractMetaBuilderPrivate::traverseFunctions(ScopeModelItem scopeItem,
             metaClass->setHasNonPrivateConstructor(true);
         }
 
-        // Classes with virtual destructors should always have a shell class
-        // (since we aren't registering the destructors, we need this extra check)
-        if (metaFunction->isDestructor() && metaFunction->isVirtual()
-            && metaFunction->visibility() != AbstractMetaAttributes::Private) {
-            metaClass->setForceShellClass(true);
-        }
-
         if (!metaFunction->isDestructor()
             && !(metaFunction->isPrivate() && metaFunction->functionType() == AbstractMetaFunction::ConstructorFunction)) {
 
diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
index 99e9d01a3..a040f3caa 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
@@ -1326,7 +1326,6 @@ AbstractMetaClass::AbstractMetaClass()
       m_hasPrivateDestructor(false),
       m_hasProtectedDestructor(false),
       m_hasVirtualDestructor(false),
-      m_forceShellClass(false),
       m_hasHashFunction(false),
       m_hasEqualsOperator(false),
       m_hasCloneOperator(false),
diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.h b/sources/shiboken2/ApiExtractor/abstractmetalang.h
index 077191471..e9ce4d71b 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetalang.h
+++ b/sources/shiboken2/ApiExtractor/abstractmetalang.h
@@ -249,21 +249,11 @@ public:
         return m_originalAttributes & Private;
     }
 
-    bool wasProtected() const
-    {
-        return m_originalAttributes & Protected;
-    }
-
     bool wasPublic() const
     {
         return m_originalAttributes & Public;
     }
 
-    bool wasFriendly() const
-    {
-        return m_originalAttributes & Friendly;
-    }
-
     void setDocumentation(const Documentation& doc)
     {
         m_doc = doc;
@@ -892,7 +882,6 @@ public:
 
     QString minimalSignature() const;
     QString debugSignature() const; // including virtual/override/final, etc., for debugging only.
-    QStringList possibleIntrospectionCompatibleSignatures() const;
 
     bool isModifiedRemoved(int types = TypeSystem::All) const;
 
@@ -1530,11 +1519,6 @@ public:
     bool hasSignals() const;
     bool inheritsFrom(const AbstractMetaClass *other) const;
 
-    void setForceShellClass(bool on)
-    {
-        m_forceShellClass = on;
-    }
-
     /**
     *   Says if the class that declares or inherits a virtual function.
     *   \return true if the class implements or inherits any virtual methods
@@ -1732,7 +1716,6 @@ private:
     uint m_hasPrivateDestructor : 1;
     uint m_hasProtectedDestructor : 1;
     uint m_hasVirtualDestructor : 1;
-    uint m_forceShellClass : 1;
     uint m_hasHashFunction : 1;
     uint m_hasEqualsOperator : 1;
     uint m_hasCloneOperator : 1;
diff --git a/sources/shiboken2/ApiExtractor/typesystem.cpp b/sources/shiboken2/ApiExtractor/typesystem.cpp
index fa141670c..a1b98cd45 100644
--- a/sources/shiboken2/ApiExtractor/typesystem.cpp
+++ b/sources/shiboken2/ApiExtractor/typesystem.cpp
@@ -241,19 +241,6 @@ QString FlagsTypeEntry::targetLangName() const
     return m_targetLangName;
 }
 
-/*!
- * The Visual Studio 2002 compiler doesn't support these symbols,
- * which our typedefs unforntuatly expand to.
- */
-QString fixCppTypeName(const QString &name)
-{
-    if (name == QLatin1String("long long"))
-        return QLatin1String("qint64");
-    if (name == QLatin1String("unsigned long long"))
-        return QLatin1String("quint64");
-    return name;
-}
-
 QString TemplateInstance::expandCode() const
 {
     TemplateEntry *templateEntry = TypeDatabase::instance()->findTemplate(m_name);
diff --git a/sources/shiboken2/ApiExtractor/typesystem.h b/sources/shiboken2/ApiExtractor/typesystem.h
index 6a88ecd4d..48733053d 100644
--- a/sources/shiboken2/ApiExtractor/typesystem.h
+++ b/sources/shiboken2/ApiExtractor/typesystem.h
@@ -1684,8 +1684,6 @@ struct TypeRejection
 QDebug operator<<(QDebug d, const TypeRejection &r);
 #endif
 
-QString fixCppTypeName(const QString &name);
-
 class CustomConversion
 {
 public:
-- 
cgit v1.2.3