diff options
| author | Martin Smith <martin.smith@digia.com> | 2015-04-13 11:45:03 +0200 |
|---|---|---|
| committer | Martin Smith <martin.smith@digia.com> | 2015-04-13 12:28:00 +0000 |
| commit | 1d91d155f28fb178eb4e5a2a33b45bc68be718a4 (patch) | |
| tree | 2c13fd6e34dedc32a013d6f9fbee5a481c3ffc07 /src/tools/qdoc/generator.h | |
| parent | 16c32710bc8a5ecefc833352159361be564f3fe4 (diff) | |
qdoc: Changing InnerNode to Aggregate
An Aggregate node is a tree node that is not a leaf.
Change-Id: I4a3964865fb653a217ee75d0b21e563f7f990a1c
Task-number: QTBUG-45450
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Diffstat (limited to 'src/tools/qdoc/generator.h')
| -rw-r--r-- | src/tools/qdoc/generator.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/qdoc/generator.h b/src/tools/qdoc/generator.h index b64cfc2824..ba4d5b0a45 100644 --- a/src/tools/qdoc/generator.h +++ b/src/tools/qdoc/generator.h @@ -105,7 +105,7 @@ public: static QmlTypeNode* qmlTypeContext() { return qmlTypeContext_; } protected: - virtual void beginSubPage(const InnerNode* node, const QString& fileName); + virtual void beginSubPage(const Aggregate* node, const QString& fileName); virtual void endSubPage(); virtual QString fileBase(const Node* node) const; virtual QString fileExtension() const = 0; @@ -113,15 +113,15 @@ protected: virtual void generateAlsoList(const Node *node, CodeMarker *marker); virtual int generateAtom(const Atom *atom, const Node *relative, CodeMarker *marker); virtual void generateBody(const Node *node, CodeMarker *marker); - virtual void generateClassLikeNode(InnerNode* inner, CodeMarker* marker); + virtual void generateClassLikeNode(Aggregate* inner, CodeMarker* marker); virtual void generateQmlTypePage(QmlTypeNode* , CodeMarker* ) { } virtual void generateQmlBasicTypePage(QmlBasicTypeNode* , CodeMarker* ) { } virtual void generateDocumentNode(DocumentNode* dn, CodeMarker* marker); virtual void generateCollectionNode(CollectionNode* cn, CodeMarker* marker); virtual void generateInheritedBy(const ClassNode *classe, CodeMarker *marker); virtual void generateInherits(const ClassNode *classe, CodeMarker *marker); - virtual void generateInnerNode(InnerNode* node); - virtual void generateMaintainerList(const InnerNode* node, CodeMarker* marker); + virtual void generateAggregate(Aggregate* node); + virtual void generateMaintainerList(const Aggregate* node, CodeMarker* marker); virtual void generateQmlInheritedBy(const QmlTypeNode* qcn, CodeMarker* marker); virtual void generateQmlInherits(QmlTypeNode* qcn, CodeMarker* marker); virtual bool generateQmlText(const Text& text, @@ -157,8 +157,8 @@ protected: void generateSince(const Node *node, CodeMarker *marker); void generateStatus(const Node *node, CodeMarker *marker); void generateThreadSafeness(const Node *node, CodeMarker *marker); - QString getMetadataElement(const InnerNode* inner, const QString& t); - QStringList getMetadataElements(const InnerNode* inner, const QString& t); + QString getMetadataElement(const Aggregate* inner, const QString& t); + QStringList getMetadataElements(const Aggregate* inner, const QString& t); QString indent(int level, const QString& markedCode); QTextStream& out(); QString outFileName(); |