summaryrefslogtreecommitdiffstats
path: root/src/plantuml.cpp
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2020-02-01 14:08:11 (GMT)
committeralbert-github <albert.tests@gmail.com>2020-02-01 14:08:11 (GMT)
commit1e8a4daf669fa83a2b04c32a5be65ceffea59d9a (patch)
treeb7f22c4590c122438e80a301d31ed6a432997a69 /src/plantuml.cpp
parent59fc1a94e84278dedc80569b72756f336a705693 (diff)
downloadDoxygen-1e8a4daf669fa83a2b04c32a5be65ceffea59d9a.zip
Doxygen-1e8a4daf669fa83a2b04c32a5be65ceffea59d9a.tar.gz
Doxygen-1e8a4daf669fa83a2b04c32a5be65ceffea59d9a.tar.bz2
Plantuml has problems with output directories ending with directory separator
Based on the message in #7558 In case a `HTML_OUTPUT` directory (or other `*_OUTPUT` directory ends with a directory separator we get the message: ``` QGDict::hashAsciiKey: Invalid null key ``` by stripping the directory separator this problem can be overcome.
Diffstat (limited to 'src/plantuml.cpp')
-rw-r--r--src/plantuml.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plantuml.cpp b/src/plantuml.cpp
index fa50f2d..a8e9d0c 100644
--- a/src/plantuml.cpp
+++ b/src/plantuml.cpp
@@ -27,16 +27,22 @@
#include <qlist.h>
-QCString PlantumlManager::writePlantUMLSource(const QCString &outDir,const QCString &fileName,const QCString &content,OutputFormat format)
+QCString PlantumlManager::writePlantUMLSource(const QCString &outDirArg,const QCString &fileName,const QCString &content,OutputFormat format)
{
QCString baseName;
QCString puName;
QCString imgName;
+ QCString outDir(outDirArg);
static int umlindex=1;
Debug::print(Debug::Plantuml,0,"*** %s fileName: %s\n","writePlantUMLSource",qPrint(fileName));
Debug::print(Debug::Plantuml,0,"*** %s outDir: %s\n","writePlantUMLSource",qPrint(outDir));
+ while ((outDir.findRev('/') == outDir.length()-1) || (outDir.findRev('\\') == outDir.length()-1))
+ {
+ outDir = outDir.left(outDir.length()-1);
+ }
+
if (fileName.isEmpty()) // generate name
{
puName = "inline_umlgraph_"+QCString().setNum(umlindex);