diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2020-05-31 11:53:37 +0200 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2020-06-04 13:08:20 +0200 |
| commit | df38c2d3510e11b881e3d7bf89b4fe7868e801ca (patch) | |
| tree | 50bc722358afa9c7f391e81738749e2b9f58f19f /src/qdoc/generator.cpp | |
| parent | 2eed23718f3f2b8f29298784266fd745ff0fc0a9 (diff) | |
| download | qttools-df38c2d3510e11b881e3d7bf89b4fe7868e801ca.tar.gz | |
QDoc: Extract enum Access from Node
Move Node::Access out of Node and make it a scoped enum,
to break circular dependency issues between Node and
RelatedClass.
This is a requirement to extract struct RelatedClass
from Node.
Task-number: QTBUG-84578
Change-Id: I13a1ac275d46abcd04f5f712291c77c2f24a65db
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Diffstat (limited to 'src/qdoc/generator.cpp')
| -rw-r--r-- | src/qdoc/generator.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp index 9d8f060d1..4de16abaa 100644 --- a/src/qdoc/generator.cpp +++ b/src/qdoc/generator.cpp @@ -31,6 +31,7 @@ */ #include "generator.h" +#include "access.h" #include "codemarker.h" #include "config.h" #include "doc.h" @@ -1088,9 +1089,9 @@ void Generator::generateInherits(const ClassNode *classe, CodeMarker *marker) if (cls.node_) { appendFullName(text, cls.node_, classe); - if (cls.access_ == Node::Protected) { + if (cls.access_ == Access::Protected) { text << " (protected)"; - } else if (cls.access_ == Node::Private) { + } else if (cls.access_ == Access::Private) { text << " (private)"; } text << separator(index++, classe->baseClasses().count()); @@ -2138,7 +2139,7 @@ void Generator::supplementAlsoList(const Node *node, QVector<Text> &alsoList) alternateFunc = fn->parent()->findFunctionChild(alternateName, QString()); } - if (alternateFunc && alternateFunc->access() != Node::Private) { + if (alternateFunc && alternateFunc->access() != Access::Private) { int i; for (i = 0; i < alsoList.size(); ++i) { if (alsoList.at(i).toString().contains(alternateName)) |