diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-02-26 08:44:33 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-02-26 08:44:33 (GMT) |
| commit | 540c19cd525fe0eb4fc70cfd625deeb77eb1b7cf (patch) | |
| tree | 8ee7e6d700de3d911e8d0ccf4e2b2cd0a417fcde /tools/qdoc3/node.h | |
| parent | 84fd26983a40ecae3e761106aa8f550c3b7fd7ba (diff) | |
| parent | 7944ac1fb6eb0ae3bbbfdf6780b52f7174174a93 (diff) | |
| download | Qt-540c19cd525fe0eb4fc70cfd625deeb77eb1b7cf.zip Qt-540c19cd525fe0eb4fc70cfd625deeb77eb1b7cf.tar.gz Qt-540c19cd525fe0eb4fc70cfd625deeb77eb1b7cf.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'tools/qdoc3/node.h')
| -rw-r--r-- | tools/qdoc3/node.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qdoc3/node.h b/tools/qdoc3/node.h index fd39698..ae5dcd7 100644 --- a/tools/qdoc3/node.h +++ b/tools/qdoc3/node.h @@ -383,12 +383,12 @@ class QmlClassNode : public FakeNode const ClassNode* classNode() const { return cnode; } virtual QString fileBase() const; - static void addInheritedBy(const QString& base, Node* sub); - static void subclasses(const QString& base, NodeList& subs); + static void addInheritedBy(const QString& base, const QString& sub); + static void subclasses(const QString& base, QStringList& subs); public: static bool qmlOnly; - static QMultiMap<QString,Node*> inheritedBy; + static QMultiMap<QString,QString> inheritedBy; private: const ClassNode* cnode; |