diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2012-05-04 14:51:53 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 17:57:46 +0200 |
| commit | 9a140d65217e22324d3f75d7c6e48eeca84f5c71 (patch) | |
| tree | 7e9e33b5fea6021f174da85b87fc63c6c061517f /src/tools/qdoc/node.cpp | |
| parent | 295ec32a74502e225f6ebb606536587786708676 (diff) | |
QDoc: Generate unique ids for qmlMethods.
Also delete unused function.
Change-Id: I8c3590d17c823bc27dcb9d9e73b7b812e078d33b
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Diffstat (limited to 'src/tools/qdoc/node.cpp')
| -rw-r--r-- | src/tools/qdoc/node.cpp | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/src/tools/qdoc/node.cpp b/src/tools/qdoc/node.cpp index 4d6c58a8a3d..c648c720eb1 100644 --- a/src/tools/qdoc/node.cpp +++ b/src/tools/qdoc/node.cpp @@ -1048,20 +1048,6 @@ int InnerNode::overloadNumber(const FunctionNode *func) const } /*! - Returns the number of member functions of a class such that - the functions are all named \a funcName. - */ -int InnerNode::numOverloads(const QString& funcName) const -{ - if (primaryFunctionMap.contains(funcName)) { - return secondaryFunctionMap[funcName].count() + 1; - } - else { - return 0; - } -} - -/*! Returns a node list containing all the member functions of some class such that the functions overload the name \a funcName. */ @@ -1821,15 +1807,6 @@ int FunctionNode::overloadNumber() const } /*! - Returns the number of times this function name has been - overloaded, obtained from the parent. - */ -int FunctionNode::numOverloads() const -{ - return parent()->numOverloads(name()); -} - -/*! Returns the list of parameter names. */ QStringList FunctionNode::parameterNames() const @@ -2745,7 +2722,10 @@ QString Node::idForNode() const str = "qml-signal-handler-" + name(); break; case Node::QmlMethod: - str = "qml-method-" + name(); + func = static_cast<const FunctionNode*>(this); + str = "qml-method-" + func->name(); + if (func->overloadNumber() != 1) + str += "-" + QString::number(func->overloadNumber()); break; case Node::Variable: str = "var-" + name(); |