diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2021-04-28 18:58:23 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-28 18:58:23 (GMT) |
| commit | 200c31bf342c533de77fede161e18e395c5ce875 (patch) | |
| tree | ab3e4df7e6d88c5907d89fc8ef66fcd28738ae20 /src/dia.cpp | |
| parent | b95b4766c7107e9b3ff0969534fe54c131412249 (diff) | |
| parent | a9f40a48c99af952836a3871e60ff6ca17ecdecf (diff) | |
| download | Doxygen-200c31bf342c533de77fede161e18e395c5ce875.zip Doxygen-200c31bf342c533de77fede161e18e395c5ce875.tar.gz Doxygen-200c31bf342c533de77fede161e18e395c5ce875.tar.bz2 | |
Merge branch 'master' into feature/bug_formula_mj
Diffstat (limited to 'src/dia.cpp')
| -rw-r--r-- | src/dia.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/dia.cpp b/src/dia.cpp index 11c5270..13c1316 100644 --- a/src/dia.cpp +++ b/src/dia.cpp @@ -23,8 +23,8 @@ static const int maxCmdLine = 40960; -void writeDiaGraphFromFile(const char *inFile,const char *outDir, - const char *outFile,DiaOutputFormat format) +void writeDiaGraphFromFile(const QCString &inFile,const QCString &outDir, + const QCString &outFile,DiaOutputFormat format) { QCString absOutFile = outDir; absOutFile+=Portable::pathSeparator(); @@ -33,7 +33,7 @@ void writeDiaGraphFromFile(const char *inFile,const char *outDir, // chdir to the output dir, so dot can find the font file. std::string oldDir = Dir::currentDirPath(); // go to the html output directory (i.e. path) - Dir::setCurrent(outDir); + Dir::setCurrent(outDir.str()); //printf("Going to dir %s\n",Dir::currentDirPath().c_str()); QCString diaExe = Config_getString(DIA_PATH)+"dia"+Portable::commandExtension(); QCString diaArgs; @@ -59,12 +59,12 @@ void writeDiaGraphFromFile(const char *inFile,const char *outDir, diaArgs+="\""; int exitCode; - //printf("*** running: %s %s outDir:%s %s\n",diaExe.data(),diaArgs.data(),outDir,outFile); + //printf("*** running: %s %s outDir:%s %s\n",qPrint(diaExe),qPrint(diaArgs),outDir,outFile); 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); + qPrint(diaExe),qPrint(inFile)); Portable::sysTimerStop(); goto error; } @@ -73,7 +73,7 @@ void writeDiaGraphFromFile(const char *inFile,const char *outDir, { QCString epstopdfArgs(maxCmdLine); epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"", - outFile,outFile); + qPrint(outFile),qPrint(outFile)); Portable::sysTimerStart(); if (Portable::system("epstopdf",epstopdfArgs)!=0) { |