summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/node.cpp
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-06-18 11:34:11 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-06-18 11:34:11 (GMT)
commit678d6044cb82b59e2a3747a24f5d70a58f5cf127 (patch)
tree811af412e92ce107222f57e80816faab3963655b /tools/qdoc3/node.cpp
parent68073bbcde2d1b12d36f0c58aab1fc20f02ab967 (diff)
parent81b03ee252a22c9b053c376302428e5430523900 (diff)
downloadQt-678d6044cb82b59e2a3747a24f5d70a58f5cf127.zip
Qt-678d6044cb82b59e2a3747a24f5d70a58f5cf127.tar.gz
Qt-678d6044cb82b59e2a3747a24f5d70a58f5cf127.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/dboddies-oslo-staging-1-qdoc into 4.7
Diffstat (limited to 'tools/qdoc3/node.cpp')
-rw-r--r--tools/qdoc3/node.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp
index 6a87639..c7a073c 100644
--- a/tools/qdoc3/node.cpp
+++ b/tools/qdoc3/node.cpp
@@ -789,6 +789,7 @@ ClassNode::ClassNode(InnerNode *parent, const QString& name)
: InnerNode(Class, parent, name)
{
hidden = false;
+ abstract = false;
setPageType(ApiPage);
}
@@ -1086,6 +1087,19 @@ FunctionNode::FunctionNode(Type type, InnerNode *parent, const QString& name, bo
}
/*!
+ Sets the \a virtualness of this function. If the \a virtualness
+ is PureVirtual, and if the parent() is a ClassNode, set the parent's
+ \e abstract flag to true.
+ */
+void FunctionNode::setVirtualness(Virtualness virtualness)
+{
+ vir = virtualness;
+ if ((virtualness == PureVirtual) && parent() &&
+ (parent()->type() == Node::Class))
+ parent()->setAbstract(true);
+}
+
+/*!
*/
void FunctionNode::setOverload(bool overlode)
{