qdoc: Related non-members are now linked correctly

It was harder to fix this tan you might think, but the
fix cleans up the overload mechanism a lot, so if no
regressions are introduced by the fix, the code will
be easier to manage.

The related non-members are now added to the class
node's list of secondary (overload) functions. This
way, they get an overload number just like overloaded
member functions.

Change-Id: I68d7a314b0bb5ec0fbba15dc1fd40a5b870c659d
Task-number: QTBUG-46148
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp
index d7a17fce26..5eda23e216 100644
--- a/src/tools/qdoc/htmlgenerator.cpp
+++ b/src/tools/qdoc/htmlgenerator.cpp
@@ -1477,7 +1477,7 @@ void HtmlGenerator::generateClassLikeNode(Aggregate* inner, CodeMarker* marker)
                     const FunctionNode *func = reinterpret_cast<const FunctionNode *>(*m);
                     if (func->metaness() == FunctionNode::Ctor ||
                             func->metaness() == FunctionNode::Dtor ||
-                            func->overloadNumber() != 1)
+                            func->overloadNumber() != 0)
                         names.clear();
                 }
                 else if ((*m)->type() == Node::Property) {
@@ -3734,7 +3734,7 @@ QString HtmlGenerator::refForNode(const Node *node)
         }
         else {
             ref = func->name();
-            if (func->overloadNumber() != 1)
+            if (func->overloadNumber() != 0)
                 ref += QLatin1Char('-') + QString::number(func->overloadNumber());
         }
         break;
@@ -3759,7 +3759,7 @@ QString HtmlGenerator::refForNode(const Node *node)
     case Node::QmlMethod:
         func = static_cast<const FunctionNode *>(node);
         ref = func->name() + "-method";
-        if (func->overloadNumber() != 1)
+        if (func->overloadNumber() != 0)
             ref += QLatin1Char('-') + QString::number(func->overloadNumber());
         break;
     case Node::Variable:
@@ -4365,7 +4365,7 @@ void HtmlGenerator::generateExtractionMark(const Node *node, ExtractionMarkType
             if (node->type() == Node::Function) {
                 const FunctionNode *func = static_cast<const FunctionNode *>(node);
                 if (!func->associatedProperty()) {
-                    if (func->overloadNumber() == 1)
+                    if (func->overloadNumber() == 0)
                         out() << "[overload1]";
                     out() << "$$$" + func->name() + func->rawParameters().remove(' ');
                 }