diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/tools/qdoc/node.cpp | 1 | ||||
-rw-r--r-- | src/tools/qdoc/node.h | 4 | ||||
-rw-r--r-- | src/tools/qdoc/qdocdatabase.cpp | 22 |
3 files changed, 10 insertions, 17 deletions
diff --git a/src/tools/qdoc/node.cpp b/src/tools/qdoc/node.cpp index c293d48673..028c0a0b2a 100644 --- a/src/tools/qdoc/node.cpp +++ b/src/tools/qdoc/node.cpp @@ -1440,7 +1440,6 @@ NamespaceNode::NamespaceNode(InnerNode *parent, const QString& name) ClassNode::ClassNode(InnerNode *parent, const QString& name) : InnerNode(Class, parent, name) { - hidden = false; abstract_ = false; qmlelement = 0; setPageType(ApiPage); diff --git a/src/tools/qdoc/node.h b/src/tools/qdoc/node.h index 4802b6de54..642bcec06a 100644 --- a/src/tools/qdoc/node.h +++ b/src/tools/qdoc/node.h @@ -440,9 +440,6 @@ public: const QList<RelatedClass> &derivedClasses() const { return derived; } const QList<RelatedClass> &ignoredBaseClasses() const { return ignoredBases; } - bool hideFromMainList() const { return hidden; } - void setHideFromMainList(bool value) { hidden = value; } - QString serviceName() const { return sname; } void setServiceName(const QString& value) { sname = value; } QmlClassNode* qmlElement() { return qmlelement; } @@ -456,7 +453,6 @@ private: QList<RelatedClass> bases; QList<RelatedClass> derived; QList<RelatedClass> ignoredBases; - bool hidden; bool abstract_; QString sname; QmlClassNode* qmlelement; diff --git a/src/tools/qdoc/qdocdatabase.cpp b/src/tools/qdoc/qdocdatabase.cpp index 191da5caf8..30a9efaada 100644 --- a/src/tools/qdoc/qdocdatabase.cpp +++ b/src/tools/qdoc/qdocdatabase.cpp @@ -448,18 +448,16 @@ void QDocDatabase::findAllClasses(const InnerNode* node) !(*c)->parent()->name().isEmpty()) className = (*c)->parent()->name()+"::"+className; - if (!(static_cast<const ClassNode *>(*c))->hideFromMainList()) { - if ((*c)->status() == Node::Compat) { - compatClasses_.insert(className, *c); - } - else if ((*c)->status() == Node::Obsolete) { - obsoleteClasses_.insert(className, *c); - } - else { - nonCompatClasses_.insert(className, *c); - if ((*c)->status() == Node::Main) - mainClasses_.insert(className, *c); - } + if ((*c)->status() == Node::Compat) { + compatClasses_.insert(className, *c); + } + else if ((*c)->status() == Node::Obsolete) { + obsoleteClasses_.insert(className, *c); + } + else { + nonCompatClasses_.insert(className, *c); + if ((*c)->status() == Node::Main) + mainClasses_.insert(className, *c); } QString serviceName = (static_cast<const ClassNode *>(*c))->serviceName(); |