summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/cppcodeparser.h
diff options
context:
space:
mode:
authorIan Walters <ian.walters@nokia.com>2009-04-29 02:59:02 (GMT)
committerIan Walters <ian.walters@nokia.com>2009-04-29 02:59:02 (GMT)
commit57a5fbad609b0b0d844d7d4ed16558bfbaf725fe (patch)
treea412ddc1c14e13eb808d0d487329c223c1ccbf6c /tools/qdoc3/cppcodeparser.h
parente69b60890feca37db16df2ec7616d9f58c78fa81 (diff)
parentcc50b86dba171f9d63cdfbc9044cafc2766b0b15 (diff)
downloadQt-57a5fbad609b0b0d844d7d4ed16558bfbaf725fe.zip
Qt-57a5fbad609b0b0d844d7d4ed16558bfbaf725fe.tar.gz
Qt-57a5fbad609b0b0d844d7d4ed16558bfbaf725fe.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tools/qdoc3/cppcodeparser.h')
-rw-r--r--tools/qdoc3/cppcodeparser.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/qdoc3/cppcodeparser.h b/tools/qdoc3/cppcodeparser.h
index 2eb2fb3..3864990 100644
--- a/tools/qdoc3/cppcodeparser.h
+++ b/tools/qdoc3/cppcodeparser.h
@@ -92,13 +92,16 @@ class CppCodeParser : public CodeParser
const QString& arg);
#ifdef QDOC_QML
// might need to implement this in QsCodeParser as well.
- virtual Node *processTopicCommandGroup(const QString& command,
+ virtual Node *processTopicCommandGroup(const Doc& doc,
+ const QString& command,
const QStringList& args);
- bool splitQmlPropertyArg(const QString& arg,
+ bool splitQmlPropertyArg(const Doc& doc,
+ const QString& arg,
QString& type,
QString& element,
QString& property);
- bool splitQmlArg(const QString& arg,
+ bool splitQmlArg(const Doc& doc,
+ const QString& arg,
QString& element,
QString& name);
#endif