diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2003-04-12 09:32:03 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2003-04-12 09:32:03 (GMT) |
| commit | 7e0aeda8a19448b44750f2530864432c964b0374 (patch) | |
| tree | 97a61f449c3cd2b31dba7908cce7881ee2f0da85 /src/util.cpp | |
| parent | b69146af8dce22431fc50dc3fcea6c7fd5fb1063 (diff) | |
| download | Doxygen-7e0aeda8a19448b44750f2530864432c964b0374.zip Doxygen-7e0aeda8a19448b44750f2530864432c964b0374.tar.gz Doxygen-7e0aeda8a19448b44750f2530864432c964b0374.tar.bz2 | |
Release-1.3
Diffstat (limited to 'src/util.cpp')
| -rw-r--r-- | src/util.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/util.cpp b/src/util.cpp index 494a333..6a5517e 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1932,7 +1932,14 @@ void mergeArguments(ArgumentList *srcAl,ArgumentList *dstAl) } else if (!srcA->name.isEmpty() && !dstA->name.isEmpty()) { - srcA->name = dstA->name.copy(); + if (srcA->docs.isEmpty() && !dstA->docs.isEmpty()) + { + srcA->name = dstA->name.copy(); + } + else if (!srcA->docs.isEmpty() && dstA->docs.isEmpty()) + { + dstA->name = srcA->name.copy(); + } } } else |