diff options
| -rw-r--r-- | src/cite.cpp | 11 | ||||
| -rw-r--r-- | src/config.h | 1 | ||||
| -rw-r--r-- | src/definition.cpp | 2 | ||||
| -rw-r--r-- | src/parserintf.h | 4 | ||||
| -rw-r--r-- | src/plantuml.cpp | 2 | ||||
| -rw-r--r-- | src/scanner.l | 2 |
6 files changed, 17 insertions, 5 deletions
diff --git a/src/cite.cpp b/src/cite.cpp index fb96c7a..42374d0 100644 --- a/src/cite.cpp +++ b/src/cite.cpp @@ -211,8 +211,15 @@ void CiteDict::generatePage() const // 5. run bib2xhtml perl script on the generated file which will insert the // bibliography in citelist.doc - portable_system("perl","\""+bib2xhtmlFile+"\" "+bibOutputFiles+" \""+ - citeListFile+"\""); + int exitCode; + portable_sysTimerStop(); + if ((exitCode=portable_system("perl","\""+bib2xhtmlFile+"\" "+bibOutputFiles+" \""+ + citeListFile+"\"")) != 0) + { + err("Problems running bibtex. Verify that the command 'perl --version' works from the command line. Exit code: %d\n", + exitCode); + } + portable_sysTimerStop(); QDir::setCurrent(oldDir); diff --git a/src/config.h b/src/config.h index 505e4d1..981f6fe 100644 --- a/src/config.h +++ b/src/config.h @@ -533,6 +533,7 @@ class Config m_dict = new QDict<ConfigOption>(257); m_options->setAutoDelete(TRUE); m_obsolete->setAutoDelete(TRUE); + m_disabled->setAutoDelete(TRUE); m_initialized = FALSE; create(); } diff --git a/src/definition.cpp b/src/definition.cpp index d2e3e01..3c11916 100644 --- a/src/definition.cpp +++ b/src/definition.cpp @@ -1618,7 +1618,7 @@ void Definition::writeToc(OutputList &ol) } cs[0]='0'+nextLevel; if (inLi[nextLevel]) ol.writeString("</li>\n"); - ol.writeString("<li class=\"level"+QCString(cs)+"\"><a href=\"#"+si->label+"\">"+si->title+"</a>"); + ol.writeString("<li class=\"level"+QCString(cs)+"\"><a href=\"#"+si->label+"\">"+(si->title.isEmpty()?si->label:si->title)+"</a>"); inLi[nextLevel]=TRUE; level = nextLevel; } diff --git a/src/parserintf.h b/src/parserintf.h index 019b4a9..989fdcf 100644 --- a/src/parserintf.h +++ b/src/parserintf.h @@ -147,6 +147,10 @@ class ParserManager */ ParserManager() : m_defaultParser(0) { m_parsers.setAutoDelete(TRUE); } + ~ParserManager() + { + delete m_defaultParser; + } void registerDefaultParser(ParserInterface *parser) { diff --git a/src/plantuml.cpp b/src/plantuml.cpp index 5e5bd98..87e70e1 100644 --- a/src/plantuml.cpp +++ b/src/plantuml.cpp @@ -116,7 +116,7 @@ void generatePlantUMLOutput(const char *baseName,const char *outDir,PlantUMLOutp QCString epstopdfArgs(maxCmdLine); epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"",baseName,baseName); portable_sysTimerStart(); - if (exitCode=portable_system("epstopdf",epstopdfArgs)!=0) + if ((exitCode=portable_system("epstopdf",epstopdfArgs))!=0) { err("Problems running epstopdf. Check your TeX installation! Exit code: %d\n",exitCode); } diff --git a/src/scanner.l b/src/scanner.l index 716dc6a..d012b93 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -1228,7 +1228,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) { lineCount(); lastSkipRoundContext = YY_START; - roundCount=1; + roundCount=0; BEGIN( SkipRound ); } else if (qstrncmp(yytext,"@property",9)==0) // ObjC 2.0 property |