diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2021-04-11 19:22:59 (GMT) |
---|---|---|
committer | Dimitri van Heesch <doxygen@gmail.com> | 2021-04-22 17:34:13 (GMT) |
commit | 592aaa4f17d73ec8c475df0f44efaea8cc4d575c (patch) | |
tree | 3cfd68cec756661045ee25c906a8d8f4bddf7a6a /src/msc.cpp | |
parent | 98c67549bc3cd855873e0ef5eeab7c6410699d78 (diff) | |
download | Doxygen-592aaa4f17d73ec8c475df0f44efaea8cc4d575c.zip Doxygen-592aaa4f17d73ec8c475df0f44efaea8cc4d575c.tar.gz Doxygen-592aaa4f17d73ec8c475df0f44efaea8cc4d575c.tar.bz2 |
Refactoring: remove implicit conversion from QCString to const char *
This commit changes the following in relation to string use
- The implicit convert from 'QCString' to 'const char *' is removed
- Strings parameters use 'const QCString &' as much as possible in favor
over 'const char *'
- 'if (s)' where s is a QCString has been replaced by 'if(!s.isEmpty())'
- data() now always returns a valid C-string and not a 0-pointer.
- when passing a string 's' to printf and related functions 'qPrint(s)' is
used instead of 's.data()'
- for empty string arguments 'QCString()' is used instead of '0'
- The copy() operation has been removed
- Where possible 'qstrcmp(a,b)==0' has been replaces by 'a==b' and
'qstrcmp(a,b)<0' has been replaced by 'a<b'
- Parameters of string type that were default initialized with '= 0' are
no initialized with '= QCString()'
Diffstat (limited to 'src/msc.cpp')
-rw-r--r-- | src/msc.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/msc.cpp b/src/msc.cpp index 7247689..b486389 100644 --- a/src/msc.cpp +++ b/src/msc.cpp @@ -29,15 +29,15 @@ static const int maxCmdLine = 40960; -static bool convertMapFile(TextStream &t,const char *mapName,const QCString relPath, +static bool convertMapFile(TextStream &t,const QCString &mapName,const QCString &relPath, const QCString &context) { - std::ifstream f(mapName,std::ifstream::in); + std::ifstream f(mapName.str(),std::ifstream::in); if (!f.is_open()) { err("failed to open map file %s for inclusion in the docs!\n" "If you installed Graphviz/dot after a previous failing run, \n" - "try deleting the output directory and rerun doxygen.\n",mapName); + "try deleting the output directory and rerun doxygen.\n",qPrint(mapName)); return false; } const int maxLineLen=1024; @@ -88,8 +88,8 @@ static bool convertMapFile(TextStream &t,const char *mapName,const QCString relP return true; } -void writeMscGraphFromFile(const char *inFile,const char *outDir, - const char *outFile,MscOutputFormat format) +void writeMscGraphFromFile(const QCString &inFile,const QCString &outDir, + const QCString &outFile,MscOutputFormat format) { QCString absOutFile = outDir; absOutFile+=Portable::pathSeparator(); @@ -115,10 +115,10 @@ void writeMscGraphFromFile(const char *inFile,const char *outDir, return; } int code; - if ((code=mscgen_generate(inFile,imgName,msc_format))!=0) + if ((code=mscgen_generate(inFile.data(),imgName.data(),msc_format))!=0) { err("Problems generating msc output (error=%s). Look for typos in you msc file %s\n", - mscgen_error2str(code),inFile); + mscgen_error2str(code),qPrint(inFile)); return; } @@ -126,7 +126,7 @@ void writeMscGraphFromFile(const char *inFile,const char *outDir, { QCString epstopdfArgs(maxCmdLine); epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"", - absOutFile.data(),absOutFile.data()); + qPrint(absOutFile),qPrint(absOutFile)); Portable::sysTimerStart(); if (Portable::system("epstopdf",epstopdfArgs)!=0) { @@ -146,11 +146,11 @@ static QCString getMscImageMapFromFile(const QCString& inFile, const QCString& o QCString outFile = inFile + ".map"; int code; - if ((code=mscgen_generate(inFile,outFile, + if ((code=mscgen_generate(inFile.data(),outFile.data(), writeSVGMap ? mscgen_format_svgmap : mscgen_format_pngmap))!=0) { err("Problems generating msc output (error=%s). Look for typos in you msc file %s\n", - mscgen_error2str(code),inFile.data()); + mscgen_error2str(code),qPrint(inFile)); return ""; } |