CodeModel: Handle access of inherited classes

Store the access of the base class in the code model.
Remove protected/private base classes in the abstract meta builder
as otherwise invalid code will be generated for classes like

QAbstract3DGraph : public QWindow, protected QOpenGLFunctions

when the protected hack is not in use (on Windows).

Task-number: PYSIDE-487
Change-Id: I5bc2dad16f903da86e6e41450c2f9a76726ac028
Reviewed-by: Christian Tismer <tismer@stackless.com>

1 files changed, 17 insertions, 14 deletions

diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
index 667e27344..7c3bbbede 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
+++ b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
@@ -514,16 +514,6 @@ _ClassModelItem::~_ClassModelItem()
 {
 }
 
-QStringList _ClassModelItem::baseClasses() const
-{
-    return m_baseClasses;
-}
-
-void _ClassModelItem::setBaseClasses(const QStringList &baseClasses)
-{
-    m_baseClasses = baseClasses;
-}
-
 TemplateParameterList _ClassModelItem::templateParameters() const
 {
     return m_templateParameters;
@@ -534,14 +524,21 @@ void _ClassModelItem::setTemplateParameters(const TemplateParameterList &templat
     m_templateParameters = templateParameters;
 }
 
-void _ClassModelItem::addBaseClass(const QString &baseClass)
+void _ClassModelItem::addBaseClass(const QString &name, CodeModel::AccessPolicy accessPolicy)
 {
+    _ClassModelItem::BaseClass baseClass;
+    baseClass.name = name;
+    baseClass.accessPolicy = accessPolicy;
     m_baseClasses.append(baseClass);
 }
 
 bool _ClassModelItem::extendsClass(const QString &name) const
 {
-    return m_baseClasses.contains(name);
+    for (const BaseClass &bc : m_baseClasses) {
+        if (bc.name == name)
+            return true;
+    }
+    return false;
 }
 
 void _ClassModelItem::setClassType(CodeModel::ClassType type)
@@ -578,8 +575,14 @@ static void formatModelItemList(QDebug &d, const char *prefix, const List &l,
 void _ClassModelItem::formatDebug(QDebug &d) const
 {
     _CodeModelItem::formatDebug(d);
-    if (!m_baseClasses.isEmpty())
-        d << ", inherits=" << m_baseClasses;
+    if (!m_baseClasses.isEmpty()) {
+        d << ", inherits=";
+        for (int i = 0, size = m_baseClasses.size(); i < size; ++i) {
+            if (i)
+                d << ", ";
+            d << m_baseClasses.at(i).name << " (" << m_baseClasses.at(i).accessPolicy << ')';
+        }
+    }
     formatModelItemList(d, ", templateParameters=", m_templateParameters);
     formatScopeItemsDebug(d);
 }