diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-08-07 08:56:17 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-07 08:56:17 (GMT) |
commit | ade74102d869ce21bef28b60deead0bc4e63bb36 (patch) | |
tree | 632ca4fac592c2a1d3283e0ba8f8aa7671a5d16c /src | |
parent | b676f2009ba9e6e953f9e3a999342b7dad79b1bf (diff) | |
parent | 67cd1a3bf4981fd755ada6eeb85622b46638a749 (diff) | |
download | Doxygen-ade74102d869ce21bef28b60deead0bc4e63bb36.zip Doxygen-ade74102d869ce21bef28b60deead0bc4e63bb36.tar.gz Doxygen-ade74102d869ce21bef28b60deead0bc4e63bb36.tar.bz2 |
Merge pull request #7042 from albert-github/feature/bug_632754
Bug 632754 - The \copydoc Command Requires The Use of C++ Syntax in C# Code
Diffstat (limited to 'src')
-rw-r--r-- | src/docparser.cpp | 3 | ||||
-rw-r--r-- | src/util.cpp | 5 | ||||
-rw-r--r-- | src/util.h | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/docparser.cpp b/src/docparser.cpp index 550aba2..b97bf1c 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -686,6 +686,8 @@ static bool findDocsForMemberOrCompound(const char *commandName, *pBrief=""; *pDef=0; QCString cmdArg=substitute(commandName,"#","::"); + cmdArg = replaceScopeSeparator(cmdArg); + int l=cmdArg.length(); if (l==0) return FALSE; @@ -711,7 +713,6 @@ static bool findDocsForMemberOrCompound(const char *commandName, QCString name=removeRedundantWhiteSpace(cmdArg.left(funcStart)); QCString args=cmdArg.right(l-funcStart); - // try if the link is to a member const MemberDef *md=0; const ClassDef *cd=0; diff --git a/src/util.cpp b/src/util.cpp index 69f91d5..5808815 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -8543,6 +8543,11 @@ QCString getLanguageSpecificSeparator(SrcLangExt lang,bool classScope) return "::"; } } +QCString replaceScopeSeparator(QCString str) +{ + // we don't know about the language so we have to go for the worse + return substitute(substitute(str,"\\","::"),".","::"); // PHP and Java, CSharp, VHDL, Python +} /** Checks whether the given url starts with a supported protocol */ bool isURL(const QCString &url) { @@ -119,6 +119,7 @@ class LetterToIndexMap : public SIntDict<T> QCString langToString(SrcLangExt lang); QCString getLanguageSpecificSeparator(SrcLangExt lang,bool classScope=FALSE); +QCString replaceScopeSeparator(QCString str); //-------------------------------------------------------------------- |