diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-25 09:09:33 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-25 09:09:33 (GMT) |
| commit | 80f1f380f199f470ef9678a413d537feba68d87a (patch) | |
| tree | 57ad379d75b0ede4af42ec20e1d21fd04c9b5360 /src/dia.cpp | |
| parent | 36c549da50d685fd8be82e88cb63db5cf13c57f5 (diff) | |
| parent | ff3fdb3ac14a1f90334ca6c40eac46c772b5af63 (diff) | |
| download | Doxygen-80f1f380f199f470ef9678a413d537feba68d87a.zip Doxygen-80f1f380f199f470ef9678a413d537feba68d87a.tar.gz Doxygen-80f1f380f199f470ef9678a413d537feba68d87a.tar.bz2 | |
Merge branch 'master' into feature/bug_style_change
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..4a00a17 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+=Portable::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"+Portable::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) + Portable::sysTimerStart(); + if ((exitCode=Portable::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(); + Portable::sysTimerStop(); goto error; } - portable_sysTimerStop(); + Portable::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) + Portable::sysTimerStart(); + if (Portable::system("epstopdf",epstopdfArgs)!=0) { err("Problems running epstopdf. Check your TeX installation!\n"); } - portable_sysTimerStop(); + Portable::sysTimerStop(); } error: |