diff options
author | Martin Smith <martin.smith@digia.com> | 2012-11-27 14:07:27 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-27 15:54:45 +0100 |
commit | 3e33d29a86a99c4dc068e640b23551a7a6e9ab90 (patch) | |
tree | 0a02df617f904911643c02d53335645cf23594d5 /src/tools/qdoc/qdocdatabase.h | |
parent | 11a38b63bd34b632e335a38f2e671bea0d6a9564 (diff) |
qdoc: Listing group members across modules
This is a first attempt at fixing the problem, but
it probably is not the entire solution. The problem
requires adding attributes to the index files and
then reusing them when the index files are read.
The same problem will be affecting the module
lists themselves, but that is not fixed in this
update.
Task-number: QTBUG-28036
Change-Id: I8593d5b9446e51a5204b6c71f8c4f2b63f445972
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/tools/qdoc/qdocdatabase.h')
-rw-r--r-- | src/tools/qdoc/qdocdatabase.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/tools/qdoc/qdocdatabase.h b/src/tools/qdoc/qdocdatabase.h index 85f5c20b54..2a91693c02 100644 --- a/src/tools/qdoc/qdocdatabase.h +++ b/src/tools/qdoc/qdocdatabase.h @@ -85,14 +85,23 @@ class QDocDatabase static void destroyQdocDB(); ~QDocDatabase(); + const DocNodeMap& groups() const { return groups_; } const DocNodeMap& modules() const { return modules_; } const DocNodeMap& qmlModules() const { return qmlModules_; } + + DocNode* getGroup(const QString& name); + DocNode* findGroup(const QString& name); + DocNode* findModule(const QString& name); + DocNode* findQmlModule(const QString& name); + + DocNode* addGroup(const QString& name); DocNode* addModule(const QString& name); DocNode* addQmlModule(const QString& name); + + DocNode* addToGroup(const QString& name, Node* node); DocNode* addToModule(const QString& name, Node* node); - DocNode* addToQmlModule(const QString& moduleName, Node* node); - DocNode* findModule(const QString& qmlModuleName, bool addIfNotFound = false); - DocNode* findQmlModule(const QString& name, bool addIfNotFound = false); + DocNode* addToQmlModule(const QString& name, Node* node); + QmlClassNode* findQmlType(const QString& qmid, const QString& name) const; void findAllClasses(const InnerNode *node); @@ -112,9 +121,6 @@ class QDocDatabase NodeMap& getQmlTypes() { return qmlClasses_; } NodeMapMap& getFunctionIndex() { return funcIndex_; } TextToNodeMap& getLegaleseTexts() { return legaleseTexts_; } - const NodeMultiMap& groups() const { return tree_->groups(); } - const NodeList getGroup(const QString& name) const { return tree_->groups().values(name); } - void getGroup(const QString& name, NodeMap& group) const; const NodeMap& getClassMap(const QString& key) const; const NodeMap& getQmlTypeMap(const QString& key) const; const NodeMultiMap& getSinceMap(const QString& key) const; @@ -131,8 +137,6 @@ class QDocDatabase NamespaceNode* treeRoot() { return tree_->root(); } void resolveInheritance() { tree_->resolveInheritance(); } void resolveIssues(); - void addToGroup(Node* node, const QString& group) { tree_->addToGroup(node, group); } - void addToPublicGroup(Node* node, const QString& group) { tree_->addToPublicGroup(node, group); } void fixInheritance() { tree_->fixInheritance(); } void resolveProperties() { tree_->resolveProperties(); } @@ -140,7 +144,6 @@ class QDocDatabase ClassNode* findClassNode(const QStringList& path) { return tree_->findClassNode(path); } NamespaceNode* findNamespaceNode(const QStringList& path) { return tree_->findNamespaceNode(path); } - DocNode* findGroupNode(const QStringList& path) { return tree_->findGroupNode(path); } NameCollisionNode* findCollisionNode(const QString& name) const { return tree_->findCollisionNode(name); } @@ -205,6 +208,7 @@ class QDocDatabase QString version_; QDocMultiMap masterMap_; Tree* tree_; + DocNodeMap groups_; DocNodeMap modules_; DocNodeMap qmlModules_; QmlTypeMap qmlTypeMap_; |