shiboken6: Remove AbstractMetaAttributes::Documentation

It does not really belong there; also it was shadowed
by  AbstractMetaVariable::Documentation.
Add it to the inheriting classes instead.

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

7 files changed, 20 insertions, 19 deletions

diff --git a/sources/shiboken6/ApiExtractor/abstractmetaattributes.cpp b/sources/shiboken6/ApiExtractor/abstractmetaattributes.cpp
index 9e172893d..dc643a8a3 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetaattributes.cpp
+++ b/sources/shiboken6/ApiExtractor/abstractmetaattributes.cpp
@@ -41,7 +41,6 @@ void AbstractMetaAttributes::assignMetaAttributes(const AbstractMetaAttributes &
 {
     m_attributes = other.m_attributes;
     m_originalAttributes = other.m_originalAttributes;
-    m_doc = other.m_doc;
 }
 
 #ifndef QT_NO_DEBUG_STREAM
diff --git a/sources/shiboken6/ApiExtractor/abstractmetaattributes.h b/sources/shiboken6/ApiExtractor/abstractmetaattributes.h
index 137ed830a..c48fd1b3d 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetaattributes.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetaattributes.h
@@ -29,10 +29,10 @@
 #ifndef ABSTRACTMETAATTRIBUTES_H
 #define ABSTRACTMETAATTRIBUTES_H
 
-#include "documentation.h"
-
 #include <QtCore/qobjectdefs.h>
 
+QT_FORWARD_DECLARE_CLASS(QDebug)
+
 class AbstractMetaAttributes
 {
     Q_GADGET
@@ -169,16 +169,6 @@ public:
         return m_originalAttributes.testFlag(Public);
     }
 
-    void setDocumentation(const Documentation& doc)
-    {
-        m_doc = doc;
-    }
-
-    Documentation documentation() const
-    {
-        return m_doc;
-    }
-
 #ifndef QT_NO_DEBUG_STREAM
     static void formatMetaAttributes(QDebug &d, AbstractMetaAttributes::Attributes value);
 #endif
@@ -189,7 +179,6 @@ protected:
 private:
     Attributes m_attributes;
     Attributes m_originalAttributes;
-    Documentation m_doc;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(AbstractMetaAttributes::Attributes)
diff --git a/sources/shiboken6/ApiExtractor/abstractmetaenum.h b/sources/shiboken6/ApiExtractor/abstractmetaenum.h
index dc6176fab..1ee4f61b8 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetaenum.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetaenum.h
@@ -31,6 +31,7 @@
 
 #include "abstractmetalang_typedefs.h"
 #include "abstractmetaattributes.h"
+#include "documentation.h"
 #include "enclosingclassmixin.h"
 #include "parser/codemodel_enums.h"
 #include "parser/enumvalue.h"
@@ -84,6 +85,9 @@ public:
 
     QString name() const;
 
+    const Documentation &documentation() const { return m_doc; }
+    void setDocumentation(const Documentation& doc) { m_doc = doc; }
+
     QString qualifier() const;
 
     QString package() const;
@@ -112,6 +116,7 @@ public:
 private:
     AbstractMetaEnumValueList m_enumValues;
     EnumTypeEntry *m_typeEntry = nullptr;
+    Documentation m_doc;
 
     EnumKind m_enumKind = CEnum;
     uint m_hasQenumsDeclaration : 1;
diff --git a/sources/shiboken6/ApiExtractor/abstractmetafield.h b/sources/shiboken6/ApiExtractor/abstractmetafield.h
index 3e7eb49a5..64844cbb7 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetafield.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetafield.h
@@ -30,6 +30,7 @@
 #define ABSTRACTMETAFIELD_H
 
 #include "abstractmetalang_typedefs.h"
+#include "documentation.h"
 #include "typesystem_enums.h"
 #include "typesystem_typedefs.h"
 #include "abstractmetaattributes.h"
@@ -89,9 +90,6 @@ public:
 
     bool isModifiedRemoved(int types = TypeSystem::All) const;
 
-    using AbstractMetaVariable::setDocumentation;
-    using AbstractMetaVariable::documentation;
-
     AbstractMetaField *copy() const;
 
     static AbstractMetaField *
diff --git a/sources/shiboken6/ApiExtractor/abstractmetafunction.h b/sources/shiboken6/ApiExtractor/abstractmetafunction.h
index 21da91c56..33345a4d4 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetafunction.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetafunction.h
@@ -33,6 +33,7 @@
 #include "abstractmetaargument.h"
 #include "abstractmetaattributes.h"
 #include "abstractmetatype.h"
+#include "documentation.h"
 #include "typesystem_enums.h"
 #include "typesystem_typedefs.h"
 #include "sourcelocation.h"
@@ -100,6 +101,9 @@ public:
 
     void setOriginalName(const QString &name) { m_originalName = name; }
 
+    const Documentation &documentation() const { return m_doc; }
+    void setDocumentation(const Documentation& doc) { m_doc = doc; }
+
     bool isReverseOperator() const { return m_reverse; }
     void setReverseOperator(bool reverse) { m_reverse = reverse; }
 
@@ -303,6 +307,7 @@ private:
 
     QString m_name;
     QString m_originalName;
+    Documentation m_doc;
     mutable QString m_cachedMinimalSignature;
     mutable QString m_cachedSignature;
     mutable QString m_cachedModifiedName;
diff --git a/sources/shiboken6/ApiExtractor/abstractmetalang.h b/sources/shiboken6/ApiExtractor/abstractmetalang.h
index d41c0f976..51e63a33d 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetalang.h
+++ b/sources/shiboken6/ApiExtractor/abstractmetalang.h
@@ -32,6 +32,7 @@
 #include "abstractmetalang_typedefs.h"
 #include "abstractmetaattributes.h"
 #include "enclosingclassmixin.h"
+#include "documentation.h"
 #include "sourcelocation.h"
 #include "typesystem_enums.h"
 #include "typesystem_typedefs.h"
@@ -188,6 +189,9 @@ public:
      */
     QString name() const;
 
+    const Documentation &documentation() const { return m_doc; }
+    void setDocumentation(const Documentation& doc) { m_doc = doc; }
+
     QString baseClassName() const
     {
         return m_baseClasses.isEmpty() ? QString() : m_baseClasses.constFirst()->name();
@@ -364,6 +368,8 @@ private:
     uint m_isTypeDef : 1;
     uint m_hasToStringCapability : 1;
 
+    Documentation m_doc;
+
     const AbstractMetaClass *m_enclosingClass = nullptr;
     AbstractMetaClassList m_baseClasses; // Real base classes after setting up inheritance
     AbstractMetaTypeList m_baseTemplateInstantiations;
diff --git a/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp b/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp
index 13d3e5d11..00d366394 100644
--- a/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp
+++ b/sources/shiboken6/generator/qtdoc/qtdocgenerator.cpp
@@ -1782,8 +1782,7 @@ void QtDocGenerator::writeFields(QTextStream& s, const AbstractMetaClass* cppCla
     const AbstractMetaFieldList &fields = cppClass->fields();
     for (AbstractMetaField *field : fields) {
         s << section_title << cppClass->fullName() << "." << field->name() << Qt::endl << Qt::endl;
-        //TODO: request for member ‘documentation’ is ambiguous
-        writeFormattedText(s, field->AbstractMetaAttributes::documentation().value(), cppClass);
+        writeFormattedText(s, field->documentation().value(), cppClass);
     }
 }