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/dia.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/dia.cpp')
| -rw-r--r-- | src/dia.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/dia.cpp b/src/dia.cpp index 8dab5b0..39ba2f8 100644 --- a/src/dia.cpp +++ b/src/dia.cpp @@ -29,7 +29,7 @@ void writeDiaGraphFromFile(const char *inFile,const char *outDir, const char *outFile,DiaOutputFormat format) { QCString absOutFile = outDir; - absOutFile+=portable_pathSeparator(); + absOutFile+=Portables::pathSeparator(); absOutFile+=outFile; // chdir to the output dir, so dot can find the font file. @@ -37,7 +37,7 @@ void writeDiaGraphFromFile(const char *inFile,const char *outDir, // go to the html output directory (i.e. path) QDir::setCurrent(outDir); //printf("Going to dir %s\n",QDir::currentDirPath().data()); - QCString diaExe = Config_getString(DIA_PATH)+"dia"+portable_commandExtension(); + QCString diaExe = Config_getString(DIA_PATH)+"dia"+Portables::commandExtension(); QCString diaArgs; QCString extension; diaArgs+="-n "; @@ -62,26 +62,26 @@ void writeDiaGraphFromFile(const char *inFile,const char *outDir, int exitCode; //printf("*** running: %s %s outDir:%s %s\n",diaExe.data(),diaArgs.data(),outDir,outFile); - portable_sysTimerStart(); - if ((exitCode=portable_system(diaExe,diaArgs,FALSE))!=0) + Portables::sysTimerStart(); + if ((exitCode=Portables::system(diaExe,diaArgs,FALSE))!=0) { err("Problems running %s. Check your installation or look typos in you dia file %s\n", diaExe.data(),inFile); - portable_sysTimerStop(); + Portables::sysTimerStop(); goto error; } - portable_sysTimerStop(); + Portables::sysTimerStop(); if ( (format==DIA_EPS) && (Config_getBool(USE_PDFLATEX)) ) { QCString epstopdfArgs(maxCmdLine); epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"", outFile,outFile); - portable_sysTimerStart(); - if (portable_system("epstopdf",epstopdfArgs)!=0) + Portables::sysTimerStart(); + if (Portables::system("epstopdf",epstopdfArgs)!=0) { err("Problems running epstopdf. Check your TeX installation!\n"); } - portable_sysTimerStop(); + Portables::sysTimerStop(); } error: |