From df38c2d3510e11b881e3d7bf89b4fe7868e801ca Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Sun, 31 May 2020 11:53:37 +0200 Subject: QDoc: Extract enum Access from Node MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ö --- src/qdoc/cppcodemarker.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/qdoc/cppcodemarker.cpp') diff --git a/src/qdoc/cppcodemarker.cpp b/src/qdoc/cppcodemarker.cpp index b7ea746df..3813ff76f 100644 --- a/src/qdoc/cppcodemarker.cpp +++ b/src/qdoc/cppcodemarker.cpp @@ -32,6 +32,7 @@ #include "cppcodemarker.h" +#include "access.h" #include "enumnode.h" #include "functionnode.h" #include "propertynode.h" @@ -194,9 +195,9 @@ QString CppCodeMarker::markedUpSynopsis(const Node *node, const Node * /* relati bracketed += "virtual"; } - if (func->access() == Node::Protected) + if (func->access() == Access::Protected) bracketed += "protected"; - else if (func->access() == Node::Private) + else if (func->access() == Access::Private) bracketed += "private"; if (func->isSignal()) -- cgit v1.2.1