From 14f7eb86ca2275d91f284279af5f77205d4ae3c0 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 13 Sep 2012 11:38:45 +0200 Subject: qdoc: Refactoring of qdoc data structures This commit is the beginning of a significant overhaul of qdoc. A new class, QDocDatabase, is added, which will eventually encapsulate all the data structures used by qdoc. In this commit, the Tree class is made private and only accessible from QDocDatabase. Several maps structures are also moved into QDocDatabase from other classes. Much dead code and unused parameters were removed. Further simplification will follow. Change-Id: I237411c50f3ced0d2fc8d3b0fbfdf4e55880f8e9 Reviewed-by: Qt Doc Bot Reviewed-by: Lars Knoll Reviewed-by: Jerome Pasion --- src/tools/qdoc/qmlcodemarker.cpp | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'src/tools/qdoc/qmlcodemarker.cpp') diff --git a/src/tools/qdoc/qmlcodemarker.cpp b/src/tools/qdoc/qmlcodemarker.cpp index 92f7923d8a8..8c6b0f05096 100644 --- a/src/tools/qdoc/qmlcodemarker.cpp +++ b/src/tools/qdoc/qmlcodemarker.cpp @@ -108,38 +108,6 @@ Atom::Type QmlCodeMarker::atomType() const return Atom::Qml; } -/*! - Returns the name of the \a node. Method names include are returned with a - trailing set of parentheses. - */ -QString QmlCodeMarker::plainName(const Node *node) -{ - QString name = node->name(); - if (node->type() == Node::QmlMethod) - name += "()"; - return name; -} - -QString QmlCodeMarker::plainFullName(const Node *node, const Node *relative) -{ - if (node->name().isEmpty()) { - return "global"; - } - else { - QString fullName; - while (node) { - fullName.prepend(plainName(node)); - if (node->parent() == relative || - node->parent()->subType() == Node::Collision || - node->parent()->name().isEmpty()) - break; - fullName.prepend("::"); - node = node->parent(); - } - return fullName; - } -} - QString QmlCodeMarker::markedUpCode(const QString &code, const Node *relative, const Location &location) -- cgit v1.2.3