diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2018-12-31 19:26:49 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2018-12-31 19:26:49 (GMT) |
| commit | aa0e5733e147bf629ca111a59b8523cb35c4c089 (patch) | |
| tree | 2cd94ccf3bf2bbcefabf0798f366a601f6069c03 /src/dot.cpp | |
| parent | b78af3d7ae63513d555008219cd31294ee134aad (diff) | |
| parent | 979b00385f963a7433ee7ad87dba1102d8f63f3a (diff) | |
| download | Doxygen-aa0e5733e147bf629ca111a59b8523cb35c4c089.zip Doxygen-aa0e5733e147bf629ca111a59b8523cb35c4c089.tar.gz Doxygen-aa0e5733e147bf629ca111a59b8523cb35c4c089.tar.bz2 | |
Merge branch 'albert-github-feature/issue_6708'
Diffstat (limited to 'src/dot.cpp')
| -rw-r--r-- | src/dot.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/dot.cpp b/src/dot.cpp index 0944a02..07a1a43 100644 --- a/src/dot.cpp +++ b/src/dot.cpp @@ -377,7 +377,6 @@ static bool convertMapFile(FTextStream &t,const char *mapName, const QCString &context=QCString()) { QFile f(mapName); - static QRegExp re("id=\"node[0-9]*\""); if (!f.open(IO_ReadOnly)) { err("problems opening map file %s for inclusion in the docs!\n" @@ -396,7 +395,17 @@ static bool convertMapFile(FTextStream &t,const char *mapName, if (buf.left(5)=="<area") { - t << replaceRef(buf,relPath,urlOnly,context).replace(re,""); + QCString replBuf = replaceRef(buf,relPath,urlOnly,context); + // strip id="..." from replBuf since the id's are not needed and not unique. + int indexS = replBuf.find("id=\""), indexE; + if (indexS>0 && (indexE=replBuf.find('"',indexS+4))!=-1) + { + t << replBuf.left(indexS-1) << replBuf.right(replBuf.length() - indexE - 1); + } + else + { + t << replBuf; + } } } } |