From 7a66f6b60e1d08ee6dfc2d452e1998b1673beede Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@digia.com>
Date: Thu, 4 Apr 2013 12:46:26 +0200
Subject: qdoc: Removed dead code from qdoc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The documentation used to have "Main Classes" list for C++ classes,
and qdoc kept track which classes were supposed to be listed as "main"
classes. This is no longer used, so this change removes the code that
marked a C++ class as a main class and tested whether a class was a
main class. This dead code was seen while preparing the way for
changing qdoc to output a documentation page for obsolete C++ classes
and functions and obsolete QML types and functions.

Task-number: QTBUG-30511
Change-Id: Iccc31b46b7c3c144038372cad4771d974f207937
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
---
 src/tools/qdoc/node.cpp         |  1 -
 src/tools/qdoc/node.h           |  4 ----
 src/tools/qdoc/qdocdatabase.cpp | 22 ++++++++++------------
 3 files changed, 10 insertions(+), 17 deletions(-)

(limited to 'src')

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();
-- 
cgit v1.2.3