From d27070014e0f36246e7eec3899c7d55503b1a05a Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Sun, 11 Feb 2001 18:24:41 +0000 Subject: Release-1.2.5-20010211 --- INSTALL | 4 +-- README | 4 +-- VERSION | 2 +- addon/configgen/configgen.cpp | 18 +++++++++++++ addon/xmlgen/xml.cpp | 2 ++ packages/rpm/doxygen.spec | 2 +- src/code.l | 2 +- src/config.h | 4 ++- src/config.l | 32 +++++++++++++++++++++- src/definition.cpp | 28 +++++++++++-------- src/doc.l | 54 ++++++++++++++++++++----------------- src/dot.cpp | 6 ++--- src/doxygen.cpp | 11 ++------ src/ftvhelp.cpp | 17 +++++++++++- src/htmlgen.h | 4 ++- src/htmlhelp.cpp | 6 ++--- src/latexgen.h | 4 ++- src/mangen.h | 4 ++- src/outputgen.h | 2 ++ src/outputlist.h | 8 ++++-- src/rtfgen.h | 4 ++- src/scanner.l | 1 + src/translator.h | 2 +- src/translator_cz.h | 5 ++++ src/translator_de.h | 39 +++++++++++++++++++++++++++ src/translator_hr.h | 62 +++++++++++++++++++++++++++++++++++++++++++ 26 files changed, 259 insertions(+), 68 deletions(-) diff --git a/INSTALL b/INSTALL index b98a483..0b0185b 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ -DOXYGEN Version 1.2.5 +DOXYGEN Version 1.2.5-20010211 Please read the installation section of the manual for instructions. -------- -Dimitri van Heesch (04 February 2001) +Dimitri van Heesch (11 February 2001) diff --git a/README b/README index 847e873..8e47fea 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -DOXYGEN Version 1.2.5 +DOXYGEN Version 1.2.5-20010211 Please read INSTALL for compilation instructions. @@ -7,4 +7,4 @@ The latest version of doxygen can be obtained at Enjoy, -Dimitri van Heesch (04 February 2001) +Dimitri van Heesch (11 February 2001) diff --git a/VERSION b/VERSION index c813fe1..4bddb77 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.5 +1.2.5-20010211 diff --git a/addon/configgen/configgen.cpp b/addon/configgen/configgen.cpp index 69dcca3..cb4cfdf 100644 --- a/addon/configgen/configgen.cpp +++ b/addon/configgen/configgen.cpp @@ -1306,6 +1306,15 @@ void init() "of the generated HTML documentation. \n" ); addDependency("htmlHelpFlag","generateHtml"); + ConfigBool::add( "htmlHelpChiFlag", + "GENERATE_CHI", + "FALSE", + "should chi file be generated?", + "If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag \n" + "controls if a separate .chi index file is generated (YES) or that \n" + "it should be included in the master .chm file (NO).\n" + ); + addDependency("htmlHelpChiFlag","generateHtml"); ConfigBool::add( "noIndexFlag", "DISABLE_INDEX", "FALSE", @@ -1755,6 +1764,15 @@ void init() "arrows in the dot generated graphs. \n" ); addDependency("generateLegend","haveDotFlag"); + ConfigBool::add( "dotCleanUp", + "DOT_CLEANUP", + "TRUE", + "remove intermedia dot files?", + "If the DOT_CLEANUP tag is set to YES (the default) Doxygen will \n" + "remove the intermedate dot files that are used to generate \n" + "the various graphs. \n" + ); + addDependency("dotCleanUp","haveDotFlag"); //----------------------------------------------------------------------------------------------- ConfigInfo::add( "Search","Configuration::addtions related to the search engine "); diff --git a/addon/xmlgen/xml.cpp b/addon/xmlgen/xml.cpp index 7717cbe..93c1250 100644 --- a/addon/xmlgen/xml.cpp +++ b/addon/xmlgen/xml.cpp @@ -16,6 +16,8 @@ * */ +#include + #include "qtbc.h" #include "xml.h" #include "doxygen.h" diff --git a/packages/rpm/doxygen.spec b/packages/rpm/doxygen.spec index d7a859c..40a9c38 100644 --- a/packages/rpm/doxygen.spec +++ b/packages/rpm/doxygen.spec @@ -1,5 +1,5 @@ Name: doxygen -Version: 1.2.5 +Version: 1.2.5-20010211 Summary: documentation system for C, C++ and IDL Release: 1 Source0: doxygen-%{version}.src.tar.gz diff --git a/src/code.l b/src/code.l index 53e3ff5..14b738e 100644 --- a/src/code.l +++ b/src/code.l @@ -809,7 +809,7 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned" if (!g_insideTemplate) BEGIN( ClassName ); } -[a-z_A-Z0-9.]+(("/"[a-z_A-Z0-9.]+)*)/(">"|"\"") { +[^\n\"\>]+/(">"|"\"") { //FileInfo *f; bool ambig; FileDef *fd; diff --git a/src/config.h b/src/config.h index a8495bd..ce14ac8 100644 --- a/src/config.h +++ b/src/config.h @@ -1,4 +1,4 @@ -/* This file was generated by configgen on Sat Feb 3 18:53:37 2001 +/* This file was generated by configgen on Thu Feb 8 22:26:39 2001 * from config_templ.h * * DO NOT EDIT! @@ -97,6 +97,7 @@ struct Config static QCString htmlStyleSheet; // user defined cascading style sheet static bool htmlAlignMemberFlag; // align members in HTML using tables. static bool htmlHelpFlag; // should html help files be generated? + static bool htmlHelpChiFlag; // should chi file be generated? static bool noIndexFlag; // generate condensed index flag static int enumValuesPerLine; // number of enum values that are put on one line static bool ftvHelpFlag; // should a folder tree view be generated? @@ -140,6 +141,7 @@ struct Config static int maxDotGraphWidth; // max dot graph width static int maxDotGraphHeight; // max dot graph height static bool generateLegend; // generate legend page + static bool dotCleanUp; // remove intermedia dot files? static bool searchEngineFlag; // generate search engine flag static QCString cgiName; // the name of the CGI binary static QCString cgiURL; // the absolute URL to the CGI binary diff --git a/src/config.l b/src/config.l index 6786b88..7221429 100644 --- a/src/config.l +++ b/src/config.l @@ -1,4 +1,4 @@ -/* This file was generated by configgen on Sat Feb 3 18:53:38 2001 +/* This file was generated by configgen on Thu Feb 8 22:26:39 2001 * from config_templ.l * * DO NOT EDIT! @@ -134,6 +134,7 @@ QCString Config::footerFile; QCString Config::htmlStyleSheet; bool Config::htmlAlignMemberFlag = TRUE; bool Config::htmlHelpFlag = FALSE; +bool Config::htmlHelpChiFlag = FALSE; bool Config::noIndexFlag = FALSE; int Config::enumValuesPerLine = 4; bool Config::ftvHelpFlag = FALSE; @@ -177,6 +178,7 @@ QCString Config::dotPath; int Config::maxDotGraphWidth = 1024; int Config::maxDotGraphHeight = 1024; bool Config::generateLegend = TRUE; +bool Config::dotCleanUp = TRUE; bool Config::searchEngineFlag = FALSE; QCString Config::cgiName = "search.cgi"; QCString Config::cgiURL; @@ -416,6 +418,7 @@ static void readIncludeFile(const char *incName) "HTML_STYLESHEET"[ \t]*"=" { BEGIN(GetString); s=&Config::htmlStyleSheet; s->resize(0); } "HTML_ALIGN_MEMBERS"[ \t]*"=" { BEGIN(GetBool); b=&Config::htmlAlignMemberFlag; } "GENERATE_HTMLHELP"[ \t]*"=" { BEGIN(GetBool); b=&Config::htmlHelpFlag; } +"GENERATE_CHI"[ \t]*"=" { BEGIN(GetBool); b=&Config::htmlHelpChiFlag; } "DISABLE_INDEX"[ \t]*"=" { BEGIN(GetBool); b=&Config::noIndexFlag; } "ENUM_VALUES_PER_LINE"[ \t]*"=" { BEGIN(GetString); s=&enumValuesPerLineString; s->resize(0); } "GENERATE_TREEVIEW"[ \t]*"=" { BEGIN(GetBool); b=&Config::ftvHelpFlag; } @@ -465,6 +468,7 @@ static void readIncludeFile(const char *incName) "MAX_DOT_GRAPH_WIDTH"[ \t]*"=" { BEGIN(GetString); s=&maxDotGraphWidthString; s->resize(0); } "MAX_DOT_GRAPH_HEIGHT"[ \t]*"=" { BEGIN(GetString); s=&maxDotGraphHeightString; s->resize(0); } "GENERATE_LEGEND"[ \t]*"=" { BEGIN(GetBool); b=&Config::generateLegend; } +"DOT_CLEANUP"[ \t]*"=" { BEGIN(GetBool); b=&Config::dotCleanUp; } "SEARCHENGINE"[ \t]*"=" { BEGIN(GetBool); b=&Config::searchEngineFlag; } "CGI_NAME"[ \t]*"=" { BEGIN(GetString); s=&Config::cgiName; s->resize(0); } "CGI_URL"[ \t]*"=" { BEGIN(GetString); s=&Config::cgiURL; s->resize(0); } @@ -718,6 +722,7 @@ void dumpConfig() printf("htmlStyleSheet=`%s'\n",Config::htmlStyleSheet.data()); printf("htmlAlignMemberFlag=`%d'\n",Config::htmlAlignMemberFlag); printf("htmlHelpFlag=`%d'\n",Config::htmlHelpFlag); + printf("htmlHelpChiFlag=`%d'\n",Config::htmlHelpChiFlag); printf("noIndexFlag=`%d'\n",Config::noIndexFlag); printf("enumValuesPerLine=`%d'\n",Config::enumValuesPerLine); printf("ftvHelpFlag=`%d'\n",Config::ftvHelpFlag); @@ -809,6 +814,7 @@ void dumpConfig() printf("maxDotGraphWidth=`%d'\n",Config::maxDotGraphWidth); printf("maxDotGraphHeight=`%d'\n",Config::maxDotGraphHeight); printf("generateLegend=`%d'\n",Config::generateLegend); + printf("dotCleanUp=`%d'\n",Config::dotCleanUp); printf("# Configuration::addtions related to the search engine \n"); printf("searchEngineFlag=`%d'\n",Config::searchEngineFlag); printf("cgiName=`%s'\n",Config::cgiName.data()); @@ -888,6 +894,7 @@ void Config::init() Config::htmlStyleSheet.resize(0); Config::htmlAlignMemberFlag = TRUE; Config::htmlHelpFlag = FALSE; + Config::htmlHelpChiFlag = FALSE; Config::noIndexFlag = FALSE; Config::enumValuesPerLine = 4; Config::ftvHelpFlag = FALSE; @@ -931,6 +938,7 @@ void Config::init() Config::maxDotGraphWidth = 1024; Config::maxDotGraphHeight = 1024; Config::generateLegend = TRUE; + Config::dotCleanUp = TRUE; Config::searchEngineFlag = FALSE; Config::cgiName = "search.cgi"; Config::cgiURL.resize(0); @@ -1727,6 +1735,17 @@ void writeTemplateConfig(QFile *f,bool sl) if (!sl) { t << "\n"; + t << "# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag \n"; + t << "# controls if a separate .chi index file is generated (YES) or that \n"; + t << "# it should be included in the master .chm file (NO).\n"; + t << "\n"; + } + t << "GENERATE_CHI = "; + writeBoolValue(t,Config::htmlHelpChiFlag); + t << "\n"; + if (!sl) + { + t << "\n"; t << "# The DISABLE_INDEX tag can be used to turn on/off the condensed index at \n"; t << "# top of each HTML page. The value NO (the default) enables the index and \n"; t << "# the value YES disables it. \n"; @@ -2251,6 +2270,17 @@ void writeTemplateConfig(QFile *f,bool sl) if (!sl) { t << "\n"; + t << "# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will \n"; + t << "# remove the intermedate dot files that are used to generate \n"; + t << "# the various graphs. \n"; + t << "\n"; + } + t << "DOT_CLEANUP = "; + writeBoolValue(t,Config::dotCleanUp); + t << "\n"; + if (!sl) + { + t << "\n"; } t << "#---------------------------------------------------------------------------\n"; t << "# Configuration::addtions related to the search engine \n"; diff --git a/src/definition.cpp b/src/definition.cpp index b068d79..ebd126c 100644 --- a/src/definition.cpp +++ b/src/definition.cpp @@ -141,7 +141,7 @@ void Definition::setBriefDescription(const char *b) } /*! Reads a fragment of code from file \a fileName starting at - * line \a startLine and ending at line \a endLine. The fragment is + * line \a startLine and ending at line \a endLine (inclusive). The fragment is * stored in \a result. If FALSE is returned the code fragment could not be * found. * @@ -201,10 +201,15 @@ static bool readCodeFragment(const char *fileName, } if (found) { - // fill the line with spaces until the right column - QCString spaces; - spaces.fill(' ',col); - result+=spaces; + // For code with more than one line, + // fill the line with spaces until we are at the right column + // so that the opening brace lines up with the closing brace + if (endLine!=startLine) + { + QCString spaces; + spaces.fill(' ',col); + result+=spaces; + } // copy until end of line result+=c; if (c==':') result+=cn; @@ -221,15 +226,16 @@ static bool readCodeFragment(const char *fileName, } while (size_read == (maxLineLength-1)); lineNr++; - } while (lineNr 0) + // strip stuff after closing bracket + int newLineIndex = result.findRev('\n'); + int braceIndex = result.findRev('}'); + if (braceIndex > newLineIndex) { - result.truncate(charIndex+1); - result+='\n'; + result.truncate(braceIndex+1); } - endLine=lineNr; + endLine=lineNr-1; return TRUE; } } diff --git a/src/doc.l b/src/doc.l index 5c449b3..efeb291 100644 --- a/src/doc.l +++ b/src/doc.l @@ -472,8 +472,12 @@ static void endBlock() { outDoc->endDescTableData(); outDoc->endDescTable(); + outDoc->endParamList(); + } + else + { + outDoc->endDescList(); } - outDoc->endDescList(); currentListIndent.pop(); inParamBlock=inRetValBlock=inSeeBlock=inReturnBlock=inAuthorBlock= inVersionBlock=inSinceBlock=inDateBlock=inBugBlock=inNoteBlock=inWarningBlock= @@ -1037,7 +1041,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) } BEGIN(DocPar); } -[^\n]*{BN} { +[^\n]*{BN}+ { QCString title=QCString(yytext).stripWhiteSpace(); bool b = inBlock(); if (!title.isEmpty()) @@ -1059,7 +1063,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) } BEGIN(DocScan); } -{CMD}"warning"/{BN} { +{CMD}"warning"{BN}+ { endArgumentList(); if (!inWarningBlock) { @@ -1078,7 +1082,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) outDoc->writeDescItem(); } } -{CMD}"remark"[s]?/{BN} { +{CMD}"remark"[s]?{BN}+ { endArgumentList(); if (!inRemarkBlock) { @@ -1097,7 +1101,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) outDoc->writeDescItem(); } } -{CMD}"attention"[s]?/{BN} { +{CMD}"attention"{BN}+ { endArgumentList(); if (!inAttentionBlock) { @@ -1116,7 +1120,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) outDoc->writeDescItem(); } } -{CMD}"bug"[s]?/{BN} { +{CMD}"bug"[s]?{BN}+ { endArgumentList(); if (!inBugBlock) { @@ -1135,7 +1139,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) outDoc->writeDescItem(); } } -{CMD}"note"[s]?/{BN} { +{CMD}"note"[s]?{BN}+ { endArgumentList(); if (!inNoteBlock) { @@ -1154,7 +1158,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) outDoc->writeDescItem(); } } -{CMD}"pre"/{BN} { +{CMD}"pre"{BN}+ { endArgumentList(); if (!inPreBlock) { @@ -1173,7 +1177,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) outDoc->writeDescItem(); } } -{CMD}"post"/{BN} { +{CMD}"post"{BN}+ { endArgumentList(); if (!inPostBlock) { @@ -1192,7 +1196,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) outDoc->writeDescItem(); } } -{CMD}"invariant"/{BN} { +{CMD}"invariant"{BN}+ { endArgumentList(); if (!inInvarBlock) { @@ -1211,7 +1215,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) outDoc->writeDescItem(); } } -{CMD}"version"/{BN} { +{CMD}"version"{BN}+ { endArgumentList(); if (!inVersionBlock) { @@ -1230,7 +1234,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) outDoc->writeDescItem(); } } -{CMD}"since"/{BN} { +{CMD}"since"{BN}+ { endArgumentList(); if (!inSinceBlock) { @@ -1249,7 +1253,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) outDoc->writeDescItem(); } } -{CMD}"date"/{BN} { +{CMD}"date"{BN}+ { endArgumentList(); if (!inDateBlock) { @@ -1312,7 +1316,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) currentListIndent.pop(); } } -{CMD}"deprecated"/{BN} { +{CMD}"deprecated"{BN}+ { endArgumentList(); if (!inDeprecatedBlock) { @@ -1350,7 +1354,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) outDoc->endDescList(); currentListIndent.pop(); } -{CMD}"author"/{BN} { +{CMD}"author"{BN}+ { endArgumentList(); if (!inAuthorBlock) { @@ -1369,7 +1373,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) outDoc->docify(", "); } } -{CMD}("return"([s])?|"result")/{BN} { +{CMD}("return"([s])?|"result"){BN}+ { endArgumentList(); if (!inReturnBlock) { @@ -1384,7 +1388,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) outDoc->writeDescItem(); } } -{CMD}("sa"|"see")/{BN} { +{CMD}("sa"|"see"){BN}+ { endArgumentList(); if (!inSeeBlock) { @@ -1403,7 +1407,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) outDoc->docify(", "); } } -(({B}*"\n"){2,}{B}*)?{CMD}"param"/{BN} { +(({B}*"\n"){2,}{B}*)?{CMD}"param"{BN}+ { QCString t=yytext; if (t.contains('\n')>1 && insideItemList) { @@ -1415,7 +1419,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) if (inBlock()) endBlock(); inParamBlock=TRUE; currentListIndent.push("D"); - outDoc->startDescList(); + outDoc->startParamList(); outDoc->startBold(); scanString(theTranslator->trParameters()+": "); outDoc->endBold(); @@ -1429,7 +1433,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) } BEGIN(DocParam); } -(({B}*"\n"){2,}{B}*)?{CMD}"retval"/{BN} { +(({B}*"\n"){2,}{B}*)?{CMD}"retval"{BN}+ { QCString t=yytext; if (t.contains('\n')>1 && insideItemList) { @@ -1441,7 +1445,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) if (inBlock()) endBlock(); inRetValBlock=TRUE; currentListIndent.push("D"); - outDoc->startDescList(); + outDoc->startParamList(); outDoc->startBold(); scanString(theTranslator->trReturnValues()+": "); outDoc->endBold(); @@ -1455,7 +1459,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) } BEGIN(DocParam); } -(({B}*"\n"){2,}{B}*)?{CMD}("exception"|"throw")s?/{BN} { +(({B}*"\n"){2,}{B}*)?{CMD}("exception"|"throw")s?{BN}+ { QCString t=yytext; if (t.contains('\n')>1 && insideItemList) { @@ -1467,7 +1471,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) if (inBlock()) endBlock(); inExceptionBlock=TRUE; currentListIndent.push("D"); - outDoc->startDescList(); + outDoc->startParamList(); outDoc->startBold(); scanString(theTranslator->trExceptions()+": "); outDoc->endBold(); @@ -1482,10 +1486,10 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG}) BEGIN(DocException); } "\\capt".* -({DOCPARAM}{BN}*","{BN}*)*{DOCPARAM} { +({DOCPARAM}{BN}*","{BN}*)*{DOCPARAM}{BN}* { outDoc->startDescTableTitle(); outDoc->startEmphasis(); - outDoc->docify(substitute(yytext,"\"","")); + outDoc->docify(substitute(yytext,"\"","").stripWhiteSpace()); outDoc->endEmphasis(); outDoc->endDescTableTitle(); outDoc->startDescTableData(); diff --git a/src/dot.cpp b/src/dot.cpp index 5824794..7b3309c 100644 --- a/src/dot.cpp +++ b/src/dot.cpp @@ -602,7 +602,7 @@ void DotGfxHierarchyTable::writeGraph(QTextStream &out,const char *path) out << "m_label << "_map\">" << endl; convertMapFile(out,mapName); out << "" << endl; - thisDir.remove(dotName); + if (Config::dotCleanUp) thisDir.remove(dotName); thisDir.remove(mapName); } out << "" << endl; @@ -1187,7 +1187,7 @@ void DotClassGraph::writeGraph(QTextStream &out, "\\end{center}\n" "\\end{figure}\n"; } - thisDir.remove(baseName+".dot"); + if (Config::dotCleanUp) thisDir.remove(baseName+".dot"); QDir::setCurrent(oldDir); } @@ -1387,7 +1387,7 @@ void DotInclDepGraph::writeGraph(QTextStream &out, "\\end{figure}\n"; } - thisDir.remove(baseName+".dot"); + if (Config::dotCleanUp) thisDir.remove(baseName+".dot"); QDir::setCurrent(oldDir); } diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 9523342..4964bc0 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -6405,12 +6405,6 @@ void generateOutput() writeGraphicalClassHierarchy(*outputList); } - //if (Config::generateXML) - //{ - // msg("Generating XML output\n"); - // generateXML(); - //} - if (Doxygen::formulaList.count()>0 && Config::generateHtml) { msg("Generating bitmaps for formulas in HTML...\n"); @@ -6439,8 +6433,7 @@ void generateOutput() delete tag; } - - if (Config::generateHtml) removeDoxFont(Config::htmlOutputDir); - if (Config::generateRTF) removeDoxFont(Config::rtfOutputDir); + if (Config::generateHtml && Config::dotCleanUp) removeDoxFont(Config::htmlOutputDir); + if (Config::generateRTF && Config::dotCleanUp) removeDoxFont(Config::rtfOutputDir); } diff --git a/src/ftvhelp.cpp b/src/ftvhelp.cpp index 71a053b..5936894 100644 --- a/src/ftvhelp.cpp +++ b/src/ftvhelp.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include "ftvhelp.h" #include "config.h" @@ -302,7 +303,21 @@ static void generateFolderTreeViewData() { QTextStream t(&f); t << "" << endl; - t << "" << endl; + t << "" << endl; t << "" << endl; t << "" << endl; t << "