Merge pull request #7703 from elrond79/set_defname_if_not_proto

make declArgumentList be from declaration, and argumentList from definition

1 files changed, 3 insertions, 3 deletions

diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index efd8294..6c4a19c 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -3447,7 +3447,7 @@ static void buildFunctionList(const Entry *root)
                 {
                   // merge argument lists
                   ArgumentList mergedArgList = root->argList;
-                  mergeArguments(mdAl,mergedArgList,!root->doc.isEmpty());
+                  mergeArguments(mdAl,mergedArgList,!root->proto);
                   // merge documentation
                   if (md->documentation().isEmpty() && !root->doc.isEmpty())
                   {
@@ -4956,7 +4956,7 @@ static void addMemberDocs(const Entry *root,
   {
     ArgumentList mergedAl = *al;
     //printf("merging arguments (1) docs=%d\n",root->doc.isEmpty());
-    mergeArguments(mdAl,mergedAl,!root->doc.isEmpty());
+    mergeArguments(mdAl,mergedAl,!root->proto);
   }
   else
   {
@@ -4969,7 +4969,7 @@ static void addMemberDocs(const Entry *root,
     {
       //printf("merging arguments (2)\n");
       ArgumentList mergedArgList = root->argList;
-      mergeArguments(mdAl,mergedArgList,!root->doc.isEmpty());
+      mergeArguments(mdAl,mergedArgList,!root->proto);
     }
   }
   if (over_load)  // the \overload keyword was used