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, 9 insertions, 4 deletions

diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.h b/sources/shiboken2/ApiExtractor/parser/codemodel.h
index 4d6bfd06a..fd17b442c 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel.h
+++ b/sources/shiboken2/ApiExtractor/parser/codemodel.h
@@ -349,16 +349,21 @@ class _ClassModelItem: public _ScopeModelItem
 public:
     DECLARE_MODEL_NODE(Class)
 
+    struct BaseClass
+    {
+        QString name;
+        CodeModel::AccessPolicy accessPolicy = CodeModel::Public;
+    };
+
     explicit _ClassModelItem(CodeModel *model, int kind = __node_kind)
         : _ScopeModelItem(model, kind), m_classType(CodeModel::Class) {}
     explicit _ClassModelItem(CodeModel *model, const QString &name, int kind = __node_kind)
         : _ScopeModelItem(model, name, kind), m_classType(CodeModel::Class) {}
     ~_ClassModelItem();
 
-    QStringList baseClasses() const;
+    QVector<BaseClass> baseClasses() const { return m_baseClasses; }
 
-    void setBaseClasses(const QStringList &baseClasses);
-    void addBaseClass(const QString &baseClass);
+    void addBaseClass(const QString &name, CodeModel::AccessPolicy accessPolicy);
 
     TemplateParameterList templateParameters() const;
     void setTemplateParameters(const TemplateParameterList &templateParameters);
@@ -376,7 +381,7 @@ public:
 #endif
 
 private:
-    QStringList m_baseClasses;
+    QVector<BaseClass> m_baseClasses;
     TemplateParameterList m_templateParameters;
     CodeModel::ClassType m_classType;