diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-08 12:10:17 (GMT) |
---|---|---|
committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-08 12:10:17 (GMT) |
commit | 7d4f5205482b0f0212707d573c8c668a0125cc9f (patch) | |
tree | 83fa73cff0fbcd62182aff0cce8de83064954f45 /src/plantuml.cpp | |
parent | 6d4835dbe01a27923db8a1e4559b61da5065cb7a (diff) | |
parent | 6382986b77d302be187d95aaa850eff132ec1d7d (diff) | |
download | Doxygen-7d4f5205482b0f0212707d573c8c668a0125cc9f.zip Doxygen-7d4f5205482b0f0212707d573c8c668a0125cc9f.tar.gz Doxygen-7d4f5205482b0f0212707d573c8c668a0125cc9f.tar.bz2 |
Merge branch 'memory_leakage_fix' of https://github.com/virusxp/doxygen into virusxp-memory_leakage_fix
Diffstat (limited to 'src/plantuml.cpp')
-rw-r--r-- | src/plantuml.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plantuml.cpp b/src/plantuml.cpp index ff4ebd3..bad89e3 100644 --- a/src/plantuml.cpp +++ b/src/plantuml.cpp @@ -210,7 +210,7 @@ static void runPlantumlContent(const QDict< QList <QCString> > &plantumlFiles, } while (s) { - pumlArgs += portable_pathListSeparator(); + pumlArgs += Portables::pathListSeparator(); pumlArgs += s; s = pumlIncludePathList.next(); } @@ -227,7 +227,7 @@ static void runPlantumlContent(const QDict< QList <QCString> > &plantumlFiles, pumlArgs += "-graphvizdot \""; pumlArgs += dotPath; pumlArgs += "dot"; - pumlArgs += portable_commandExtension(); + pumlArgs += Portables::commandExtension(); pumlArgs += "\" "; } switch (format) @@ -283,8 +283,8 @@ static void runPlantumlContent(const QDict< QList <QCString> > &plantumlFiles, file.close(); Debug::print(Debug::Plantuml,0,"*** %s Running Plantuml arguments:%s\n","PlantumlManager::runPlantumlContent",qPrint(pumlArguments)); - portable_sysTimerStart(); - if ((exitCode=portable_system(pumlExe,pumlArguments,TRUE))!=0) + Portables::sysTimerStart(); + if ((exitCode=Portables::system(pumlExe,pumlArguments,TRUE))!=0) { err("Problems running PlantUML. Verify that the command 'java -jar \"%splantuml.jar\" -h' works from the command line. Exit code: %d\n", plantumlJarPath.data(),exitCode); @@ -294,7 +294,7 @@ static void runPlantumlContent(const QDict< QList <QCString> > &plantumlFiles, Debug::print(Debug::Plantuml,0,"*** %s Remove %s file\n","PlantumlManager::runPlantumlContent",qPrint(puFileName)); file.remove(); } - portable_sysTimerStop(); + Portables::sysTimerStop(); if ( (format==PlantumlManager::PUML_EPS) && (Config_getBool(USE_PDFLATEX)) ) { @@ -309,12 +309,12 @@ static void runPlantumlContent(const QDict< QList <QCString> > &plantumlFiles, const int maxCmdLine = 40960; QCString epstopdfArgs(maxCmdLine); epstopdfArgs.sprintf("\"%s%s.eps\" --outfile=\"%s%s.pdf\"",qPrint(pumlOutDir),qPrint(*nb),qPrint(pumlOutDir),qPrint(*nb)); - portable_sysTimerStart(); - if ((exitCode=portable_system("epstopdf",epstopdfArgs))!=0) + Portables::sysTimerStart(); + if ((exitCode=Portables::system("epstopdf",epstopdfArgs))!=0) { err("Problems running epstopdf. Check your TeX installation! Exit code: %d\n",exitCode); } - portable_sysTimerStop(); + Portables::sysTimerStop(); } } } |