diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2010-06-03 09:24:48 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2010-06-03 09:24:48 (GMT) |
commit | a1528245b280f1068daad8cd850ea345a3f8b568 (patch) | |
tree | 060dc6ccdb347682a1d4b73ab3098d95599532f2 /src/doxygen.cpp | |
parent | a3b06c4fd310fdeda48a4730139cee09b5302072 (diff) | |
download | Doxygen-a1528245b280f1068daad8cd850ea345a3f8b568.zip Doxygen-a1528245b280f1068daad8cd850ea345a3f8b568.tar.gz Doxygen-a1528245b280f1068daad8cd850ea345a3f8b568.tar.bz2 |
Release-1.6.3-20100603
Diffstat (limited to 'src/doxygen.cpp')
-rw-r--r-- | src/doxygen.cpp | 78 |
1 files changed, 51 insertions, 27 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 2efc9ed..6a288ad 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -4968,16 +4968,19 @@ static bool findGlobalMember(EntryNav *rootNav, { QCString fullFuncDecl=decl; if (root->argList) fullFuncDecl+=argListToString(root->argList,TRUE); - warn(root->fileName,root->startLine, - "Warning: no matching file member found for \n%s",fullFuncDecl.data()); + QCString warnMsg = + QCString("Warning: no matching file member found for \n")+fullFuncDecl; if (mn->count()>0) { - warn_cont("Possible candidates:\n"); + warnMsg+="Possible candidates:\n"; for (mni.toFirst();(md=mni.current());++mni) { - warn_cont(" %s\n",md->declaration()); + warnMsg+=" "; + warnMsg+=md->declaration(); + warnMsg+='\n'; } } + warn(root->fileName,root->startLine,warnMsg); } } else // got docs for an undefined member! @@ -5638,10 +5641,9 @@ static void findMember(EntryNav *rootNav, } } - warn(root->fileName,root->startLine, - "Warning: no %smatching class member found for", - noMatchCount>1 ? "uniquely " : "" - ); + QCString warnMsg = "Warning: no "; + if (noMatchCount>1) warnMsg+="uniquely "; + warnMsg+="matching class member found for \n"; if (root->tArgLists) { @@ -5649,17 +5651,21 @@ static void findMember(EntryNav *rootNav, ArgumentList *al; for (;(al=alli.current());++alli) { - warn_cont(" template %s\n",tempArgListToString(al).data()); + warnMsg+=" template "; + warnMsg+=tempArgListToString(al); + warnMsg+='\n'; } } QCString fullFuncDecl=funcDecl.copy(); if (isFunc) fullFuncDecl+=argListToString(root->argList,TRUE); - warn_cont(" %s\n",fullFuncDecl.data()); + warnMsg+=" "; + warnMsg+=fullFuncDecl; + warnMsg+='\n'; if (candidates>0) { - warn_cont("Possible candidates:\n"); + warnMsg+="Possible candidates:\n"; for (mni.toFirst();(md=mni.current());++mni) { ClassDef *cd=md->getClassDef(); @@ -5668,21 +5674,33 @@ static void findMember(EntryNav *rootNav, LockingPtr<ArgumentList> templAl = md->templateArguments(); if (templAl!=0) { - warn_cont(" template %s\n",tempArgListToString(templAl.pointer()).data()); + warnMsg+=" template "; + warnMsg+=tempArgListToString(templAl.pointer()); + warnMsg+='\n'; } - warn_cont(" "); + warnMsg+=" "; if (md->typeString()) { - warn_cont("%s ",md->typeString()); + warnMsg+=md->typeString(); + warnMsg+=' '; } QCString qScope = cd->qualifiedNameWithTemplateParameters(); - if (!qScope.isEmpty()) warn_cont("%s::%s",qScope.data(),md->name().data()); - if (md->argsString()) warn_cont("%s",md->argsString()); - if (noMatchCount>1) warn_cont(" at line %d of file %s",md->getDefLine(),md->getDefFileName().data()); - warn_cont("\n"); + if (!qScope.isEmpty()) + warnMsg+=qScope+"::"+md->name(); + if (md->argsString()) + warnMsg+=md->argsString(); + if (noMatchCount>1) + { + QCString lineFile; + lineFile.sprintf(" at line %d of file ",md->getDefLine()); + warnMsg+=lineFile+md->getDefFileName(); + } + + warnMsg+='\n'; } } } + warn(root->fileName,root->startLine,warnMsg); } } else if (cd) // member specialization @@ -10419,15 +10437,6 @@ void generateOutput() //writeDirDependencyGraph(Config_getString("HTML_OUTPUT")); - if (Config_getBool("GENERATE_RTF")) - { - msg("Combining RTF output...\n"); - if (!RTFGenerator::preProcessFileInplace(Config_getString("RTF_OUTPUT"),"refman.rtf")) - { - err("An error occurred during post-processing the RTF files!\n"); - } - } - if (Doxygen::formulaList.count()>0 && Config_getBool("GENERATE_HTML")) { msg("Generating bitmaps for formulas in HTML...\n"); @@ -10484,10 +10493,12 @@ void generateOutput() msg("Running html help compiler...\n"); QString oldDir = QDir::currentDirPath(); QDir::setCurrent(Config_getString("HTML_OUTPUT")); + portable_sysTimerStart(); if (portable_system(Config_getString("HHC_LOCATION"), "index.hhp", FALSE)) { err("Error: failed to run html help compiler on index.hhp\n"); } + portable_sysTimerStop(); QDir::setCurrent(oldDir); } if ( Config_getBool("GENERATE_HTML") && @@ -10501,10 +10512,12 @@ void generateOutput() QCString const args = QCString().sprintf("%s -o \"%s\"", qhpFileName.data(), qchFileName.data()); QString const oldDir = QDir::currentDirPath(); QDir::setCurrent(Config_getString("HTML_OUTPUT")); + portable_sysTimerStart(); if (portable_system(Config_getString("QHG_LOCATION"), args.data(), FALSE)) { err("Error: failed to run qhelpgenerator on index.qhp\n"); } + portable_sysTimerStop(); QDir::setCurrent(oldDir); } @@ -10515,6 +10528,17 @@ void generateOutput() Doxygen::searchIndex->write(Config_getString("HTML_OUTPUT")+"/search/search.idx"); } + if (Config_getBool("GENERATE_RTF")) + { + msg("Combining RTF output...\n"); + if (!RTFGenerator::preProcessFileInplace(Config_getString("RTF_OUTPUT"),"refman.rtf")) + { + err("An error occurred during post-processing the RTF files!\n"); + } + } + + DotManager::instance()->run(); + if (Debug::isFlagSet(Debug::Time)) { msg("Total elapsed time: %.3f seconds\n(of which %.3f seconds waiting for external tools to finish)\n", |