summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/codemarker.h
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@digia.com>2012-12-04 14:12:30 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-05 17:29:46 +0100
commitfd1f65a9b84d597078482cd420771620c406f8da (patch)
treeb6d35944932d4723094cb6bd989066cb127499ff /src/tools/qdoc/codemarker.h
parent4b819803f63ea58ac4cc4e8bc61f12321f91197a (diff)
qdoc: Don't include inherited members in the class ref
Once upon a time, the inherited functions, signals, slots, etc were not listed on the class reference page, but they were counted and a link to the base class was provided for them, eg: 2 public functions inherited from QAbstractListModel 39 public functions inherited from QAbstractItemModel 31 public functions inherited from QObject Somehow, this got broken, so that all these inherited things were listed on the class reference page as if they were members of the class. But they liunked to the documentation in the base class. This now works correctly again. It simnplifies the class reference pages a lot. Task-number: QTBUG-27496 Change-Id: If493da8cbf81634f1344b12094d9a06f8528e8e5 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/tools/qdoc/codemarker.h')
-rw-r--r--src/tools/qdoc/codemarker.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/qdoc/codemarker.h b/src/tools/qdoc/codemarker.h
index 0e699a62bf..14d33d37a0 100644
--- a/src/tools/qdoc/codemarker.h
+++ b/src/tools/qdoc/codemarker.h
@@ -82,7 +82,7 @@ struct Section
struct FastSection
{
- const InnerNode *innerNode;
+ const InnerNode *parent_;
QString name;
QString divClass;
QString singularMember;
@@ -91,12 +91,12 @@ struct FastSection
QMap<QString, Node *> reimpMemberMap;
QList<QPair<InnerNode *, int> > inherited;
- FastSection(const InnerNode *innerNode0,
+ FastSection(const InnerNode *parent,
const QString& name0,
const QString& divClass0,
const QString& singularMember0,
const QString& pluralMember0)
- : innerNode(innerNode0),
+ : parent_(parent),
name(name0),
divClass(divClass0),
singularMember(singularMember0),