diff options
120 files changed, 2906 insertions, 2655 deletions
diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt index bf2eda8..973d2d1 100644 --- a/addon/doxywizard/CMakeLists.txt +++ b/addon/doxywizard/CMakeLists.txt @@ -76,7 +76,7 @@ OUTPUT ${GENERATED_SRC_WIZARD}/configdoc.cpp ) set_source_files_properties(${GENERATED_SRC_WIZARD}/configdoc.cpp PROPERTIES GENERATED 1) -FLEX_TARGET(config_doxyw config_doxyw.l ${GENERATED_SRC_WIZARD}/config_doxyw.cpp COMPILE_FLAGS "$(LEX_FLAGS) -Pconfig_doxywYY") +FLEX_TARGET(config_doxyw config_doxyw.l ${GENERATED_SRC_WIZARD}/config_doxyw.cpp COMPILE_FLAGS "${LEX_FLAGS} -Pconfig_doxywYY") qt_wrap_cpp(doxywizard_MOC doxywizard.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6763cf5..af01804 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -36,6 +36,21 @@ file(GENERATE OUTPUT ${GENERATED_SRC}/version.cpp ) set_source_files_properties(${GENERATED_SRC}/version.cpp PROPERTIES GENERATED 1) +# configvalues.h +add_custom_command( + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h + DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py + OUTPUT ${GENERATED_SRC}/configvalues.h +) +set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) + +# configvalues.cpp +add_custom_command( + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maps ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.cpp + DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py + OUTPUT ${GENERATED_SRC}/configvalues.cpp +) +set_source_files_properties(${GENERATED_SRC}/configvalues.cpp PROPERTIES GENERATED 1) # configoptions.cpp add_custom_command( @@ -85,31 +100,32 @@ add_custom_command( set_source_files_properties(${GENERATED_SRC}/layout_default.xml.h PROPERTIES GENERATED 1) # Targets for flex/bison generated files -FLEX_TARGET(scanner scanner.l ${GENERATED_SRC}/scanner.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PscannerYY") -FLEX_TARGET(code code.l ${GENERATED_SRC}/code.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PcodeYY") -FLEX_TARGET(pyscanner pyscanner.l ${GENERATED_SRC}/pyscanner.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PpyscannerYY") -FLEX_TARGET(pycode pycode.l ${GENERATED_SRC}/pycode.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PpycodeYY") -FLEX_TARGET(fortranscanner fortranscanner.l ${GENERATED_SRC}/fortranscanner.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PfortranscannerYY -i") -FLEX_TARGET(fortrancode fortrancode.l ${GENERATED_SRC}/fortrancode.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PfortrancodeYY -i") -FLEX_TARGET(vhdlcode vhdlcode.l ${GENERATED_SRC}/vhdlcode.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PvhdlcodeYY -i") -FLEX_TARGET(tclscanner tclscanner.l ${GENERATED_SRC}/tclscanner.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PtclscannerYY -i") -FLEX_TARGET(pre pre.l ${GENERATED_SRC}/pre.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PpreYY") -FLEX_TARGET(declinfo declinfo.l ${GENERATED_SRC}/declinfo.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PdeclinfoYY") -FLEX_TARGET(defargs defargs.l ${GENERATED_SRC}/defargs.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PdefargsYY") -FLEX_TARGET(doctokenizer doctokenizer.l ${GENERATED_SRC}/doctokenizer.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PdoctokenizerYY") -FLEX_TARGET(commentcnv commentcnv.l ${GENERATED_SRC}/commentcnv.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PcommentcnvYY") -FLEX_TARGET(commentscan commentscan.l ${GENERATED_SRC}/commentscan.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PcommentscanYY") -FLEX_TARGET(constexp constexp.l ${GENERATED_SRC}/constexp.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PconstexpYY") -FLEX_TARGET(xmlcode xmlcode.l ${GENERATED_SRC}/xmlcode.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PxmlcodeYY") -FLEX_TARGET(config config.l ${GENERATED_SRC}/config.cpp COMPILE_FLAGS "$(LEX_FLAGS) -PconfigYY") - -BISON_TARGET(vhdlparser vhdlparser.y ${GENERATED_SRC}/vhdlparser.cpp COMPILE_FLAGS "$(YACC_FLAGS) -l -p vhdlscannerYY") -BISON_TARGET(constexp constexp.y ${GENERATED_SRC}/ce_parse.cpp COMPILE_FLAGS "$(YACC_FLAGS) -l -p constexpYY") +FLEX_TARGET(scanner scanner.l ${GENERATED_SRC}/scanner.cpp COMPILE_FLAGS "${LEX_FLAGS} -PscannerYY") +FLEX_TARGET(code code.l ${GENERATED_SRC}/code.cpp COMPILE_FLAGS "${LEX_FLAGS} -PcodeYY") +FLEX_TARGET(pyscanner pyscanner.l ${GENERATED_SRC}/pyscanner.cpp COMPILE_FLAGS "${LEX_FLAGS} -PpyscannerYY") +FLEX_TARGET(pycode pycode.l ${GENERATED_SRC}/pycode.cpp COMPILE_FLAGS "${LEX_FLAGS} -PpycodeYY") +FLEX_TARGET(fortranscanner fortranscanner.l ${GENERATED_SRC}/fortranscanner.cpp COMPILE_FLAGS "${LEX_FLAGS} -PfortranscannerYY -i") +FLEX_TARGET(fortrancode fortrancode.l ${GENERATED_SRC}/fortrancode.cpp COMPILE_FLAGS "${LEX_FLAGS} -PfortrancodeYY -i") +FLEX_TARGET(vhdlcode vhdlcode.l ${GENERATED_SRC}/vhdlcode.cpp COMPILE_FLAGS "${LEX_FLAGS} -PvhdlcodeYY -i") +FLEX_TARGET(tclscanner tclscanner.l ${GENERATED_SRC}/tclscanner.cpp COMPILE_FLAGS "${LEX_FLAGS} -PtclscannerYY -i") +FLEX_TARGET(pre pre.l ${GENERATED_SRC}/pre.cpp COMPILE_FLAGS "${LEX_FLAGS} -PpreYY") +FLEX_TARGET(declinfo declinfo.l ${GENERATED_SRC}/declinfo.cpp COMPILE_FLAGS "${LEX_FLAGS} -PdeclinfoYY") +FLEX_TARGET(defargs defargs.l ${GENERATED_SRC}/defargs.cpp COMPILE_FLAGS "${LEX_FLAGS} -PdefargsYY") +FLEX_TARGET(doctokenizer doctokenizer.l ${GENERATED_SRC}/doctokenizer.cpp COMPILE_FLAGS "${LEX_FLAGS} -PdoctokenizerYY") +FLEX_TARGET(commentcnv commentcnv.l ${GENERATED_SRC}/commentcnv.cpp COMPILE_FLAGS "${LEX_FLAGS} -PcommentcnvYY") +FLEX_TARGET(commentscan commentscan.l ${GENERATED_SRC}/commentscan.cpp COMPILE_FLAGS "${LEX_FLAGS} -PcommentscanYY") +FLEX_TARGET(constexp constexp.l ${GENERATED_SRC}/constexp.cpp COMPILE_FLAGS "${LEX_FLAGS} -PconstexpYY") +FLEX_TARGET(xmlcode xmlcode.l ${GENERATED_SRC}/xmlcode.cpp COMPILE_FLAGS "${LEX_FLAGS} -PxmlcodeYY") +FLEX_TARGET(configimpl configimpl.l ${GENERATED_SRC}/configimpl.cpp COMPILE_FLAGS "${LEX_FLAGS} -PconfigimplYY") + +BISON_TARGET(vhdlparser vhdlparser.y ${GENERATED_SRC}/vhdlparser.cpp COMPILE_FLAGS "${YACC_FLAGS} -l -p vhdlscannerYY") +BISON_TARGET(constexp constexp.y ${GENERATED_SRC}/ce_parse.cpp COMPILE_FLAGS "${YACC_FLAGS} -l -p constexpYY") add_library(doxycfg STATIC ${GENERATED_SRC}/lang_cfg.h - ${GENERATED_SRC}/config.cpp + ${GENERATED_SRC}/configimpl.cpp ${GENERATED_SRC}/configoptions.cpp + ${GENERATED_SRC}/configvalues.cpp portable.cpp portable_c.c ) @@ -121,6 +137,7 @@ add_library(_doxygen STATIC ${GENERATED_SRC}/layout_default.xml.h ${GENERATED_SRC}/version.cpp ${GENERATED_SRC}/ce_parse.h + ${GENERATED_SRC}/configvalues.h ${GENERATED_SRC}/resources.cpp # generated by flex/bison ${GENERATED_SRC}/scanner.cpp diff --git a/src/cite.cpp b/src/cite.cpp index 3125f35..d934d0a 100644 --- a/src/cite.cpp +++ b/src/cite.cpp @@ -43,18 +43,18 @@ void CiteDict::writeLatexBibliography(FTextStream &t) if (m_entries.isEmpty()) return; - QCString style = Config_getString("LATEX_BIB_STYLE"); + QCString style = Config_getString(LATEX_BIB_STYLE); if (style.isEmpty()) style="plain"; QCString unit; - if (Config_getBool("COMPACT_LATEX")) + if (Config_getBool(COMPACT_LATEX)) unit = "section"; else unit = "chapter"; t << "% Bibliography\n" "\\newpage\n" "\\phantomsection\n"; - bool pdfHyperlinks = Config_getBool("PDF_HYPERLINKS"); + bool pdfHyperlinks = Config_getBool(PDF_HYPERLINKS); if (!pdfHyperlinks) { t << "\\clearemptydoublepage\n"; @@ -62,7 +62,7 @@ void CiteDict::writeLatexBibliography(FTextStream &t) } t << "\\bibliographystyle{" << style << "}\n" "\\bibliography{"; - QStrList &citeDataList = Config_getList("CITE_BIB_FILES"); + QStrList &citeDataList = Config_getList(CITE_BIB_FILES); int i = 0; const char *bibdata = citeDataList.first(); while (bibdata) @@ -107,7 +107,7 @@ void CiteDict::clear() bool CiteDict::isEmpty() const { - QStrList &citeBibFiles = Config_getList("CITE_BIB_FILES"); + QStrList &citeBibFiles = Config_getList(CITE_BIB_FILES); return (citeBibFiles.count()==0 || m_entries.isEmpty()); } @@ -120,7 +120,7 @@ void CiteDict::generatePage() const // 1. generate file with markers and citations to OUTPUT_DIRECTORY QFile f; - QCString outputDir = Config_getString("OUTPUT_DIRECTORY"); + QCString outputDir = Config_getString(OUTPUT_DIRECTORY); QCString citeListFile = outputDir+"/citelist.doc"; f.setName(citeListFile); if (!f.open(IO_WriteOnly)) @@ -154,7 +154,7 @@ void CiteDict::generatePage() const // so bibtex can find them without path (bibtex doesn't support paths or // filenames with spaces!) // Strictly not required when only latex is generated - QStrList &citeDataList = Config_getList("CITE_BIB_FILES"); + QStrList &citeDataList = Config_getList(CITE_BIB_FILES); QCString bibOutputDir = outputDir+"/"+bibTmpDir; QCString bibOutputFiles = ""; QDir thisDir; @@ -251,11 +251,11 @@ void CiteDict::generatePage() const // 8. for latex we just copy the bib files to the output and let // latex do this work. - if (Config_getBool("GENERATE_LATEX")) + if (Config_getBool(GENERATE_LATEX)) { // copy bib files to the latex output dir - QStrList &citeDataList = Config_getList("CITE_BIB_FILES"); - QCString latexOutputDir = Config_getString("LATEX_OUTPUT")+"/"; + QStrList &citeDataList = Config_getList(CITE_BIB_FILES); + QCString latexOutputDir = Config_getString(LATEX_OUTPUT)+"/"; int i = 0; const char *bibdata = citeDataList.first(); while (bibdata) diff --git a/src/clangparser.cpp b/src/clangparser.cpp index 9913b12..67e754b 100644 --- a/src/clangparser.cpp +++ b/src/clangparser.cpp @@ -64,7 +64,7 @@ class ClangParser::Private static QCString detab(const QCString &s) { - static int tabSize = Config_getInt("TAB_SIZE"); + static int tabSize = Config_getInt(TAB_SIZE); GrowBuf out; int size = s.length(); const char *data = s.data(); @@ -157,9 +157,9 @@ void ClangParser::determineInputFilesInSameTu(QStrList &files) void ClangParser::start(const char *fileName,QStrList &filesInTranslationUnit) { - static bool clangAssistedParsing = Config_getBool("CLANG_ASSISTED_PARSING"); - static QStrList &includePath = Config_getList("INCLUDE_PATH"); - static QStrList clangOptions = Config_getList("CLANG_OPTIONS"); + static bool clangAssistedParsing = Config_getBool(CLANG_ASSISTED_PARSING); + static QStrList &includePath = Config_getList(INCLUDE_PATH); + static QStrList clangOptions = Config_getList(CLANG_OPTIONS); if (!clangAssistedParsing) return; //printf("ClangParser::start(%s)\n",fileName); p->fileName = fileName; @@ -230,7 +230,7 @@ void ClangParser::start(const char *fileName,QStrList &filesInTranslationUnit) // provide the input and and its dependencies as unsaved files so we can // pass the filtered versions argv[argc++]=strdup(fileName); - static bool filterSourceFiles = Config_getBool("FILTER_SOURCE_FILES"); + static bool filterSourceFiles = Config_getBool(FILTER_SOURCE_FILES); //printf("source %s ----------\n%s\n-------------\n\n", // fileName,p->source.data()); uint numUnsavedFiles = filesInTranslationUnit.count()+1; @@ -339,7 +339,7 @@ void ClangParser::switchToFile(const char *fileName) void ClangParser::finish() { - static bool clangAssistedParsing = Config_getBool("CLANG_ASSISTED_PARSING"); + static bool clangAssistedParsing = Config_getBool(CLANG_ASSISTED_PARSING); if (!clangAssistedParsing) return; if (p->tu) { @@ -381,7 +381,7 @@ QCString ClangParser::lookup(uint line,const char *symbol) //printf("ClangParser::lookup(%d,%s)\n",line,symbol); QCString result; if (symbol==0) return result; - static bool clangAssistedParsing = Config_getBool("CLANG_ASSISTED_PARSING"); + static bool clangAssistedParsing = Config_getBool(CLANG_ASSISTED_PARSING); if (!clangAssistedParsing) return result; int sl = strlen(symbol); @@ -615,7 +615,7 @@ static void writeMultiLineCodeLink(CodeOutputInterface &ol, Definition *d, const char *text) { - static bool sourceTooltips = Config_getBool("SOURCE_TOOLTIPS"); + static bool sourceTooltips = Config_getBool(SOURCE_TOOLTIPS); TooltipManager::instance()->addTooltip(d); QCString ref = d->getReference(); QCString file = d->getOutputFileBase(); diff --git a/src/classdef.cpp b/src/classdef.cpp index 88f9a70..a51c0bf 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -221,7 +221,7 @@ void ClassDefImpl::init(const char *defFileName, const char *name, constraintClassDict=0; memberGroupSDict = 0; innerClasses = 0; - subGrouping=Config_getBool("SUBGROUPING"); + subGrouping=Config_getBool(SUBGROUPING); templateInstances = 0; variableInstances = 0; templateMaster =0; @@ -232,7 +232,7 @@ void ClassDefImpl::init(const char *defFileName, const char *name, membersMerged = FALSE; categoryOf = 0; usedOnly = FALSE; - isSimple = Config_getBool("INLINE_SIMPLE_STRUCTS"); + isSimple = Config_getBool(INLINE_SIMPLE_STRUCTS); arrowOperator = 0; taggedInnerClasses = 0; tagLessRef = 0; @@ -311,9 +311,9 @@ QCString ClassDef::getMemberListFileName() const QCString ClassDef::displayName(bool includeScope) const { - //static bool optimizeOutputForJava = Config_getBool("OPTIMIZE_OUTPUT_JAVA"); + //static bool optimizeOutputForJava = Config_getBool(OPTIMIZE_OUTPUT_JAVA); SrcLangExt lang = getLanguage(); - //static bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); + //static bool vhdlOpt = Config_getBool(OPTIMIZE_OUTPUT_VHDL); QCString n; if (lang==SrcLangExt_VHDL) { @@ -374,7 +374,7 @@ void ClassDef::insertSubClass(ClassDef *cd,Protection p, Specifier s,const char *t) { //printf("*** insert sub class %s into %s\n",cd->name().data(),name().data()); - static bool extractPrivate = Config_getBool("EXTRACT_PRIVATE"); + static bool extractPrivate = Config_getBool(EXTRACT_PRIVATE); if (!extractPrivate && cd->protection()==Private) return; if (m_impl->inheritedBy==0) { @@ -682,7 +682,7 @@ void ClassDef::internalInsertMember(MemberDef *md, //::addClassMemberNameToIndex(md); if (addToAllList && - !(Config_getBool("HIDE_FRIEND_COMPOUNDS") && + !(Config_getBool(HIDE_FRIEND_COMPOUNDS) && md->isFriend() && (QCString(md->typeString())=="friend class" || QCString(md->typeString())=="friend struct" || @@ -718,7 +718,7 @@ void ClassDef::insertMember(MemberDef *md) // compute the anchors for all members void ClassDef::computeAnchors() { - //ClassDef *context = Config_getBool("INLINE_INHERITED_MEMB") ? this : 0; + //ClassDef *context = Config_getBool(INLINE_INHERITED_MEMB) ? this : 0; //const char *letters = "abcdefghijklmnopqrstuvwxyz0123456789"; QListIterator<MemberList> mli(m_impl->memberLists); MemberList *ml; @@ -958,7 +958,7 @@ void ClassDef::writeBriefDescription(OutputList &ol,bool exampleFlag) void ClassDef::writeDetailedDocumentationBody(OutputList &ol) { - static bool repeatBrief = Config_getBool("REPEAT_BRIEF"); + static bool repeatBrief = Config_getBool(REPEAT_BRIEF); ol.startTextBlock(); @@ -1006,8 +1006,8 @@ void ClassDef::writeDetailedDocumentationBody(OutputList &ol) bool ClassDef::hasDetailedDescription() const { - static bool repeatBrief = Config_getBool("REPEAT_BRIEF"); - static bool sourceBrowser = Config_getBool("SOURCE_BROWSER"); + static bool repeatBrief = Config_getBool(REPEAT_BRIEF); + static bool sourceBrowser = Config_getBool(SOURCE_BROWSER); return ((!briefDescription().isEmpty() && repeatBrief) || !documentation().isEmpty() || (sourceBrowser && getStartBodyLine()!=-1 && getBodyDef())); @@ -1103,7 +1103,7 @@ void ClassDef::showUsedFiles(OutputList &ol) ol.startItemListItem(); QCString path=fd->getPath(); - if (Config_getBool("FULL_PATH_NAMES")) + if (Config_getBool(FULL_PATH_NAMES)) { ol.docify(stripFromPath(path)); } @@ -1184,8 +1184,8 @@ void ClassDef::writeInheritanceGraph(OutputList &ol) const int count=countInheritanceNodes(); bool renderDiagram = FALSE; - if (Config_getBool("HAVE_DOT") && - (Config_getBool("CLASS_DIAGRAMS") || Config_getBool("CLASS_GRAPH"))) + if (Config_getBool(HAVE_DOT) && + (Config_getBool(CLASS_DIAGRAMS) || Config_getBool(CLASS_GRAPH))) // write class diagram using dot { DotClassGraph inheritanceGraph(this,DotNode::Inheritance); @@ -1200,7 +1200,7 @@ void ClassDef::writeInheritanceGraph(OutputList &ol) renderDiagram = TRUE; } } - else if (Config_getBool("CLASS_DIAGRAMS") && count>0) + else if (Config_getBool(CLASS_DIAGRAMS) && count>0) // write class diagram using build-in generator { ClassDiagram diagram(this); // create a diagram of this class. @@ -1305,7 +1305,7 @@ void ClassDef::writeInheritanceGraph(OutputList &ol) void ClassDef::writeCollaborationGraph(OutputList &ol) { - if (Config_getBool("HAVE_DOT") /*&& Config_getBool("COLLABORATION_GRAPH")*/) + if (Config_getBool(HAVE_DOT) /*&& Config_getBool(COLLABORATION_GRAPH)*/) { DotClassGraph usageImplGraph(this,DotNode::Collaboration); if (!usageImplGraph.isTrivial()) @@ -1340,7 +1340,7 @@ QCString ClassDef::includeStatement() const void ClassDef::writeIncludeFiles(OutputList &ol) { - if (m_impl->incInfo /*&& Config_getBool("SHOW_INCLUDE_FILES")*/) + if (m_impl->incInfo /*&& Config_getBool(SHOW_INCLUDE_FILES)*/) { QCString nm=m_impl->incInfo->includeName.isEmpty() ? (m_impl->incInfo->fileDef ? @@ -1389,7 +1389,7 @@ void ClassDef::writeAllMembersLink(OutputList &ol) { // write link to list of all members (HTML only) if (m_impl->allMemberNameInfoSDict && - !Config_getBool("OPTIMIZE_OUTPUT_FOR_C") + !Config_getBool(OPTIMIZE_OUTPUT_FOR_C) ) { ol.pushGeneratorState(); @@ -1448,7 +1448,7 @@ void ClassDef::writeInlineClasses(OutputList &ol) void ClassDef::startMemberDocumentation(OutputList &ol) { //printf("%s: ClassDef::startMemberDocumentation()\n",name().data()); - if (Config_getBool("SEPARATE_MEMBER_PAGES")) + if (Config_getBool(SEPARATE_MEMBER_PAGES)) { ol.disable(OutputGenerator::Html); Doxygen::suppressDocWarnings = TRUE; @@ -1458,7 +1458,7 @@ void ClassDef::startMemberDocumentation(OutputList &ol) void ClassDef::endMemberDocumentation(OutputList &ol) { //printf("%s: ClassDef::endMemberDocumentation()\n",name().data()); - if (Config_getBool("SEPARATE_MEMBER_PAGES")) + if (Config_getBool(SEPARATE_MEMBER_PAGES)) { ol.enable(OutputGenerator::Html); Doxygen::suppressDocWarnings = FALSE; @@ -1474,7 +1474,7 @@ void ClassDef::startMemberDeclarations(OutputList &ol) void ClassDef::endMemberDeclarations(OutputList &ol) { //printf("%s: ClassDef::endMemberDeclarations()\n",name().data()); - static bool inlineInheritedMembers = Config_getBool("INLINE_INHERITED_MEMB"); + static bool inlineInheritedMembers = Config_getBool(INLINE_INHERITED_MEMB); if (!inlineInheritedMembers && countAdditionalInheritedMembers()>0) { ol.startMemberHeader("inherited"); @@ -1493,7 +1493,7 @@ void ClassDef::writeAuthorSection(OutputList &ol) ol.startGroupHeader(); ol.parseText(theTranslator->trAuthor(TRUE,TRUE)); ol.endGroupHeader(); - ol.parseText(theTranslator->trGeneratedAutomatically(Config_getString("PROJECT_NAME"))); + ol.parseText(theTranslator->trGeneratedAutomatically(Config_getString(PROJECT_NAME))); ol.popGeneratorState(); } @@ -1523,7 +1523,7 @@ void ClassDef::writeSummaryLinks(OutputList &ol) } else if (lde->kind()==LayoutDocEntry::ClassAllMembersLink && m_impl->allMemberNameInfoSDict && - !Config_getBool("OPTIMIZE_OUTPUT_FOR_C") + !Config_getBool(OPTIMIZE_OUTPUT_FOR_C) ) { ol.writeSummaryLink(getMemberListFileName(),"all-members-list",theTranslator->trListOfAllMembers(),first); @@ -1593,7 +1593,7 @@ void ClassDef::writeTagFile(FTextStream &tagFile) ClassDef *cd=ibcd->classDef; if (cd && cd->isLinkable()) { - if (!Config_getString("GENERATE_TAGFILE").isEmpty()) + if (!Config_getString(GENERATE_TAGFILE).isEmpty()) { tagFile << " <base"; if (ibcd->prot==Protected) @@ -1793,9 +1793,9 @@ void ClassDef::writeMoreLink(OutputList &ol,const QCString &anchor) { // TODO: clean up this mess by moving it to // the output generators... - static bool pdfHyperlinks = Config_getBool("PDF_HYPERLINKS"); - static bool rtfHyperlinks = Config_getBool("RTF_HYPERLINKS"); - static bool usePDFLatex = Config_getBool("USE_PDFLATEX"); + static bool pdfHyperlinks = Config_getBool(PDF_HYPERLINKS); + static bool rtfHyperlinks = Config_getBool(RTF_HYPERLINKS); + static bool usePDFLatex = Config_getBool(USE_PDFLATEX); // HTML only ol.pushGeneratorState(); @@ -1834,9 +1834,9 @@ void ClassDef::writeMoreLink(OutputList &ol,const QCString &anchor) bool ClassDef::visibleInParentsDeclList() const { - static bool extractPrivate = Config_getBool("EXTRACT_PRIVATE"); - static bool hideUndocClasses = Config_getBool("HIDE_UNDOC_CLASSES"); - static bool extractLocalClasses = Config_getBool("EXTRACT_LOCAL_CLASSES"); + static bool extractPrivate = Config_getBool(EXTRACT_PRIVATE); + static bool hideUndocClasses = Config_getBool(HIDE_UNDOC_CLASSES); + static bool extractLocalClasses = Config_getBool(EXTRACT_LOCAL_CLASSES); bool linkable = isLinkable(); return (!isAnonymous() && !isExtension() && (protection()!=::Private || extractPrivate) && @@ -1846,8 +1846,8 @@ bool ClassDef::visibleInParentsDeclList() const void ClassDef::writeDeclarationLink(OutputList &ol,bool &found,const char *header,bool localNames) { - //static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); - //static bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); + //static bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); + //static bool vhdlOpt = Config_getBool(OPTIMIZE_OUTPUT_VHDL); SrcLangExt lang = getLanguage(); if (visibleInParentsDeclList()) { @@ -1906,7 +1906,7 @@ void ClassDef::writeDeclarationLink(OutputList &ol,bool &found,const char *heade ol.endMemberItem(); // add the brief description if available - if (!briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC")) + if (!briefDescription().isEmpty() && Config_getBool(BRIEF_MEMBER_DESC)) { DocRoot *rootNode = validatingParseDoc(briefFile(),briefLine(),this,0, briefDescription(),FALSE,FALSE,0,TRUE,FALSE); @@ -2102,7 +2102,7 @@ QCString ClassDef::title() const } else { - if (Config_getBool("HIDE_COMPOUND_REFERENCE")) + if (Config_getBool(HIDE_COMPOUND_REFERENCE)) { pageTitle = displayName(); } @@ -2119,9 +2119,9 @@ QCString ClassDef::title() const // write all documentation for this class void ClassDef::writeDocumentation(OutputList &ol) { - static bool generateTreeView = Config_getBool("GENERATE_TREEVIEW"); - //static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); - //static bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); + static bool generateTreeView = Config_getBool(GENERATE_TREEVIEW); + //static bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); + //static bool vhdlOpt = Config_getBool(OPTIMIZE_OUTPUT_VHDL); QCString pageTitle = title(); startFile(ol,getOutputFileBase(),name(),pageTitle,HLI_ClassVisible,!generateTreeView); @@ -2143,7 +2143,7 @@ void ClassDef::writeDocumentation(OutputList &ol) endFileWithNavPath(this,ol); - if (Config_getBool("SEPARATE_MEMBER_PAGES")) + if (Config_getBool(SEPARATE_MEMBER_PAGES)) { writeMemberPages(ol); } @@ -2174,7 +2174,7 @@ void ClassDef::writeMemberPages(OutputList &ol) void ClassDef::writeQuickMemberLinks(OutputList &ol,MemberDef *currentMd) const { - static bool createSubDirs=Config_getBool("CREATE_SUBDIRS"); + static bool createSubDirs=Config_getBool(CREATE_SUBDIRS); ol.writeString(" <div class=\"navtab\">\n"); ol.writeString(" <table>\n"); @@ -2249,9 +2249,9 @@ void ClassDef::writeDocumentationForInnerClasses(OutputList &ol) // write the list of all (inherited) members for this class void ClassDef::writeMemberList(OutputList &ol) { - static bool cOpt = Config_getBool("OPTIMIZE_OUTPUT_FOR_C"); - //static bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); - static bool generateTreeView = Config_getBool("GENERATE_TREEVIEW"); + static bool cOpt = Config_getBool(OPTIMIZE_OUTPUT_FOR_C); + //static bool vhdlOpt = Config_getBool(OPTIMIZE_OUTPUT_VHDL); + static bool generateTreeView = Config_getBool(GENERATE_TREEVIEW); if (m_impl->allMemberNameInfoSDict==0 || cOpt) return; // only for HTML ol.pushGeneratorState(); @@ -2354,7 +2354,7 @@ void ClassDef::writeMemberList(OutputList &ol) memberWritten=TRUE; } else if (!cd->isArtificial() && - !Config_getBool("HIDE_UNDOC_MEMBERS") && + !Config_getBool(HIDE_UNDOC_MEMBERS) && (protectionLevelVisible(md->protection()) || md->isFriend()) ) // no documentation, // generate link to the class instead. @@ -2426,7 +2426,7 @@ void ClassDef::writeMemberList(OutputList &ol) if ( (prot!=Public || (virt!=Normal && getLanguage()!=SrcLangExt_ObjC) || md->isFriend() || md->isRelated() || md->isExplicit() || - md->isMutable() || (md->isInline() && Config_getBool("INLINE_INFO")) || + md->isMutable() || (md->isInline() && Config_getBool(INLINE_INFO)) || md->isSignal() || md->isSlot() || (getLanguage()==SrcLangExt_IDL && (md->isOptional() || md->isAttribute() || md->isUNOProperty())) || @@ -2444,7 +2444,7 @@ void ClassDef::writeMemberList(OutputList &ol) else if (md->isRelated()) sl.append("related"); else { - if (Config_getBool("INLINE_INFO") && md->isInline()) + if (Config_getBool(INLINE_INFO) && md->isInline()) sl.append("inline"); if (md->isExplicit()) sl.append("explicit"); if (md->isMutable()) sl.append("mutable"); @@ -2529,7 +2529,7 @@ bool ClassDef::hasExamples() const void ClassDef::addTypeConstraint(const QCString &typeConstraint,const QCString &type) { //printf("addTypeContraint(%s,%s)\n",type.data(),typeConstraint.data()); - static bool hideUndocRelation = Config_getBool("HIDE_UNDOC_RELATIONS"); + static bool hideUndocRelation = Config_getBool(HIDE_UNDOC_RELATIONS); if (typeConstraint.isEmpty() || type.isEmpty()) return; ClassDef *cd = getResolvedClass(this,getFileDef(),typeConstraint); if (cd==0 && !hideUndocRelation) @@ -2706,9 +2706,9 @@ void ClassDef::writeDeclaration(OutputList &ol,MemberDef *md,bool inGroup, /*! a link to this class is possible within this project */ bool ClassDef::isLinkableInProject() const { - static bool extractLocal = Config_getBool("EXTRACT_LOCAL_CLASSES"); - static bool extractStatic = Config_getBool("EXTRACT_STATIC"); - static bool hideUndoc = Config_getBool("HIDE_UNDOC_CLASSES"); + static bool extractLocal = Config_getBool(EXTRACT_LOCAL_CLASSES); + static bool extractStatic = Config_getBool(EXTRACT_STATIC); + static bool hideUndoc = Config_getBool(HIDE_UNDOC_CLASSES); if (m_impl->templateMaster) { return m_impl->templateMaster->isLinkableInProject(); @@ -2742,9 +2742,9 @@ bool ClassDef::isLinkable() const /*! the class is visible in a class diagram, or class hierarchy */ bool ClassDef::isVisibleInHierarchy() { - static bool allExternals = Config_getBool("ALLEXTERNALS"); - static bool hideUndocClasses = Config_getBool("HIDE_UNDOC_CLASSES"); - static bool extractStatic = Config_getBool("EXTRACT_STATIC"); + static bool allExternals = Config_getBool(ALLEXTERNALS); + static bool hideUndocClasses = Config_getBool(HIDE_UNDOC_CLASSES); + static bool extractStatic = Config_getBool(EXTRACT_STATIC); return // show all classes or a subclass is visible (allExternals || hasNonReferenceSuperClass()) && @@ -2845,15 +2845,15 @@ void ClassDef::mergeMembers() { if (m_impl->membersMerged) return; - //static bool optimizeOutputForJava = Config_getBool("OPTIMIZE_OUTPUT_JAVA"); - //static bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); + //static bool optimizeOutputForJava = Config_getBool(OPTIMIZE_OUTPUT_JAVA); + //static bool vhdlOpt = Config_getBool(OPTIMIZE_OUTPUT_VHDL); SrcLangExt lang = getLanguage(); QCString sep=getLanguageSpecificSeparator(lang,TRUE); int sepLen = sep.length(); m_impl->membersMerged=TRUE; //printf(" mergeMembers for %s\n",name().data()); - bool inlineInheritedMembers = Config_getBool("INLINE_INHERITED_MEMB" ); + bool inlineInheritedMembers = Config_getBool(INLINE_INHERITED_MEMB); if (baseClasses()) { //printf(" => has base classes!\n"); @@ -3094,7 +3094,7 @@ void ClassDef::mergeMembers() */ void ClassDef::mergeCategory(ClassDef *category) { - static bool extractLocalMethods = Config_getBool("EXTRACT_LOCAL_METHODS"); + static bool extractLocalMethods = Config_getBool(EXTRACT_LOCAL_METHODS); bool makePrivate = category->isLocal(); // in case extract local methods is not enabled we don't add the methods // of the category in case it is defined in the .m file. @@ -3233,8 +3233,8 @@ void ClassDef::mergeCategory(ClassDef *category) void ClassDef::addUsedClass(ClassDef *cd,const char *accessName, Protection prot) { - static bool extractPrivate = Config_getBool("EXTRACT_PRIVATE"); - static bool umlLook = Config_getBool("UML_LOOK"); + static bool extractPrivate = Config_getBool(EXTRACT_PRIVATE); + static bool umlLook = Config_getBool(UML_LOOK); if (prot==Private && !extractPrivate) return; //printf("%s::addUsedClass(%s,%s)\n",name().data(),cd->name().data(),accessName); if (m_impl->usesImplClassDict==0) @@ -3267,8 +3267,8 @@ void ClassDef::addUsedClass(ClassDef *cd,const char *accessName, void ClassDef::addUsedByClass(ClassDef *cd,const char *accessName, Protection prot) { - static bool extractPrivate = Config_getBool("EXTRACT_PRIVATE"); - static bool umlLook = Config_getBool("UML_LOOK"); + static bool extractPrivate = Config_getBool(EXTRACT_PRIVATE); + static bool umlLook = Config_getBool(UML_LOOK); if (prot==Private && !extractPrivate) return; //printf("%s::addUsedByClass(%s,%s)\n",name().data(),cd->name().data(),accessName); if (m_impl->usedByImplClassDict==0) @@ -3532,8 +3532,8 @@ QCString ClassDef::compoundTypeString() const QCString ClassDef::getOutputFileBase() const { - static bool inlineGroupedClasses = Config_getBool("INLINE_GROUPED_CLASSES"); - static bool inlineSimpleClasses = Config_getBool("INLINE_SIMPLE_STRUCTS"); + static bool inlineGroupedClasses = Config_getBool(INLINE_GROUPED_CLASSES); + static bool inlineSimpleClasses = Config_getBool(INLINE_SIMPLE_STRUCTS); if (!Doxygen::generatingXmlOutput) { Definition *scope=0; @@ -3855,8 +3855,8 @@ void ClassDef::getTemplateParameterLists(QList<ArgumentList> &lists) const QCString ClassDef::qualifiedNameWithTemplateParameters( QList<ArgumentList> *actualParams,int *actualParamIndex) const { - //static bool optimizeOutputJava = Config_getBool("OPTIMIZE_OUTPUT_JAVA"); - static bool hideScopeNames = Config_getBool("HIDE_SCOPE_NAMES"); + //static bool optimizeOutputJava = Config_getBool(OPTIMIZE_OUTPUT_JAVA); + static bool hideScopeNames = Config_getBool(HIDE_SCOPE_NAMES); //printf("qualifiedNameWithTemplateParameters() localName=%s\n",localName().data()); QCString scName; Definition *d=getOuterScope(); @@ -4034,8 +4034,8 @@ MemberList *ClassDef::getMemberList(MemberListType lt) void ClassDef::addMemberToList(MemberListType lt,MemberDef *md,bool isBrief) { - static bool sortBriefDocs = Config_getBool("SORT_BRIEF_DOCS"); - static bool sortMemberDocs = Config_getBool("SORT_MEMBER_DOCS"); + static bool sortBriefDocs = Config_getBool(SORT_BRIEF_DOCS); + static bool sortMemberDocs = Config_getBool(SORT_MEMBER_DOCS); MemberList *ml = createMemberList(lt); ml->setNeedsSorting((isBrief && sortBriefDocs) || (!isBrief && sortMemberDocs)); ml->append(md); @@ -4090,7 +4090,7 @@ int ClassDef::countMemberDeclarations(MemberListType lt,ClassDef *inheritedFrom, if (lt2!=1) count+=mg->countGroupedInheritedMembers((MemberListType)lt2); } } - static bool inlineInheritedMembers = Config_getBool("INLINE_INHERITED_MEMB"); + static bool inlineInheritedMembers = Config_getBool(INLINE_INHERITED_MEMB); if (!inlineInheritedMembers) // show inherited members as separate lists { count+=countInheritedDecMembers(lt,inheritedFrom,invert,showAlways,visitedClasses); @@ -4324,7 +4324,7 @@ void ClassDef::writeMemberDeclarations(OutputList &ol,MemberListType lt,const QC //printf(" writeDeclaration type=%d count=%d\n",lt2,ml2->numDecMembers()); ml2->writeDeclarations(ol,this,0,0,0,tt,st,FALSE,showInline,inheritedFrom,lt); } - static bool inlineInheritedMembers = Config_getBool("INLINE_INHERITED_MEMB"); + static bool inlineInheritedMembers = Config_getBool(INLINE_INHERITED_MEMB); if (!inlineInheritedMembers) // show inherited members as separate lists { QPtrDict<void> visited(17); @@ -4629,8 +4629,8 @@ QCString ClassDef::anchor() const bool ClassDef::isEmbeddedInOuterScope() const { - static bool inlineGroupedClasses = Config_getBool("INLINE_GROUPED_CLASSES"); - static bool inlineSimpleClasses = Config_getBool("INLINE_SIMPLE_STRUCTS"); + static bool inlineGroupedClasses = Config_getBool(INLINE_GROUPED_CLASSES); + static bool inlineSimpleClasses = Config_getBool(INLINE_SIMPLE_STRUCTS); Definition *container = getOuterScope(); diff --git a/src/classlist.cpp b/src/classlist.cpp index 81b7d26..c752fd3 100644 --- a/src/classlist.cpp +++ b/src/classlist.cpp @@ -36,7 +36,7 @@ ClassList::~ClassList() static int compItems(const ClassDef *c1,const ClassDef *c2) { - static bool b = Config_getBool("SORT_BY_SCOPE_NAME"); + static bool b = Config_getBool(SORT_BY_SCOPE_NAME); if (b) { return qstricmp(c1->name(), c2->name()); @@ -64,8 +64,8 @@ ClassListIterator::ClassListIterator(const ClassList &cllist) : bool ClassSDict::declVisible(const ClassDef::CompoundType *filter) const { - static bool hideUndocClasses = Config_getBool("HIDE_UNDOC_CLASSES"); - static bool extractLocalClasses = Config_getBool("EXTRACT_LOCAL_CLASSES"); + static bool hideUndocClasses = Config_getBool(HIDE_UNDOC_CLASSES); + static bool extractLocalClasses = Config_getBool(EXTRACT_LOCAL_CLASSES); if (count()>0) { ClassSDict::Iterator sdi(*this); @@ -94,7 +94,7 @@ bool ClassSDict::declVisible(const ClassDef::CompoundType *filter) const void ClassSDict::writeDeclaration(OutputList &ol,const ClassDef::CompoundType *filter, const char *header,bool localNames) { - static bool extractPrivate = Config_getBool("EXTRACT_PRIVATE"); + static bool extractPrivate = Config_getBool(EXTRACT_PRIVATE); if (count()>0) { ClassSDict::Iterator sdi(*this); @@ -118,10 +118,10 @@ void ClassSDict::writeDeclaration(OutputList &ol,const ClassDef::CompoundType *f void ClassSDict::writeDocumentation(OutputList &ol,Definition * container) { - static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); + static bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); - static bool inlineGroupedClasses = Config_getBool("INLINE_GROUPED_CLASSES"); - static bool inlineSimpleClasses = Config_getBool("INLINE_SIMPLE_STRUCTS"); + static bool inlineGroupedClasses = Config_getBool(INLINE_GROUPED_CLASSES); + static bool inlineSimpleClasses = Config_getBool(INLINE_SIMPLE_STRUCTS); if (!inlineGroupedClasses && !inlineSimpleClasses) return; if (count()>0) @@ -600,7 +600,7 @@ static void writeMultiLineCodeLink(CodeOutputInterface &ol, Definition *d, const char *text) { - static bool sourceTooltips = Config_getBool("SOURCE_TOOLTIPS"); + static bool sourceTooltips = Config_getBool(SOURCE_TOOLTIPS); TooltipManager::instance()->addTooltip(d); QCString ref = d->getReference(); QCString file = d->getOutputFileBase(); @@ -3274,7 +3274,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" } <*>\n({B}*"//"[!/][^\n]*\n)+ { // remove special one-line comment if (YY_START==SkipCPP) REJECT; - if (Config_getBool("STRIP_CODE_COMMENTS")) + if (Config_getBool(STRIP_CODE_COMMENTS)) { g_yyLineNr+=((QCString)yytext).contains('\n'); nextCodeLine(); @@ -3297,7 +3297,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" BEGIN( g_lastSkipCppContext ) ; } <*>\n{B}*"//@"[{}].*\n { // remove one-line group marker - if (Config_getBool("STRIP_CODE_COMMENTS")) + if (Config_getBool(STRIP_CODE_COMMENTS)) { g_yyLineNr+=2; nextCodeLine(); @@ -3315,7 +3315,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" } } <*>\n{B}*"/*@"[{}] { // remove one-line group marker - if (Config_getBool("STRIP_CODE_COMMENTS")) + if (Config_getBool(STRIP_CODE_COMMENTS)) { g_lastSpecialCContext = YY_START; g_yyLineNr++; @@ -3334,7 +3334,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" } } <*>^{B}*"//@"[{}].*\n { // remove one-line group marker - if (Config_getBool("STRIP_CODE_COMMENTS")) + if (Config_getBool(STRIP_CODE_COMMENTS)) { g_yyLineNr++; nextCodeLine(); @@ -3347,7 +3347,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" } } <*>^{B}*"/*@"[{}] { // remove multi-line group marker - if (Config_getBool("STRIP_CODE_COMMENTS")) + if (Config_getBool(STRIP_CODE_COMMENTS)) { g_lastSpecialCContext = YY_START; BEGIN(RemoveSpecialCComment); @@ -3365,7 +3365,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" } } <*>^{B}*"//"[!/][^\n]*\n { // remove special one-line comment - if (Config_getBool("STRIP_CODE_COMMENTS")) + if (Config_getBool(STRIP_CODE_COMMENTS)) { g_yyLineNr++; //nextCodeLine(); @@ -3379,7 +3379,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" } <*>"//"[!/][^\n]*\n { // strip special one-line comment if (YY_START==SkipComment || YY_START==SkipString) REJECT; - if (Config_getBool("STRIP_CODE_COMMENTS")) + if (Config_getBool(STRIP_CODE_COMMENTS)) { char c[2]; c[0]='\n'; c[1]=0; codifyLines(c); @@ -3398,7 +3398,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" g_forceTagReference = g_forceTagReference.mid(s+1,e-s-1); } <*>\n{B}*"/*"[!*]/[^/*] { - if (Config_getBool("STRIP_CODE_COMMENTS")) + if (Config_getBool(STRIP_CODE_COMMENTS)) { g_lastSpecialCContext = YY_START; g_yyLineNr++; @@ -3417,7 +3417,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" } } <*>^{B}*"/*"[!*]/[^/*] { // special C comment block at a new line - if (Config_getBool("STRIP_CODE_COMMENTS")) + if (Config_getBool(STRIP_CODE_COMMENTS)) { g_lastSpecialCContext = YY_START; BEGIN(RemoveSpecialCComment); @@ -3436,7 +3436,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" } <*>"/*"[!*]/[^/*] { // special C comment block half way a line if (YY_START==SkipString) REJECT; - if (Config_getBool("STRIP_CODE_COMMENTS")) + if (Config_getBool(STRIP_CODE_COMMENTS)) { g_lastSpecialCContext = YY_START; BEGIN(RemoveSpecialCComment); @@ -3455,7 +3455,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" } <*>"/*"("!"?)"*/" { if (YY_START==SkipString) REJECT; - if (!Config_getBool("STRIP_CODE_COMMENTS")) + if (!Config_getBool(STRIP_CODE_COMMENTS)) { startFontClass("comment"); g_code->codify(yytext); diff --git a/src/commentcnv.l b/src/commentcnv.l index f65c073..5457738 100644 --- a/src/commentcnv.l +++ b/src/commentcnv.l @@ -134,7 +134,7 @@ static void replaceCommentMarker(const char *s,int len) static inline int computeIndent(const char *s) { int col=0; - static int tabSize=Config_getInt("TAB_SIZE"); + static int tabSize=Config_getInt(TAB_SIZE); const char *p=s; char c; while ((c=*p++)) @@ -164,7 +164,7 @@ static inline void copyToOutput(const char *s,int len) else if (len>0) { ADDARRAY(s,len); - static int tabSize=Config_getInt("TAB_SIZE"); + static int tabSize=Config_getInt(TAB_SIZE); for (i=0;i<len;i++) { switch (s[i]) @@ -983,7 +983,7 @@ void convertCppComments(BufStr *inBuf,BufStr *outBuf,const char *fileName) g_outBuf = outBuf; g_inBufPos = 0; g_col = 0; - g_mlBrief = Config_getBool("MULTILINE_CPP_IS_BRIEF"); + g_mlBrief = Config_getBool(MULTILINE_CPP_IS_BRIEF); g_skip = FALSE; g_fileName = fileName; g_lang = getLanguageFromFileName(fileName); diff --git a/src/commentscan.l b/src/commentscan.l index ffed075..98f2093 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -1153,7 +1153,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$" <Comment>{B}*{CMD}"~"[a-z_A-Z-]* { // language switch command QCString langId = QString(yytext).stripWhiteSpace().data()+2; if (!langId.isEmpty() && - qstricmp(Config_getEnum("OUTPUT_LANGUAGE"),langId)!=0) + qstricmp(Config_getEnum(OUTPUT_LANGUAGE),langId)!=0) { // enable language specific section BEGIN(SkipLang); } @@ -2176,7 +2176,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$" <SkipLang>[\\@]"~"[a-zA-Z-]* { /* language switch */ QCString langId = &yytext[2]; if (langId.isEmpty() || - qstricmp(Config_getEnum("OUTPUT_LANGUAGE"),langId)==0) + qstricmp(Config_getEnum(OUTPUT_LANGUAGE),langId)==0) { // enable language specific section BEGIN(Comment); } @@ -2722,7 +2722,7 @@ static bool handleHideCallergraph(const QCString &) static bool handleInternal(const QCString &) { - if (!Config_getBool("INTERNAL_DOCS")) + if (!Config_getBool(INTERNAL_DOCS)) { // make sure some whitespace before a \internal command // is not treated as "documentation" diff --git a/src/condparser.cpp b/src/condparser.cpp index b3bea3a..69f8d29 100644 --- a/src/condparser.cpp +++ b/src/condparser.cpp @@ -303,7 +303,7 @@ bool CondParser::evalOperator(int opId, bool lhs, bool rhs) */ bool CondParser::evalVariable(const char *varName) { - if (Config_getList("ENABLED_SECTIONS").find(varName)==-1) return FALSE; + if (Config_getList(ENABLED_SECTIONS).find(varName)==-1) return FALSE; return TRUE; } diff --git a/src/config.h b/src/config.h index 344e007..e86e950 100644 --- a/src/config.h +++ b/src/config.h @@ -1,13 +1,10 @@ /****************************************************************************** * - * - * - * * Copyright (C) 1997-2015 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its - * documentation under the terms of the GNU General Public License is hereby - * granted. No representations are made about the suitability of this software + * documentation under the terms of the GNU General Public License is hereby + * granted. No representations are made about the suitability of this software * for any purpose. It is provided "as is" without express or implied warranty. * See the GNU General Public License for more details. * @@ -19,558 +16,58 @@ #ifndef CONFIG_H #define CONFIG_H -#include <qstrlist.h> -#include <qdict.h> -#include <qlist.h> -#include <qregexp.h> -#include "ftextstream.h" - - -/** Abstract base class for any configuration option. - */ -class ConfigOption -{ - friend class Config; - - public: - - /*! The type of option */ - enum OptionType - { - O_Info, //<! A section header - O_List, //<! A list of items - O_Enum, //<! A fixed set of items - O_String, //<! A single item - O_Int, //<! An integer value - O_Bool, //<! A boolean value - O_Obsolete, //<! An obsolete option - O_Disabled //<! Disabled compile time option - }; - enum - { - /*! Maximum length of an option in the config file. Used for - * alignment purposes. - */ - MAX_OPTION_LENGTH = 23 - }; - ConfigOption(OptionType t) : m_kind(t) - { - m_spaces.fill(' ',40); - } - virtual ~ConfigOption() - { - } - - /*! returns the kind of option this is. */ - OptionType kind() const { return m_kind; } - QCString name() const { return m_name; } - QCString docs() const { return m_doc; } - - QCString dependsOn() const { return m_dependency; } - void addDependency(const char *dep) { m_dependency = dep; } - void setEncoding(const QCString &e) { m_encoding = e; } - void setUserComment(const QCString &u) { m_userComment += u; } - - protected: - virtual void writeTemplate(FTextStream &t,bool sl,bool upd) = 0; - virtual void convertStrToVal() {} - virtual void substEnvVars() = 0; - virtual void init() {} - - void writeBoolValue(FTextStream &t,bool v); - void writeIntValue(FTextStream &t,int i); - void writeStringValue(FTextStream &t,QCString &s); - void writeStringList(FTextStream &t,QStrList &l); - - QCString m_spaces; - QCString m_name; - QCString m_doc; - QCString m_dependency; - QCString m_encoding; - QCString m_userComment; - OptionType m_kind; -}; - -/** Section marker for grouping the configuration options. - */ -class ConfigInfo : public ConfigOption -{ - public: - ConfigInfo(const char *name,const char *doc) - : ConfigOption(O_Info) - { - m_name = name; - m_doc = doc; - } - void writeTemplate(FTextStream &t, bool sl,bool); - void substEnvVars() {} -}; - -/** Class respresenting a list type option. - */ -class ConfigList : public ConfigOption -{ - public: - enum WidgetType { String, File, Dir, FileAndDir }; - ConfigList(const char *name,const char *doc) - : ConfigOption(O_List) - { - m_name = name; - m_doc = doc; - m_widgetType = String; - } - void addValue(const char *v) { m_value.append(v); } - void setWidgetType(WidgetType w) { m_widgetType = w; } - WidgetType widgetType() const { return m_widgetType; } - QStrList *valueRef() { return &m_value; } - void writeTemplate(FTextStream &t,bool sl,bool); - void substEnvVars(); - void init() { m_value.clear(); } - private: - QStrList m_value; - WidgetType m_widgetType; -}; - -/** Class representing an enum type option. - */ -class ConfigEnum : public ConfigOption -{ - public: - ConfigEnum(const char *name,const char *doc,const char *defVal) - : ConfigOption(O_Enum) - { - m_name = name; - m_doc = doc; - m_value = defVal; - m_defValue = defVal; - } - void addValue(const char *v) { m_valueRange.append(v); } - QStrListIterator iterator() - { - return QStrListIterator(m_valueRange); - } - QCString *valueRef() { return &m_value; } - void substEnvVars(); - void writeTemplate(FTextStream &t,bool sl,bool); - void init() { m_value = m_defValue.copy(); } - - private: - QStrList m_valueRange; - QCString m_value; - QCString m_defValue; -}; - -/** Class representing a string type option. - */ -class ConfigString : public ConfigOption -{ - public: - enum WidgetType { String, File, Dir, Image }; - ConfigString(const char *name,const char *doc) - : ConfigOption(O_String) - { - m_name = name; - m_doc = doc; - m_widgetType = String; - } - ~ConfigString() - { - } - void setWidgetType(WidgetType w) { m_widgetType = w; } - WidgetType widgetType() const { return m_widgetType; } - void setDefaultValue(const char *v) { m_defValue = v; } - QCString *valueRef() { return &m_value; } - void writeTemplate(FTextStream &t,bool sl,bool); - void substEnvVars(); - void init() { m_value = m_defValue.copy(); } - - private: - QCString m_value; - QCString m_defValue; - WidgetType m_widgetType; -}; - -/** Class representing an integer type option. - */ -class ConfigInt : public ConfigOption -{ - public: - ConfigInt(const char *name,const char *doc,int minVal,int maxVal,int defVal) - : ConfigOption(O_Int) - { - m_name = name; - m_doc = doc; - m_value = defVal; - m_defValue = defVal; - m_minVal = minVal; - m_maxVal = maxVal; - } - QCString *valueStringRef() { return &m_valueString; } - int *valueRef() { return &m_value; } - int minVal() const { return m_minVal; } - int maxVal() const { return m_maxVal; } - void convertStrToVal(); - void substEnvVars(); - void writeTemplate(FTextStream &t,bool sl,bool upd); - void init() { m_value = m_defValue; } - private: - int m_value; - int m_defValue; - int m_minVal; - int m_maxVal; - QCString m_valueString; -}; - -/** Class representing a Boolean type option. - */ -class ConfigBool : public ConfigOption -{ - public: - ConfigBool(const char *name,const char *doc,bool defVal) - : ConfigOption(O_Bool) - { - m_name = name; - m_doc = doc; - m_value = defVal; - m_defValue = defVal; - } - QCString *valueStringRef() { return &m_valueString; } - bool *valueRef() { return &m_value; } - void convertStrToVal(); - void substEnvVars(); - void setValueString(const QCString &v) { m_valueString = v; } - void writeTemplate(FTextStream &t,bool sl,bool upd); - void init() { m_value = m_defValue; } - private: - bool m_value; - bool m_defValue; - QCString m_valueString; -}; - -/** Section marker for obsolete options - */ -class ConfigObsolete : public ConfigOption -{ - public: - ConfigObsolete(const char *name) : ConfigOption(O_Obsolete) - { m_name = name; } - void writeTemplate(FTextStream &,bool,bool); - void substEnvVars() {} -}; - -/** Section marker for compile time optional options - */ -class ConfigDisabled : public ConfigOption -{ - public: - ConfigDisabled(const char *name) : ConfigOption(O_Disabled) - { m_name = name; } - void writeTemplate(FTextStream &,bool,bool); - void substEnvVars() {} -}; - - -// some convenience macros for access the config options -#define Config_getString(val) Config::instance()->getString(__FILE__,__LINE__,val) -#define Config_getInt(val) Config::instance()->getInt(__FILE__,__LINE__,val) -#define Config_getList(val) Config::instance()->getList(__FILE__,__LINE__,val) -#define Config_getEnum(val) Config::instance()->getEnum(__FILE__,__LINE__,val) -#define Config_getBool(val) Config::instance()->getBool(__FILE__,__LINE__,val) +class FTextStream; + +// note: this header file is generated from config.xml +#include "configvalues.h" + +//! @{ +//! some convenience macros for accessing the config options +//! mainly done like this for backward compatibility +#if DYNAMIC_LOOKUP // for debug purposes +#define Config_getString(val) (ConfigValues::instance().*((ConfigValues::InfoString*)ConfigValues::instance().get(#val))->item) +#define Config_getBool(val) (ConfigValues::instance().*((ConfigValues::InfoBool*)ConfigValues::instance().get(#val))->item) +#define Config_getInt(val) (ConfigValues::instance().*((ConfigValues::InfoInt*)ConfigValues::instance().get(#val))->item) +#define Config_getEnum(val) (ConfigValues::instance().*((ConfigValues::InfoString*)ConfigValues::instance().get(#val))->item) +#define Config_getList(val) (ConfigValues::instance().*((ConfigValues::InfoList*)ConfigValues::instance().get(#val))->item) +#else // direct access +#define Config_getString(val) (ConfigValues::instance().val) +#define Config_getBool(val) (ConfigValues::instance().val) +#define Config_getInt(val) (ConfigValues::instance().val) +#define Config_getEnum(val) (ConfigValues::instance().val) +#define Config_getList(val) (ConfigValues::instance().val) +#endif +//! @} -/** Singleton for configuration variables. - * - * This object holds the global static variables - * read from a user-supplied configuration file. - * The static member instance() can be used to get - * a pointer to the one and only instance. - * - * Set all variables to their default values by - * calling Config::instance()->init() - * - */ -class Config +/** \brief Public function to deal with the configuration file. */ +namespace Config { - public: - ///////////////////////////// - // public API - ///////////////////////////// - - /*! Returns the one and only instance of this class */ - static Config *instance() - { - if (m_instance==0) m_instance = new Config; - return m_instance; - } - /*! Delete the instance */ - static void deleteInstance() - { - delete m_instance; - m_instance=0; - } - - /*! Returns an iterator that can by used to iterate over the - * configuration options. - */ - QListIterator<ConfigOption> iterator() - { - return QListIterator<ConfigOption>(*m_options); - } - - /*! - * @name Getting configuration values. - * @{ - */ - - /*! Returns the value of the string option with name \a fileName. - * The arguments \a num and \a name are for debugging purposes only. - * There is a convenience function Config_getString() for this. - */ - QCString &getString(const char *fileName,int num,const char *name) const; - - /*! Returns the value of the list option with name \a fileName. - * The arguments \a num and \a name are for debugging purposes only. - * There is a convenience function Config_getList() for this. - */ - QStrList &getList(const char *fileName,int num,const char *name) const; - - /*! Returns the value of the enum option with name \a fileName. - * The arguments \a num and \a name are for debugging purposes only. - * There is a convenience function Config_getEnum() for this. - */ - QCString &getEnum(const char *fileName,int num,const char *name) const; - - /*! Returns the value of the integer option with name \a fileName. - * The arguments \a num and \a name are for debugging purposes only. - * There is a convenience function Config_getInt() for this. - */ - int &getInt(const char *fileName,int num,const char *name) const; - - /*! Returns the value of the boolean option with name \a fileName. - * The arguments \a num and \a name are for debugging purposes only. - * There is a convenience function Config_getBool() for this. - */ - bool &getBool(const char *fileName,int num,const char *name) const; - - /*! Returns the ConfigOption corresponding with \a name or 0 if - * the option is not supported. - */ - ConfigOption *get(const char *name) const - { - return m_dict->find(name); - } - /* @} */ - - /*! - * @name Adding configuration options. - * @{ - */ - - /*! Starts a new configuration section with \a name and description \a doc. - * \returns An object representing the option. - */ - ConfigInfo *addInfo(const char *name,const char *doc) - { - ConfigInfo *result = new ConfigInfo(name,doc); - m_options->append(result); - return result; - } - - /*! Adds a new string option with \a name and documentation \a doc. - * \returns An object representing the option. - */ - ConfigString *addString(const char *name, - const char *doc) - { - ConfigString *result = new ConfigString(name,doc); - m_options->append(result); - m_dict->insert(name,result); - return result; - } - - /*! Adds a new enumeration option with \a name and documentation \a doc - * and initial value \a defVal. - * \returns An object representing the option. - */ - ConfigEnum *addEnum(const char *name, - const char *doc, - const char *defVal) - { - ConfigEnum *result = new ConfigEnum(name,doc,defVal); - m_options->append(result); - m_dict->insert(name,result); - return result; - } - - /*! Adds a new string option with \a name and documentation \a doc. - * \returns An object representing the option. - */ - ConfigList *addList(const char *name, - const char *doc) - { - ConfigList *result = new ConfigList(name,doc); - m_options->append(result); - m_dict->insert(name,result); - return result; - } - - /*! Adds a new integer option with \a name and documentation \a doc. - * The integer has a range between \a minVal and \a maxVal and a - * default value of \a defVal. - * \returns An object representing the option. - */ - ConfigInt *addInt(const char *name, - const char *doc, - int minVal,int maxVal,int defVal) - { - ConfigInt *result = new ConfigInt(name,doc,minVal,maxVal,defVal); - m_options->append(result); - m_dict->insert(name,result); - return result; - } - - /*! Adds a new boolean option with \a name and documentation \a doc. - * The boolean has a default value of \a defVal. - * \returns An object representing the option. - */ - ConfigBool *addBool(const char *name, - const char *doc, - bool defVal) - { - ConfigBool *result = new ConfigBool(name,doc,defVal); - m_options->append(result); - m_dict->insert(name,result); - return result; - } - /*! Adds an option that has become obsolete. */ - ConfigOption *addObsolete(const char *name) - { - ConfigObsolete *option = new ConfigObsolete(name); - m_dict->insert(name,option); - m_obsolete->append(option); - return option; - } - /*! Adds an option that has been disabled at compile time. */ - ConfigOption *addDisabled(const char *name) - { - ConfigDisabled *option = new ConfigDisabled(name); - m_dict->insert(name,option); - m_disabled->append(option); - return option; - } - /*! @} */ - - /*! Writes a template configuration to stream \a t. If \a shortIndex - * is \c TRUE the description of each configuration option will - * be omitted. - */ - void writeTemplate(FTextStream &t,bool shortIndex,bool updateOnly); - - void setHeader(const char *header) { m_header = header; } - - ///////////////////////////// - // internal API - ///////////////////////////// - - /*! Converts the string values read from the configuration file - * to real values for non-string type options (like int, and bools) - */ - void convertStrToVal(); - - /*! Replaces references to environment variable by the actual value - * of the environment variable. - */ - void substituteEnvironmentVars(); - - /*! Checks if the values of the variable are correct, adjusts them - * if needed, and report any errors. - */ - void check(); - - /*! Initialize config variables to their default value */ - void init(); - - /*! Parse a configuration data in string \a str. - * \returns TRUE if successful, or FALSE if the string could not be - * parsed. - */ - //bool parseString(const char *fn,const char *str); - bool parseString(const char *fn,const char *str,bool upd = FALSE); - - /*! Parse a configuration file with name \a fn. - * \returns TRUE if successful, FALSE if the file could not be - * opened or read. - */ - bool parse(const char *fn,bool upd = FALSE); - - /*! Called from the constructor, will add doxygen's default options - * to the configuration object - */ - void create(); - - /*! Append user start comment - */ - void appendStartComment(const QCString &u) - { - m_startComment += u; - } - /*! Append user comment - */ - void appendUserComment(const QCString &u) - { - m_userComment += u; - } - /*! Take the user start comment and reset it internally - * \returns user start comment - */ - QCString takeStartComment() - { - QCString result=m_startComment; - m_startComment.resize(0); - return result.replace(QRegExp("\r"),""); - } - /*! Take the user comment and reset it internally - * \returns user comment - */ - QCString takeUserComment() - { - QCString result=m_userComment; - m_userComment.resize(0); - return result.replace(QRegExp("\r"),""); - } - - protected: - - Config() - { - m_options = new QList<ConfigOption>; - m_obsolete = new QList<ConfigOption>; - m_disabled = new QList<ConfigOption>; - m_dict = new QDict<ConfigOption>(257); - m_options->setAutoDelete(TRUE); - m_obsolete->setAutoDelete(TRUE); - m_disabled->setAutoDelete(TRUE); - m_initialized = FALSE; - create(); - } - ~Config() - { - delete m_options; - delete m_obsolete; - delete m_disabled; - delete m_dict; - } - - private: - void checkFileName(const char *); - QList<ConfigOption> *m_options; - QList<ConfigOption> *m_obsolete; - QList<ConfigOption> *m_disabled; - QDict<ConfigOption> *m_dict; - static Config *m_instance; - QCString m_startComment; - QCString m_userComment; - bool m_initialized; - QCString m_header; -}; + /*! Initialize configuration variables to their default value */ + void init(); + + /*! Writes a template configuration to stream \a t. If \a shortList + * is \c TRUE the description of each configuration option will + * be omitted. + */ + void writeTemplate(FTextStream &t,bool shortList,bool updateOnly=FALSE); + + /*! Parses a configuration file with name \a fn. + * \returns TRUE if successful, FALSE if the file could not be + * opened or read. + */ + bool parse(const char *fileName,bool update=FALSE); + + /*! Post processed the parsed data. Replaces raw string values by the actual values. + * and replaces environment variables. + * \param clearHeaderAndFooter set to TRUE when writing header and footer templates. + */ + void postProcess(bool clearHeaderAndFooter); + + /*! Check the validity of the parsed options and correct or warn the user where needed. */ + void checkAndCorrect(); + + /*! Clean up any data */ + void deinit(); +} #endif diff --git a/src/configgen.py b/src/configgen.py index 1647fa2..3b86954 100755 --- a/src/configgen.py +++ b/src/configgen.py @@ -353,6 +353,48 @@ def parseGroups(node): if n.nodeType == Node.ELEMENT_NODE: parseOption(n) +def parseGroupMap(node): + map = { 'bool':'bool', 'string':'QCString', 'enum':'QCString', 'int':'int', 'list':'QStrList' } + for n in node.childNodes: + if n.nodeType == Node.ELEMENT_NODE: + setting = n.getAttribute('setting') + if len(setting) > 0: + print("#if %s" % (setting)) + type = n.getAttribute('type') + name = n.getAttribute('id') + if type in map: + print(" %-8s %s;" % (map[type],name)) + if len(setting) > 0: + print("#endif") + +def parseGroupInit(node): + map = { 'bool':'Bool', 'string':'String', 'enum':'Enum', 'int':'Int', 'list':'List' } + for n in node.childNodes: + if n.nodeType == Node.ELEMENT_NODE: + setting = n.getAttribute('setting') + if len(setting) > 0: + print("#if %s" % (setting)) + type = n.getAttribute('type') + name = n.getAttribute('id') + if type in map: + print(" %-25s = ConfigImpl::instance()->get%s(__FILE__,__LINE__,\"%s\");" % (name,map[type],name)) + if len(setting) > 0: + print("#endif") + +def parseGroupMapInit(node): + map = { 'bool':'Bool', 'string':'String', 'enum':'String', 'int':'Int', 'list':'List' } + for n in node.childNodes: + if n.nodeType == Node.ELEMENT_NODE: + setting = n.getAttribute('setting') + if len(setting) > 0: + print("#if %s" % (setting)) + type = n.getAttribute('type') + name = n.getAttribute('id') + if type in map: + print(" m_map.insert(\"%s\",new Info%s(&ConfigValues::%s));" % (name,map[type],name)) + if len(setting) > 0: + print("#endif") + def parseGroupCDocs(node): for n in node.childNodes: if n.nodeType == Node.ELEMENT_NODE: @@ -556,8 +598,8 @@ def parseFooterDoc(node): def main(): - if len(sys.argv)<3 or (not sys.argv[1] in ['-doc','-cpp','-wiz']): - sys.exit('Usage: %s -doc|-cpp|-wiz config.xml' % sys.argv[0]) + if len(sys.argv)<3 or (not sys.argv[1] in ['-doc','-cpp','-wiz','-maph','-maps']): + sys.exit('Usage: %s -doc|-cpp|-wiz|-maph|-maps config.xml' % sys.argv[0]) try: doc = xml.dom.minidom.parse(sys.argv[2]) except Exception as inst: @@ -597,6 +639,89 @@ def main(): if n.nodeType == Node.ELEMENT_NODE: if (n.nodeName == "footer"): parseFooterDoc(n) + elif (sys.argv[1] == "-maph"): + print("/* WARNING: This file is generated!") + print(" * Do not edit this file, but edit config.xml instead and run") + print(" * python configgen.py -map config.xml to regenerate this file!") + print(" */") + print("#ifndef CONFIGVALUES_H") + print("#define CONFIGVALUES_H") + print("") + print("#include <qdict.h>") + print("#include <qstrlist.h>") + print("#include <qcstring.h>") + print("#include \"settings.h\"") + print("") + print("class ConfigValues") + print("{") + print(" public:") + print(" static ConfigValues &instance() { static ConfigValues theInstance; return theInstance; }") + for n in elem.childNodes: + if n.nodeType == Node.ELEMENT_NODE: + if (n.nodeName == "group"): + parseGroupMap(n) + print(" void init();") + print(" struct Info") + print(" {") + print(" enum Type { Bool, Int, String, List, Unknown };") + print(" Info(Type t) : type(t) {}") + print(" virtual ~Info() {}") + print(" Type type;") + print(" };") + print(" struct InfoBool : public Info") + print(" {") + print(" InfoBool(bool ConfigValues::*ptm) : Info(Info::Bool), item(ptm) {}") + print(" bool ConfigValues::*item;") + print(" };") + print(" struct InfoInt : public Info") + print(" {") + print(" InfoInt(int ConfigValues::*ptm) : Info(Info::Int), item(ptm) {}") + print(" int ConfigValues::*item;") + print(" };") + print(" struct InfoString : public Info") + print(" {") + print(" InfoString(QCString ConfigValues::*ptm) : Info(Info::String), item(ptm) {}") + print(" QCString ConfigValues::*item;") + print(" };") + print(" struct InfoList : public Info") + print(" {") + print(" InfoList(QStrList ConfigValues::*ptm) : Info(Info::List), item(ptm) {}") + print(" QStrList ConfigValues::*item;") + print(" };") + print(" const Info *get(const char *tag) const") + print(" {") + print(" return m_map.find(tag);") + print(" }") + print(" private:") + print(" ConfigValues();") + print(" QDict<Info> m_map;") + print("};") + print("") + print("#endif") + elif (sys.argv[1] == "-maps"): + print("/* WARNING: This file is generated!") + print(" * Do not edit this file, but edit config.xml instead and run") + print(" * python configgen.py -maps config.xml to regenerate this file!") + print(" */") + print("#include \"configvalues.h\"") + print("#include \"configimpl.h\"") + print("") + print("ConfigValues::ConfigValues() : m_map(257)") + print("{") + print(" m_map.setAutoDelete(TRUE);") + for n in elem.childNodes: + if n.nodeType == Node.ELEMENT_NODE: + if (n.nodeName == "group"): + parseGroupMapInit(n) + print("}") + print("") + print("void ConfigValues::init()") + print("{") + for n in elem.childNodes: + if n.nodeType == Node.ELEMENT_NODE: + if (n.nodeName == "group"): + parseGroupInit(n) + print("}") elif (sys.argv[1] == "-cpp"): print("/* WARNING: This file is generated!") print(" * Do not edit this file, but edit config.xml instead and run") @@ -604,11 +729,11 @@ def main(): print(" */") print("") print("#include \"configoptions.h\"") - print("#include \"config.h\"") + print("#include \"configimpl.h\"") print("#include \"portable.h\"") print("#include \"settings.h\"") print("") - print("void addConfigOptions(Config *cfg)") + print("void addConfigOptions(ConfigImpl *cfg)") print("{") print(" ConfigString *cs;") print(" ConfigEnum *ce;") diff --git a/src/configimpl.h b/src/configimpl.h new file mode 100644 index 0000000..4dd96be --- /dev/null +++ b/src/configimpl.h @@ -0,0 +1,570 @@ +/****************************************************************************** + * + * + * + * + * Copyright (C) 1997-2015 by Dimitri van Heesch. + * + * Permission to use, copy, modify, and distribute this software and its + * documentation under the terms of the GNU General Public License is hereby + * granted. No representations are made about the suitability of this software + * for any purpose. It is provided "as is" without express or implied warranty. + * See the GNU General Public License for more details. + * + * Documents produced by Doxygen are derivative works derived from the + * input used in their production; they are not affected by this license. + * + */ + +#ifndef CONFIGIMPL_H +#define CONFIGIMPL_H + +#include <qstrlist.h> +#include <qdict.h> +#include <qlist.h> +#include <qregexp.h> +#include "ftextstream.h" + + +/** Abstract base class for any configuration option. + */ +class ConfigOption +{ + friend class ConfigImpl; + + public: + + /*! The type of option */ + enum OptionType + { + O_Info, //<! A section header + O_List, //<! A list of items + O_Enum, //<! A fixed set of items + O_String, //<! A single item + O_Int, //<! An integer value + O_Bool, //<! A boolean value + O_Obsolete, //<! An obsolete option + O_Disabled //<! Disabled compile time option + }; + enum + { + /*! Maximum length of an option in the config file. Used for + * alignment purposes. + */ + MAX_OPTION_LENGTH = 23 + }; + ConfigOption(OptionType t) : m_kind(t) + { + m_spaces.fill(' ',40); + } + virtual ~ConfigOption() + { + } + + /*! returns the kind of option this is. */ + OptionType kind() const { return m_kind; } + QCString name() const { return m_name; } + QCString docs() const { return m_doc; } + + QCString dependsOn() const { return m_dependency; } + void addDependency(const char *dep) { m_dependency = dep; } + void setEncoding(const QCString &e) { m_encoding = e; } + void setUserComment(const QCString &u) { m_userComment += u; } + + protected: + virtual void writeTemplate(FTextStream &t,bool sl,bool upd) = 0; + virtual void convertStrToVal() {} + virtual void substEnvVars() = 0; + virtual void init() {} + + void writeBoolValue(FTextStream &t,bool v); + void writeIntValue(FTextStream &t,int i); + void writeStringValue(FTextStream &t,QCString &s); + void writeStringList(FTextStream &t,QStrList &l); + + QCString m_spaces; + QCString m_name; + QCString m_doc; + QCString m_dependency; + QCString m_encoding; + QCString m_userComment; + OptionType m_kind; +}; + +/** Section marker for grouping the configuration options. + */ +class ConfigInfo : public ConfigOption +{ + public: + ConfigInfo(const char *name,const char *doc) + : ConfigOption(O_Info) + { + m_name = name; + m_doc = doc; + } + void writeTemplate(FTextStream &t, bool sl,bool); + void substEnvVars() {} +}; + +/** Class respresenting a list type option. + */ +class ConfigList : public ConfigOption +{ + public: + enum WidgetType { String, File, Dir, FileAndDir }; + ConfigList(const char *name,const char *doc) + : ConfigOption(O_List) + { + m_name = name; + m_doc = doc; + m_widgetType = String; + } + void addValue(const char *v) { m_value.append(v); } + void setWidgetType(WidgetType w) { m_widgetType = w; } + WidgetType widgetType() const { return m_widgetType; } + QStrList *valueRef() { return &m_value; } + void writeTemplate(FTextStream &t,bool sl,bool); + void substEnvVars(); + void init() { m_value.clear(); } + private: + QStrList m_value; + WidgetType m_widgetType; +}; + +/** Class representing an enum type option. + */ +class ConfigEnum : public ConfigOption +{ + public: + ConfigEnum(const char *name,const char *doc,const char *defVal) + : ConfigOption(O_Enum) + { + m_name = name; + m_doc = doc; + m_value = defVal; + m_defValue = defVal; + } + void addValue(const char *v) { m_valueRange.append(v); } + QStrListIterator iterator() + { + return QStrListIterator(m_valueRange); + } + QCString *valueRef() { return &m_value; } + void substEnvVars(); + void writeTemplate(FTextStream &t,bool sl,bool); + void init() { m_value = m_defValue.copy(); } + + private: + QStrList m_valueRange; + QCString m_value; + QCString m_defValue; +}; + +/** Class representing a string type option. + */ +class ConfigString : public ConfigOption +{ + public: + enum WidgetType { String, File, Dir, Image }; + ConfigString(const char *name,const char *doc) + : ConfigOption(O_String) + { + m_name = name; + m_doc = doc; + m_widgetType = String; + } + ~ConfigString() + { + } + void setWidgetType(WidgetType w) { m_widgetType = w; } + WidgetType widgetType() const { return m_widgetType; } + void setDefaultValue(const char *v) { m_defValue = v; } + QCString *valueRef() { return &m_value; } + void writeTemplate(FTextStream &t,bool sl,bool); + void substEnvVars(); + void init() { m_value = m_defValue.copy(); } + + private: + QCString m_value; + QCString m_defValue; + WidgetType m_widgetType; +}; + +/** Class representing an integer type option. + */ +class ConfigInt : public ConfigOption +{ + public: + ConfigInt(const char *name,const char *doc,int minVal,int maxVal,int defVal) + : ConfigOption(O_Int) + { + m_name = name; + m_doc = doc; + m_value = defVal; + m_defValue = defVal; + m_minVal = minVal; + m_maxVal = maxVal; + } + QCString *valueStringRef() { return &m_valueString; } + int *valueRef() { return &m_value; } + int minVal() const { return m_minVal; } + int maxVal() const { return m_maxVal; } + void convertStrToVal(); + void substEnvVars(); + void writeTemplate(FTextStream &t,bool sl,bool upd); + void init() { m_value = m_defValue; } + private: + int m_value; + int m_defValue; + int m_minVal; + int m_maxVal; + QCString m_valueString; +}; + +/** Class representing a Boolean type option. + */ +class ConfigBool : public ConfigOption +{ + public: + ConfigBool(const char *name,const char *doc,bool defVal) + : ConfigOption(O_Bool) + { + m_name = name; + m_doc = doc; + m_value = defVal; + m_defValue = defVal; + } + QCString *valueStringRef() { return &m_valueString; } + bool *valueRef() { return &m_value; } + void convertStrToVal(); + void substEnvVars(); + void setValueString(const QCString &v) { m_valueString = v; } + void writeTemplate(FTextStream &t,bool sl,bool upd); + void init() { m_value = m_defValue; } + private: + bool m_value; + bool m_defValue; + QCString m_valueString; +}; + +/** Section marker for obsolete options + */ +class ConfigObsolete : public ConfigOption +{ + public: + ConfigObsolete(const char *name) : ConfigOption(O_Obsolete) + { m_name = name; } + void writeTemplate(FTextStream &,bool,bool); + void substEnvVars() {} +}; + +/** Section marker for compile time optional options + */ +class ConfigDisabled : public ConfigOption +{ + public: + ConfigDisabled(const char *name) : ConfigOption(O_Disabled) + { m_name = name; } + void writeTemplate(FTextStream &,bool,bool); + void substEnvVars() {} +}; + +// some convenience macros for access the config options +#define ConfigImpl_getString(val) ConfigImpl::instance()->getString(__FILE__,__LINE__,val) +#define ConfigImpl_getInt(val) ConfigImpl::instance()->getInt(__FILE__,__LINE__,val) +#define ConfigImpl_getList(val) ConfigImpl::instance()->getList(__FILE__,__LINE__,val) +#define ConfigImpl_getEnum(val) ConfigImpl::instance()->getEnum(__FILE__,__LINE__,val) +#define ConfigImpl_getBool(val) ConfigImpl::instance()->getBool(__FILE__,__LINE__,val) + + +/** Singleton for configuration variables. + * + * This object holds the global static variables + * read from a user-supplied configuration file. + * The static member instance() can be used to get + * a pointer to the one and only instance. + * + * Set all variables to their default values by + * calling Config::instance()->init() + * + */ +class ConfigImpl +{ + public: + ///////////////////////////// + // public API + ///////////////////////////// + + /*! Returns the one and only instance of this class */ + static ConfigImpl *instance() + { + if (m_instance==0) m_instance = new ConfigImpl; + return m_instance; + } + /*! Delete the instance */ + static void deleteInstance() + { + delete m_instance; + m_instance=0; + } + + /*! Returns an iterator that can by used to iterate over the + * configuration options. + */ + QListIterator<ConfigOption> iterator() + { + return QListIterator<ConfigOption>(*m_options); + } + + /*! + * @name Getting configuration values. + * @{ + */ + + /*! Returns the value of the string option with name \a fileName. + * The arguments \a num and \a name are for debugging purposes only. + * There is a convenience function Config_getString() for this. + */ + QCString &getString(const char *fileName,int num,const char *name) const; + + /*! Returns the value of the list option with name \a fileName. + * The arguments \a num and \a name are for debugging purposes only. + * There is a convenience function Config_getList() for this. + */ + QStrList &getList(const char *fileName,int num,const char *name) const; + + /*! Returns the value of the enum option with name \a fileName. + * The arguments \a num and \a name are for debugging purposes only. + * There is a convenience function Config_getEnum() for this. + */ + QCString &getEnum(const char *fileName,int num,const char *name) const; + + /*! Returns the value of the integer option with name \a fileName. + * The arguments \a num and \a name are for debugging purposes only. + * There is a convenience function Config_getInt() for this. + */ + int &getInt(const char *fileName,int num,const char *name) const; + + /*! Returns the value of the boolean option with name \a fileName. + * The arguments \a num and \a name are for debugging purposes only. + * There is a convenience function Config_getBool() for this. + */ + bool &getBool(const char *fileName,int num,const char *name) const; + + /*! Returns the ConfigOption corresponding with \a name or 0 if + * the option is not supported. + */ + ConfigOption *get(const char *name) const + { + return m_dict->find(name); + } + /* @} */ + + /*! + * @name Adding configuration options. + * @{ + */ + + /*! Starts a new configuration section with \a name and description \a doc. + * \returns An object representing the option. + */ + ConfigInfo *addInfo(const char *name,const char *doc) + { + ConfigInfo *result = new ConfigInfo(name,doc); + m_options->append(result); + return result; + } + + /*! Adds a new string option with \a name and documentation \a doc. + * \returns An object representing the option. + */ + ConfigString *addString(const char *name, + const char *doc) + { + ConfigString *result = new ConfigString(name,doc); + m_options->append(result); + m_dict->insert(name,result); + return result; + } + + /*! Adds a new enumeration option with \a name and documentation \a doc + * and initial value \a defVal. + * \returns An object representing the option. + */ + ConfigEnum *addEnum(const char *name, + const char *doc, + const char *defVal) + { + ConfigEnum *result = new ConfigEnum(name,doc,defVal); + m_options->append(result); + m_dict->insert(name,result); + return result; + } + + /*! Adds a new string option with \a name and documentation \a doc. + * \returns An object representing the option. + */ + ConfigList *addList(const char *name, + const char *doc) + { + ConfigList *result = new ConfigList(name,doc); + m_options->append(result); + m_dict->insert(name,result); + return result; + } + + /*! Adds a new integer option with \a name and documentation \a doc. + * The integer has a range between \a minVal and \a maxVal and a + * default value of \a defVal. + * \returns An object representing the option. + */ + ConfigInt *addInt(const char *name, + const char *doc, + int minVal,int maxVal,int defVal) + { + ConfigInt *result = new ConfigInt(name,doc,minVal,maxVal,defVal); + m_options->append(result); + m_dict->insert(name,result); + return result; + } + + /*! Adds a new boolean option with \a name and documentation \a doc. + * The boolean has a default value of \a defVal. + * \returns An object representing the option. + */ + ConfigBool *addBool(const char *name, + const char *doc, + bool defVal) + { + ConfigBool *result = new ConfigBool(name,doc,defVal); + m_options->append(result); + m_dict->insert(name,result); + return result; + } + /*! Adds an option that has become obsolete. */ + ConfigOption *addObsolete(const char *name) + { + ConfigObsolete *option = new ConfigObsolete(name); + m_dict->insert(name,option); + m_obsolete->append(option); + return option; + } + /*! Adds an option that has been disabled at compile time. */ + ConfigOption *addDisabled(const char *name) + { + ConfigDisabled *option = new ConfigDisabled(name); + m_dict->insert(name,option); + m_disabled->append(option); + return option; + } + /*! @} */ + + /*! Writes a template configuration to stream \a t. If \a shortIndex + * is \c TRUE the description of each configuration option will + * be omitted. + */ + void writeTemplate(FTextStream &t,bool shortIndex,bool updateOnly); + + void setHeader(const char *header) { m_header = header; } + + ///////////////////////////// + // internal API + ///////////////////////////// + + /*! Converts the string values read from the configuration file + * to real values for non-string type options (like int, and bools) + */ + void convertStrToVal(); + + /*! Replaces references to environment variable by the actual value + * of the environment variable. + */ + void substituteEnvironmentVars(); + + /*! Initialize config variables to their default value */ + void init(); + + /*! Parse a configuration data in string \a str. + * \returns TRUE if successful, or FALSE if the string could not be + * parsed. + */ + //bool parseString(const char *fn,const char *str); + bool parseString(const char *fn,const char *str,bool upd = FALSE); + + /*! Parse a configuration file with name \a fn. + * \returns TRUE if successful, FALSE if the file could not be + * opened or read. + */ + bool parse(const char *fn,bool upd = FALSE); + + /*! Called from the constructor, will add doxygen's default options + * to the configuration object + */ + void create(); + + /*! Append user start comment + */ + void appendStartComment(const QCString &u) + { + m_startComment += u; + } + /*! Append user comment + */ + void appendUserComment(const QCString &u) + { + m_userComment += u; + } + /*! Take the user start comment and reset it internally + * \returns user start comment + */ + QCString takeStartComment() + { + QCString result=m_startComment; + m_startComment.resize(0); + return result.replace(QRegExp("\r"),""); + } + /*! Take the user comment and reset it internally + * \returns user comment + */ + QCString takeUserComment() + { + QCString result=m_userComment; + m_userComment.resize(0); + return result.replace(QRegExp("\r"),""); + } + + protected: + + ConfigImpl() + { + m_options = new QList<ConfigOption>; + m_obsolete = new QList<ConfigOption>; + m_disabled = new QList<ConfigOption>; + m_dict = new QDict<ConfigOption>(257); + m_options->setAutoDelete(TRUE); + m_obsolete->setAutoDelete(TRUE); + m_disabled->setAutoDelete(TRUE); + m_initialized = FALSE; + create(); + } + ~ConfigImpl() + { + delete m_options; + delete m_obsolete; + delete m_disabled; + delete m_dict; + } + + private: + QList<ConfigOption> *m_options; + QList<ConfigOption> *m_obsolete; + QList<ConfigOption> *m_disabled; + QDict<ConfigOption> *m_dict; + static ConfigImpl *m_instance; + QCString m_startComment; + QCString m_userComment; + bool m_initialized; + QCString m_header; +}; + +#endif diff --git a/src/config.l b/src/configimpl.l index 26e0283..f1d33c0 100644 --- a/src/config.l +++ b/src/configimpl.l @@ -29,7 +29,7 @@ #include <qstack.h> #include <qglobal.h> -#include "config.h" +#include "configimpl.h" #include "version.h" #include "portable.h" #include "util.h" @@ -38,22 +38,9 @@ #include "lang_cfg.h" #include "configoptions.h" -#undef Config_getString -#undef Config_getInt -#undef Config_getList -#undef Config_getEnum -#undef Config_getBool - #define YY_NO_INPUT 1 #define YY_NO_UNISTD_H 1 -// use in-class definitions -#define Config_getString(val) getString(__FILE__,__LINE__,val) -#define Config_getInt(val) getInt(__FILE__,__LINE__,val) -#define Config_getList(val) getList(__FILE__,__LINE__,val) -#define Config_getEnum(val) getEnum(__FILE__,__LINE__,val) -#define Config_getBool(val) getBool(__FILE__,__LINE__,val) - static const char *warning_str = "warning: "; static const char *error_str = "error: "; @@ -175,7 +162,7 @@ void ConfigOption::writeStringList(FTextStream &t,QStrList &l) /* ----------------------------------------------------------------- */ -Config *Config::m_instance = 0; +ConfigImpl *ConfigImpl::m_instance = 0; void ConfigInt::convertStrToVal() { @@ -216,7 +203,7 @@ void ConfigBool::convertStrToVal() } } -QCString &Config::getString(const char *fileName,int num,const char *name) const +QCString &ConfigImpl::getString(const char *fileName,int num,const char *name) const { ConfigOption *opt = m_dict->find(name); if (opt==0) @@ -232,7 +219,7 @@ QCString &Config::getString(const char *fileName,int num,const char *name) const return *((ConfigString *)opt)->valueRef(); } -QStrList &Config::getList(const char *fileName,int num,const char *name) const +QStrList &ConfigImpl::getList(const char *fileName,int num,const char *name) const { ConfigOption *opt = m_dict->find(name); if (opt==0) @@ -248,7 +235,7 @@ QStrList &Config::getList(const char *fileName,int num,const char *name) const return *((ConfigList *)opt)->valueRef(); } -QCString &Config::getEnum(const char *fileName,int num,const char *name) const +QCString &ConfigImpl::getEnum(const char *fileName,int num,const char *name) const { ConfigOption *opt = m_dict->find(name); if (opt==0) @@ -264,7 +251,7 @@ QCString &Config::getEnum(const char *fileName,int num,const char *name) const return *((ConfigEnum *)opt)->valueRef(); } -int &Config::getInt(const char *fileName,int num,const char *name) const +int &ConfigImpl::getInt(const char *fileName,int num,const char *name) const { ConfigOption *opt = m_dict->find(name); if (opt==0) @@ -280,7 +267,7 @@ int &Config::getInt(const char *fileName,int num,const char *name) const return *((ConfigInt *)opt)->valueRef(); } -bool &Config::getBool(const char *fileName,int num,const char *name) const +bool &ConfigImpl::getBool(const char *fileName,int num,const char *name) const { ConfigOption *opt = m_dict->find(name); if (opt==0) @@ -439,10 +426,8 @@ static QStrList includePathList; static QStack<ConfigFileState> includeStack; static int includeDepth; static bool config_upd = FALSE; - -static QCString encoding; - -static Config *config; +static QCString encoding; +static ConfigImpl *config; /* ----------------------------------------------------------------- */ @@ -858,7 +843,7 @@ static void readIncludeFile(const char *incName) /*@ ---------------------------------------------------------------------------- */ -void Config::writeTemplate(FTextStream &t,bool sl,bool upd) +void ConfigImpl::writeTemplate(FTextStream &t,bool sl,bool upd) { /* print first lines of user comment that were at the beginning of the file, might have special meaning for editors */ if (m_startComment) @@ -884,7 +869,7 @@ void Config::writeTemplate(FTextStream &t,bool sl,bool upd) } } -void Config::convertStrToVal() +void ConfigImpl::convertStrToVal() { QListIterator<ConfigOption> it = iterator(); ConfigOption *option; @@ -1024,7 +1009,9 @@ void ConfigEnum::substEnvVars() substEnvVarsInString(m_value); } -void Config::substituteEnvironmentVars() +//--------------------------------------------- + +void ConfigImpl::substituteEnvironmentVars() { QListIterator<ConfigOption> it = iterator(); ConfigOption *option; @@ -1034,6 +1021,129 @@ void Config::substituteEnvironmentVars() } } +void ConfigImpl::init() +{ + QListIterator<ConfigOption> it = iterator(); + ConfigOption *option; + for (;(option=it.current());++it) + { + option->init(); + } + + // sanity check if all depends relations are valid + for (it.toFirst();(option=it.current());++it) + { + QCString depName = option->dependsOn(); + if (!depName.isEmpty()) + { + ConfigOption * opt = ConfigImpl::instance()->get(depName); + if (opt==0) + { + config_warn("Config option '%s' has invalid depends relation on unknown option '%s'\n", + option->name().data(),depName.data()); + exit(1); + } + } + } +} + +void ConfigImpl::create() +{ + if (m_initialized) return; + m_initialized = TRUE; + addConfigOptions(this); +} + +static QCString configFileToString(const char *name) +{ + if (name==0 || name[0]==0) return 0; + QFile f; + + bool fileOpened=FALSE; + if (name[0]=='-' && name[1]==0) // read from stdin + { + fileOpened=f.open(IO_ReadOnly,stdin); + if (fileOpened) + { + const int bSize=4096; + QCString contents(bSize); + int totalSize=0; + int size; + while ((size=f.readBlock(contents.rawData()+totalSize,bSize))==bSize) + { + totalSize+=bSize; + contents.resize(totalSize+bSize); + } + totalSize+=size+2; + contents.resize(totalSize); + contents.at(totalSize-2)='\n'; // to help the scanner + contents.at(totalSize-1)='\0'; + return contents; + } + } + else // read from file + { + QFileInfo fi(name); + if (!fi.exists() || !fi.isFile()) + { + config_err("file `%s' not found\n",name); + return ""; + } + f.setName(name); + fileOpened=f.open(IO_ReadOnly); + if (fileOpened) + { + int fsize=f.size(); + QCString contents(fsize+2); + f.readBlock(contents.rawData(),fsize); + f.close(); + if (fsize==0 || contents[fsize-1]=='\n') + contents[fsize]='\0'; + else + contents[fsize]='\n'; // to help the scanner + contents[fsize+1]='\0'; + return contents; + } + } + if (!fileOpened) + { + config_err("cannot open file `%s' for reading\n",name); + exit(1); + } + return ""; +} + +bool ConfigImpl::parseString(const char *fn,const char *str,bool update) +{ + config = ConfigImpl::instance(); + inputString = str; + inputPosition = 0; + yyFileName = fn; + yyLineNr = 1; + includeStack.setAutoDelete(TRUE); + includeStack.clear(); + includeDepth = 0; + configimplYYrestart( configimplYYin ); + BEGIN( PreStart ); + config_upd = update; + configimplYYlex(); + config_upd = FALSE; + inputString = 0; + return TRUE; +} + +bool ConfigImpl::parse(const char *fn,bool update) +{ + int retval; + encoding = "UTF-8"; + printlex(yy_flex_debug, TRUE, __FILE__, fn); + retval = parseString(fn,configFileToString(fn), update); + printlex(yy_flex_debug, FALSE, __FILE__, fn); + return retval; +} + +//---------------------------------------------------------------------- + static void cleanUpPaths(QStrList &str) { char *sfp = str.first(); @@ -1069,26 +1179,47 @@ static void cleanUpPaths(QStrList &str) } } -void Config::checkFileName(const char *optionName) +static void checkFileName(QCString &s,const char *optionName) { - QCString &s = Config_getString(optionName); QCString val = s.stripWhiteSpace().lower(); if ((val=="yes" || val=="true" || val=="1" || val=="all") || - (val=="no" || val=="false" || val=="0" || val=="none")) + (val=="no" || val=="false" || val=="0" || val=="none")) { - config_err("file name expected for option %s, got %s instead. Ignoring...\n",optionName,s.data()); + err("file name expected for option %s, got %s instead. Ignoring...\n",optionName,s.data()); s=""; // note the use of &s above: this will change the option value! } } -void Config::check() +static void initFilePattern(void) { - //if (!projectName.isEmpty()) - //{ - // projectName[0]=toupper(projectName[0]); - //} + // add default pattern if needed + QStrList &filePatternList = ConfigImpl_getList("FILE_PATTERNS"); + if (filePatternList.isEmpty()) + { + QDictIterator<int> it( getExtensionLookup() ); + QCString pattern; + bool caseSens = portable_fileSystemIsCaseSensitive(); + for (;it.current();++it) + { + pattern = "*"; + pattern += it.currentKey(); + filePatternList.append(pattern.data()); + if (caseSens) filePatternList.append(pattern.upper().data()); + } + } +} - QCString &warnFormat = Config_getString("WARN_FORMAT"); + +#include "config.h" + +void Config::init() +{ + ConfigImpl::instance()->init(); +} + +void Config::checkAndCorrect() +{ + QCString &warnFormat = ConfigImpl_getString("WARN_FORMAT"); if (warnFormat.stripWhiteSpace().isEmpty()) { warnFormat="$file:$line $text"; @@ -1097,55 +1228,56 @@ void Config::check() { if (warnFormat.find("$file")==-1) { - config_warn("warning format does not contain a $file tag!\n"); + warn_uncond("warning format does not contain a $file tag!\n"); + } if (warnFormat.find("$line")==-1) { - config_warn("warning format does not contain a $line tag!\n"); + warn_uncond("warning format does not contain a $line tag!\n"); } if (warnFormat.find("$text")==-1) { - config_warn("warning format foes not contain a $text tag!\n"); + warn_uncond("warning format foes not contain a $text tag!\n"); } } - QCString &manExtension = Config_getString("MAN_EXTENSION"); - + QCString &manExtension = ConfigImpl_getString("MAN_EXTENSION"); + // set default man page extension if non is given by the user if (manExtension.isEmpty()) { manExtension=".3"; } - - QCString &paperType = Config_getEnum("PAPER_TYPE"); - paperType=paperType.lower().stripWhiteSpace(); + + QCString &paperType = ConfigImpl_getEnum("PAPER_TYPE"); + paperType=paperType.lower().stripWhiteSpace(); if (paperType.isEmpty() || paperType=="a4wide") { paperType = "a4"; } - if (paperType!="a4" && paperType!="letter" && + if (paperType!="a4" && paperType!="letter" && paperType!="legal" && paperType!="executive") { - config_err("Unknown page type specified\n"); + err("Unknown page type specified\n"); paperType="a4"; } - - QCString &outputLanguage=Config_getEnum("OUTPUT_LANGUAGE"); + + QCString &outputLanguage=ConfigImpl_getEnum("OUTPUT_LANGUAGE"); outputLanguage=outputLanguage.stripWhiteSpace(); if (outputLanguage.isEmpty()) { outputLanguage = "English"; } - QCString &htmlFileExtension=Config_getString("HTML_FILE_EXTENSION"); + QCString &htmlFileExtension=ConfigImpl_getString("HTML_FILE_EXTENSION"); htmlFileExtension=htmlFileExtension.stripWhiteSpace(); if (htmlFileExtension.isEmpty()) { htmlFileExtension = ".html"; } - + // expand the relative stripFromPath values - QStrList &stripFromPath = Config_getList("STRIP_FROM_PATH"); + QStrList &stripFromPath = ConfigImpl_getList("STRIP_FROM_PATH"); char *sfp = stripFromPath.first(); if (sfp==0) // by default use the current path { @@ -1157,49 +1289,49 @@ void Config::check() } // expand the relative stripFromPath values - QStrList &stripFromIncPath = Config_getList("STRIP_FROM_INC_PATH"); + QStrList &stripFromIncPath = ConfigImpl_getList("STRIP_FROM_INC_PATH"); cleanUpPaths(stripFromIncPath); - + // Test to see if HTML header is valid - QCString &headerFile = Config_getString("HTML_HEADER"); + QCString &headerFile = ConfigImpl_getString("HTML_HEADER"); if (!headerFile.isEmpty()) { QFileInfo fi(headerFile); if (!fi.exists()) { - config_err("tag HTML_HEADER: header file `%s' " + err("tag HTML_HEADER: header file `%s' " "does not exist\n",headerFile.data()); exit(1); } } // Test to see if HTML footer is valid - QCString &footerFile = Config_getString("HTML_FOOTER"); + QCString &footerFile = ConfigImpl_getString("HTML_FOOTER"); if (!footerFile.isEmpty()) { QFileInfo fi(footerFile); if (!fi.exists()) { - config_err("tag HTML_FOOTER: footer file `%s' " + err("tag HTML_FOOTER: footer file `%s' " "does not exist\n",footerFile.data()); exit(1); } } // Test to see if MathJax code file is valid - if (Config_getBool("USE_MATHJAX")) + if (ConfigImpl_getBool("USE_MATHJAX")) { - QCString &MathJaxCodefile = Config_getString("MATHJAX_CODEFILE"); + QCString &MathJaxCodefile = ConfigImpl_getString("MATHJAX_CODEFILE"); if (!MathJaxCodefile.isEmpty()) { QFileInfo fi(MathJaxCodefile); if (!fi.exists()) { - config_err("tag MATHJAX_CODEFILE file `%s' " + err("tag MATHJAX_CODEFILE file `%s' " "does not exist\n",MathJaxCodefile.data()); exit(1); } } - QCString &path = Config_getString("MATHJAX_RELPATH"); + QCString &path = ConfigImpl_getString("MATHJAX_RELPATH"); if (!path.isEmpty() && path.at(path.length()-1)!='/') { path+="/"; @@ -1208,43 +1340,43 @@ void Config::check() } // Test to see if LaTeX header is valid - QCString &latexHeaderFile = Config_getString("LATEX_HEADER"); + QCString &latexHeaderFile = ConfigImpl_getString("LATEX_HEADER"); if (!latexHeaderFile.isEmpty()) { QFileInfo fi(latexHeaderFile); if (!fi.exists()) { - config_err("tag LATEX_HEADER: header file `%s' " + err("tag LATEX_HEADER: header file `%s' " "does not exist\n",latexHeaderFile.data()); exit(1); } } // Test to see if LaTeX footer is valid - QCString &latexFooterFile = Config_getString("LATEX_FOOTER"); + QCString &latexFooterFile = ConfigImpl_getString("LATEX_FOOTER"); if (!latexFooterFile.isEmpty()) { QFileInfo fi(latexFooterFile); if (!fi.exists()) { - config_err("tag LATEX_FOOTER: footer file `%s' " + err("tag LATEX_FOOTER: footer file `%s' " "does not exist\n",latexFooterFile.data()); exit(1); } } // check include path - QStrList &includePath = Config_getList("INCLUDE_PATH"); + QStrList &includePath = ConfigImpl_getList("INCLUDE_PATH"); char *s=includePath.first(); while (s) { QFileInfo fi(s); - if (!fi.exists()) config_warn("tag INCLUDE_PATH: include path `%s' " + if (!fi.exists()) warn_uncond("tag INCLUDE_PATH: include path `%s' " "does not exist\n",s); s=includePath.next(); } // check aliases - QStrList &aliasList = Config_getList("ALIASES"); + QStrList &aliasList = ConfigImpl_getList("ALIASES"); s=aliasList.first(); while (s) { @@ -1254,33 +1386,33 @@ void Config::check() alias=alias.stripWhiteSpace(); if (alias.find(re1)!=0 && alias.find(re2)!=0) { - config_err("Illegal alias format `%s'. Use \"name=value\" or \"name(n)=value\", where n is the number of arguments\n", + err("Illegal alias format `%s'. Use \"name=value\" or \"name(n)=value\", where n is the number of arguments\n", alias.data()); } s=aliasList.next(); } // check if GENERATE_TREEVIEW and GENERATE_HTMLHELP are both enabled - if (Config_getBool("GENERATE_TREEVIEW") && Config_getBool("GENERATE_HTMLHELP")) + if (ConfigImpl_getBool("GENERATE_TREEVIEW") && ConfigImpl_getBool("GENERATE_HTMLHELP")) { - config_err("When enabling GENERATE_HTMLHELP the tree view (GENERATE_TREEVIEW) should be disabled. I'll do it for you.\n"); - Config_getBool("GENERATE_TREEVIEW")=FALSE; + err("When enabling GENERATE_HTMLHELP the tree view (GENERATE_TREEVIEW) should be disabled. I'll do it for you.\n"); + ConfigImpl_getBool("GENERATE_TREEVIEW")=FALSE; } - if (Config_getBool("SEARCHENGINE") && Config_getBool("GENERATE_HTMLHELP")) + if (ConfigImpl_getBool("SEARCHENGINE") && ConfigImpl_getBool("GENERATE_HTMLHELP")) { - config_err("When enabling GENERATE_HTMLHELP the search engine (SEARCHENGINE) should be disabled. I'll do it for you.\n"); - Config_getBool("SEARCHENGINE")=FALSE; + err("When enabling GENERATE_HTMLHELP the search engine (SEARCHENGINE) should be disabled. I'll do it for you.\n"); + ConfigImpl_getBool("SEARCHENGINE")=FALSE; } // check if SEPARATE_MEMBER_PAGES and INLINE_GROUPED_CLASSES are both enabled - if (Config_getBool("SEPARATE_MEMBER_PAGES") && Config_getBool("INLINE_GROUPED_CLASSES")) + if (ConfigImpl_getBool("SEPARATE_MEMBER_PAGES") && ConfigImpl_getBool("INLINE_GROUPED_CLASSES")) { - config_err("When enabling INLINE_GROUPED_CLASSES the SEPARATE_MEMBER_PAGES option should be disabled. I'll do it for you.\n"); - Config_getBool("SEPARATE_MEMBER_PAGES")=FALSE; + err("When enabling INLINE_GROUPED_CLASSES the SEPARATE_MEMBER_PAGES option should be disabled. I'll do it for you.\n"); + ConfigImpl_getBool("SEPARATE_MEMBER_PAGES")=FALSE; } - + // check dot image format - QCString &dotImageFormat=Config_getEnum("DOT_IMAGE_FORMAT"); + QCString &dotImageFormat=ConfigImpl_getEnum("DOT_IMAGE_FORMAT"); dotImageFormat=dotImageFormat.stripWhiteSpace(); if (dotImageFormat.isEmpty()) { @@ -1288,21 +1420,21 @@ void Config::check() } //else if (dotImageFormat!="gif" && dotImageFormat!="png" && dotImageFormat!="jpg") //{ - // config_err("Invalid value for DOT_IMAGE_FORMAT: `%s'. Using the default.\n",dotImageFormat.data()); + // err("Invalid value for DOT_IMAGE_FORMAT: `%s'. Using the default.\n",dotImageFormat.data()); // dotImageFormat = "png"; //} - QCString &dotFontName=Config_getString("DOT_FONTNAME"); + QCString &dotFontName=ConfigImpl_getString("DOT_FONTNAME"); if (dotFontName=="FreeSans" || dotFontName=="FreeSans.ttf") { - config_warn("doxygen no longer ships with the FreeSans font.\n" + warn_uncond("doxygen no longer ships with the FreeSans font.\n" "You may want to clear or change DOT_FONTNAME.\n" "Otherwise you run the risk that the wrong font is being used for dot generated graphs.\n"); } - - + + // check dot path - QCString &dotPath = Config_getString("DOT_PATH"); + QCString &dotPath = ConfigImpl_getString("DOT_PATH"); if (!dotPath.isEmpty()) { QFileInfo fi(dotPath); @@ -1315,7 +1447,7 @@ void Config::check() QFileInfo dp(dotPath+"/dot"+portable_commandExtension()); if (!dp.exists() || !dp.isFile()) { - config_warn("the dot tool could not be found at %s\n",dotPath.data()); + warn_uncond("the dot tool could not be found at %s\n",dotPath.data()); dotPath=""; } else @@ -1334,13 +1466,13 @@ void Config::check() } // check mscgen path - QCString &mscgenPath = Config_getString("MSCGEN_PATH"); + QCString &mscgenPath = ConfigImpl_getString("MSCGEN_PATH"); if (!mscgenPath.isEmpty()) { QFileInfo dp(mscgenPath+"/mscgen"+portable_commandExtension()); if (!dp.exists() || !dp.isFile()) { - config_warn("the mscgen tool could not be found at %s\n",mscgenPath.data()); + warn_uncond("the mscgen tool could not be found at %s\n",mscgenPath.data()); mscgenPath=""; } else @@ -1358,7 +1490,7 @@ void Config::check() } // check plantuml path - QCString &plantumlJarPath = Config_getString("PLANTUML_JAR_PATH"); + QCString &plantumlJarPath = ConfigImpl_getString("PLANTUML_JAR_PATH"); if (!plantumlJarPath.isEmpty()) { QFileInfo pu(plantumlJarPath); @@ -1371,7 +1503,7 @@ void Config::check() } else { - config_err("Jar file plantuml.jar not found at location " + err("Jar file plantuml.jar not found at location " "specified via PLANTUML_JAR_PATH: '%s'\n",plantumlJarPath.data()); plantumlJarPath=""; } @@ -1382,20 +1514,20 @@ void Config::check() } else { - config_err("path specified via PLANTUML_JAR_PATH does not exist or not a directory: %s\n", + err("path specified via PLANTUML_JAR_PATH does not exist or not a directory: %s\n", plantumlJarPath.data()); plantumlJarPath=""; } } // check dia path - QCString &diaPath = Config_getString("DIA_PATH"); + QCString &diaPath = ConfigImpl_getString("DIA_PATH"); if (!diaPath.isEmpty()) { QFileInfo dp(diaPath+"/dia"+portable_commandExtension()); if (!dp.exists() || !dp.isFile()) { - config_warn("dia could not be found at %s\n",diaPath.data()); + warn_uncond("dia could not be found at %s\n",diaPath.data()); diaPath=""; } else @@ -1413,7 +1545,7 @@ void Config::check() } // check input - QStrList &inputSources=Config_getList("INPUT"); + QStrList &inputSources=ConfigImpl_getList("INPUT"); if (inputSources.count()==0) { // use current dir as the default @@ -1427,7 +1559,7 @@ void Config::check() QFileInfo fi(s); if (!fi.exists()) { - config_warn("tag INPUT: input source `%s' does not exist\n",s); + warn_uncond("tag INPUT: input source `%s' does not exist\n",s); } s=inputSources.next(); } @@ -1436,65 +1568,65 @@ void Config::check() initFilePattern(); // add default pattern if needed - QStrList &examplePatternList = Config_getList("EXAMPLE_PATTERNS"); + QStrList &examplePatternList = ConfigImpl_getList("EXAMPLE_PATTERNS"); if (examplePatternList.isEmpty()) { examplePatternList.append("*"); } // if no output format is enabled, warn the user - if (!Config_getBool("GENERATE_HTML") && - !Config_getBool("GENERATE_LATEX") && - !Config_getBool("GENERATE_MAN") && - !Config_getBool("GENERATE_RTF") && - !Config_getBool("GENERATE_XML") && - !Config_getBool("GENERATE_PERLMOD") && - !Config_getBool("GENERATE_RTF") && - !Config_getBool("GENERATE_DOCBOOK") && - !Config_getBool("GENERATE_AUTOGEN_DEF") && - Config_getString("GENERATE_TAGFILE").isEmpty() + if (!ConfigImpl_getBool("GENERATE_HTML") && + !ConfigImpl_getBool("GENERATE_LATEX") && + !ConfigImpl_getBool("GENERATE_MAN") && + !ConfigImpl_getBool("GENERATE_RTF") && + !ConfigImpl_getBool("GENERATE_XML") && + !ConfigImpl_getBool("GENERATE_PERLMOD") && + !ConfigImpl_getBool("GENERATE_RTF") && + !ConfigImpl_getBool("GENERATE_DOCBOOK") && + !ConfigImpl_getBool("GENERATE_AUTOGEN_DEF") && + ConfigImpl_getString("GENERATE_TAGFILE").isEmpty() ) { - config_warn("No output formats selected! Set at least one of the main GENERATE_* options to YES.\n"); + warn_uncond("No output formats selected! Set at least one of the main GENERATE_* options to YES.\n"); } // check HTMLHELP creation requirements - if (!Config_getBool("GENERATE_HTML") && - Config_getBool("GENERATE_HTMLHELP")) + if (!ConfigImpl_getBool("GENERATE_HTML") && + ConfigImpl_getBool("GENERATE_HTMLHELP")) { - config_warn("GENERATE_HTMLHELP=YES requires GENERATE_HTML=YES.\n"); + warn_uncond("GENERATE_HTMLHELP=YES requires GENERATE_HTML=YES.\n"); } // check QHP creation requirements - if (Config_getBool("GENERATE_QHP")) + if (ConfigImpl_getBool("GENERATE_QHP")) { - if (Config_getString("QHP_NAMESPACE").isEmpty()) + if (ConfigImpl_getString("QHP_NAMESPACE").isEmpty()) { - config_err("GENERATE_QHP=YES requires QHP_NAMESPACE to be set. Using 'org.doxygen.doc' as default!.\n"); - Config_getString("QHP_NAMESPACE")="org.doxygen.doc"; + err("GENERATE_QHP=YES requires QHP_NAMESPACE to be set. Using 'org.doxygen.doc' as default!.\n"); + ConfigImpl_getString("QHP_NAMESPACE")="org.doxygen.doc"; } - if (Config_getString("QHP_VIRTUAL_FOLDER").isEmpty()) + if (ConfigImpl_getString("QHP_VIRTUAL_FOLDER").isEmpty()) { - config_err("GENERATE_QHP=YES requires QHP_VIRTUAL_FOLDER to be set. Using 'doc' as default!\n"); - Config_getString("QHP_VIRTUAL_FOLDER")="doc"; + err("GENERATE_QHP=YES requires QHP_VIRTUAL_FOLDER to be set. Using 'doc' as default!\n"); + ConfigImpl_getString("QHP_VIRTUAL_FOLDER")="doc"; } } - if (Config_getBool("OPTIMIZE_OUTPUT_JAVA") && Config_getBool("INLINE_INFO")) + if (ConfigImpl_getBool("OPTIMIZE_OUTPUT_JAVA") && ConfigImpl_getBool("INLINE_INFO")) { - // don't show inline info for Java output, since Java has no inline + // don't show inline info for Java output, since Java has no inline // concept. - Config_getBool("INLINE_INFO")=FALSE; + ConfigImpl_getBool("INLINE_INFO")=FALSE; } - int &depth = Config_getInt("MAX_DOT_GRAPH_DEPTH"); + int &depth = ConfigImpl_getInt("MAX_DOT_GRAPH_DEPTH"); if (depth==0) { depth=1000; } - int &hue = Config_getInt("HTML_COLORSTYLE_HUE"); + int &hue = ConfigImpl_getInt("HTML_COLORSTYLE_HUE"); if (hue<0) { hue=0; @@ -1504,7 +1636,7 @@ void Config::check() hue=hue%360; } - int &sat = Config_getInt("HTML_COLORSTYLE_SAT"); + int &sat = ConfigImpl_getInt("HTML_COLORSTYLE_SAT"); if (sat<0) { sat=0; @@ -1513,7 +1645,7 @@ void Config::check() { sat=255; } - int &gamma = Config_getInt("HTML_COLORSTYLE_GAMMA"); + int &gamma = ConfigImpl_getInt("HTML_COLORSTYLE_GAMMA"); if (gamma<40) { gamma=40; @@ -1523,16 +1655,16 @@ void Config::check() gamma=240; } - QCString mathJaxFormat = Config_getEnum("MATHJAX_FORMAT"); + QCString mathJaxFormat = ConfigImpl_getEnum("MATHJAX_FORMAT"); if (!mathJaxFormat.isEmpty() && mathJaxFormat!="HTML-CSS" && mathJaxFormat!="NativeMML" && mathJaxFormat!="SVG") { - config_err("Unsupported value for MATHJAX_FORMAT: Should be one of HTML-CSS, NativeMML, or SVG\n"); - Config_getEnum("MATHJAX_FORMAT")="HTML-CSS"; + err("Unsupported value for MATHJAX_FORMAT: Should be one of HTML-CSS, NativeMML, or SVG\n"); + ConfigImpl_getEnum("MATHJAX_FORMAT")="HTML-CSS"; } // add default words if needed - QStrList &annotationFromBrief = Config_getList("ABBREVIATE_BRIEF"); + QStrList &annotationFromBrief = ConfigImpl_getList("ABBREVIATE_BRIEF"); if (annotationFromBrief.isEmpty()) { annotationFromBrief.append("The $name class"); @@ -1549,21 +1681,21 @@ void Config::check() } // some default settings for vhdl - if (Config_getBool("OPTIMIZE_OUTPUT_VHDL") && - (Config_getBool("INLINE_INHERITED_MEMB") || - Config_getBool("INHERIT_DOCS") || - !Config_getBool("HIDE_SCOPE_NAMES") || - !Config_getBool("EXTRACT_PRIVATE") || - !Config_getBool("EXTRACT_PACKAGE") + if (ConfigImpl_getBool("OPTIMIZE_OUTPUT_VHDL") && + (ConfigImpl_getBool("INLINE_INHERITED_MEMB") || + ConfigImpl_getBool("INHERIT_DOCS") || + !ConfigImpl_getBool("HIDE_SCOPE_NAMES") || + !ConfigImpl_getBool("EXTRACT_PRIVATE") || + !ConfigImpl_getBool("EXTRACT_PACKAGE") ) ) { - bool b1 = Config_getBool("INLINE_INHERITED_MEMB"); - bool b2 = Config_getBool("INHERIT_DOCS"); - bool b3 = Config_getBool("HIDE_SCOPE_NAMES"); - bool b4 = Config_getBool("EXTRACT_PRIVATE"); - bool b5 = Config_getBool("SKIP_FUNCTION_MACROS"); - bool b6 = Config_getBool("EXTRACT_PACKAGE"); + bool b1 = ConfigImpl_getBool("INLINE_INHERITED_MEMB"); + bool b2 = ConfigImpl_getBool("INHERIT_DOCS"); + bool b3 = ConfigImpl_getBool("HIDE_SCOPE_NAMES"); + bool b4 = ConfigImpl_getBool("EXTRACT_PRIVATE"); + bool b5 = ConfigImpl_getBool("SKIP_FUNCTION_MACROS"); + bool b6 = ConfigImpl_getBool("EXTRACT_PACKAGE"); const char *s1,*s2,*s3,*s4,*s5,*s6; if (b1) s1=" INLINE_INHERITED_MEMB = NO (was YES)\n"; else s1=""; if (b2) s2=" INHERIT_DOCS = NO (was YES)\n"; else s2=""; @@ -1573,19 +1705,19 @@ void Config::check() if (!b6) s6=" EXTRACT_PACKAGE = YES (was NO)\n"; else s6=""; - config_warn("enabling OPTIMIZE_OUTPUT_VHDL assumes the following settings:\n" + warn_uncond("enabling OPTIMIZE_OUTPUT_VHDL assumes the following settings:\n" "%s%s%s%s%s%s",s1,s2,s3,s4,s5,s6 ); - Config_getBool("INLINE_INHERITED_MEMB") = FALSE; - Config_getBool("INHERIT_DOCS") = FALSE; - Config_getBool("HIDE_SCOPE_NAMES") = TRUE; - Config_getBool("EXTRACT_PRIVATE") = TRUE; - Config_getBool("ENABLE_PREPROCESSING") = FALSE; - Config_getBool("EXTRACT_PACKAGE") = TRUE; - } + ConfigImpl_getBool("INLINE_INHERITED_MEMB") = FALSE; + ConfigImpl_getBool("INHERIT_DOCS") = FALSE; + ConfigImpl_getBool("HIDE_SCOPE_NAMES") = TRUE; + ConfigImpl_getBool("EXTRACT_PRIVATE") = TRUE; + ConfigImpl_getBool("ENABLE_PREPROCESSING") = FALSE; + ConfigImpl_getBool("EXTRACT_PACKAGE") = TRUE; + } - checkFileName("GENERATE_TAGFILE"); + checkFileName(ConfigImpl_getString("GENERATE_TAGFILE"),"GENERATE_TAGFILE"); #if 0 // TODO: this breaks test 25; SOURCEBROWSER = NO and SOURCE_TOOLTIPS = YES. // So this and other regressions should be analysed and fixed before this can be enabled @@ -1599,140 +1731,50 @@ void Config::check() { ConfigOption * dep = Config::instance()->get(depName); if (dep->kind()==ConfigOption::O_Bool && - Config_getBool(depName)==FALSE) // dependent option is disabled + ConfigImpl_getBool("depName")==FALSE) // dependent option is disabled { if (option->kind()==ConfigOption::O_Bool) { printf("disabling option %s\n",option->name().data()); - Config_getBool(option->name())=FALSE; // also disable this option + ConfigImpl_getBool("option->name("))=FALSE; // also disable this option } } } } #endif + + ConfigValues::instance().init(); + } -void Config::init() +void Config::writeTemplate(FTextStream &t,bool shortList,bool update) { - QListIterator<ConfigOption> it = iterator(); - ConfigOption *option; - for (;(option=it.current());++it) - { - option->init(); - } - - // sanity check if all depends relations are valid - for (it.toFirst();(option=it.current());++it) - { - QCString depName = option->dependsOn(); - if (!depName.isEmpty()) - { - ConfigOption * opt = Config::instance()->get(depName); - if (opt==0) - { - config_warn("Config option '%s' has invalid depends relation on unknown option '%s'\n", - option->name().data(),depName.data()); - exit(1); - } - } - } + ConfigImpl::instance()->writeTemplate(t,shortList,update); } -void Config::create() +bool Config::parse(const char *fileName,bool update) { - if (m_initialized) return; - m_initialized = TRUE; - addConfigOptions(this); + return ConfigImpl::instance()->parse(fileName,update); } -static QCString configFileToString(const char *name) +void Config::postProcess(bool clearHeaderAndFooter) { - if (name==0 || name[0]==0) return 0; - QFile f; + ConfigImpl::instance()->substituteEnvironmentVars(); + ConfigImpl::instance()->convertStrToVal(); - bool fileOpened=FALSE; - if (name[0]=='-' && name[1]==0) // read from stdin + // avoid bootstrapping issues when the config file already + // refers to the files that we are supposed to parse. + if (clearHeaderAndFooter) { - fileOpened=f.open(IO_ReadOnly,stdin); - if (fileOpened) - { - const int bSize=4096; - QCString contents(bSize); - int totalSize=0; - int size; - while ((size=f.readBlock(contents.rawData()+totalSize,bSize))==bSize) - { - totalSize+=bSize; - contents.resize(totalSize+bSize); - } - totalSize+=size+2; - contents.resize(totalSize); - contents.at(totalSize-2)='\n'; // to help the scanner - contents.at(totalSize-1)='\0'; - return contents; - } + Config_getString(HTML_HEADER)=""; + Config_getString(HTML_FOOTER)=""; + Config_getString(LATEX_HEADER)=""; + Config_getString(LATEX_FOOTER)=""; } - else // read from file - { - QFileInfo fi(name); - if (!fi.exists() || !fi.isFile()) - { - config_err("file `%s' not found\n",name); - return ""; - } - f.setName(name); - fileOpened=f.open(IO_ReadOnly); - if (fileOpened) - { - int fsize=f.size(); - QCString contents(fsize+2); - f.readBlock(contents.rawData(),fsize); - f.close(); - if (fsize==0 || contents[fsize-1]=='\n') - contents[fsize]='\0'; - else - contents[fsize]='\n'; // to help the scanner - contents[fsize+1]='\0'; - return contents; - } - } - if (!fileOpened) - { - config_err("cannot open file `%s' for reading\n",name); - exit(1); - } - return ""; } -bool Config::parseString(const char *fn,const char *str,bool update) +void Config::deinit() { - config = Config::instance(); - inputString = str; - inputPosition = 0; - yyFileName = fn; - yyLineNr = 1; - includeStack.setAutoDelete(TRUE); - includeStack.clear(); - includeDepth = 0; - configYYrestart( configYYin ); - BEGIN( PreStart ); - config_upd = update; - configYYlex(); - config_upd = FALSE; - inputString = 0; - return TRUE; + ConfigImpl::instance()->deleteInstance(); } -bool Config::parse(const char *fn,bool update) -{ - int retval; - encoding = "UTF-8"; - printlex(yy_flex_debug, TRUE, __FILE__, fn); - retval = parseString(fn,configFileToString(fn), update); - printlex(yy_flex_debug, FALSE, __FILE__, fn); - return retval; -} - -extern "C" { // some bogus code to keep the compiler happy - //int configYYwrap() { return 1 ; } -} diff --git a/src/configoptions.h b/src/configoptions.h index 3979f7a..ec14bd2 100644 --- a/src/configoptions.h +++ b/src/configoptions.h @@ -16,8 +16,8 @@ #ifndef CONFIGOPTIONS #define CONFIGOPTIONS -class Config; +class ConfigImpl; -void addConfigOptions(Config *cfg); +void addConfigOptions(ConfigImpl *cfg); #endif diff --git a/src/context.cpp b/src/context.cpp index 2412010..67b4e12 100644 --- a/src/context.cpp +++ b/src/context.cpp @@ -332,22 +332,31 @@ TemplateVariant ConfigContext::get(const char *name) const TemplateVariant result; if (name) { - ConfigOption *option = Config::instance()->get(name); + const ConfigValues::Info *option = ConfigValues::instance().get(name); if (option) { - switch (option->kind()) - { - case ConfigOption::O_Bool: - return TemplateVariant(*((ConfigBool*)option)->valueRef()); - case ConfigOption::O_Int: - return TemplateVariant(*((ConfigInt*)option)->valueRef()); - case ConfigOption::O_Enum: - return TemplateVariant(*((ConfigEnum*)option)->valueRef()); - case ConfigOption::O_String: - return TemplateVariant(*((ConfigString*)option)->valueRef()); - case ConfigOption::O_List: - return p->fetchList(name,((ConfigList*)option)->valueRef()); - break; + switch (option->type) + { + case ConfigValues::Info::Bool: + { + bool b = ConfigValues::instance().*((ConfigValues::InfoBool*)option)->item; + return TemplateVariant(b); + } + case ConfigValues::Info::Int: + { + int i = ConfigValues::instance().*((ConfigValues::InfoInt*)option)->item; + return TemplateVariant(i); + } + case ConfigValues::Info::String: + { + QCString s = ConfigValues::instance().*((ConfigValues::InfoString*)option)->item; + return TemplateVariant(s); + } + case ConfigValues::Info::List: + { + const QStrList &l = ConfigValues::instance().*((ConfigValues::InfoList*)option)->item; + return p->fetchList(name,&l); + } default: break; } @@ -396,7 +405,7 @@ class DoxygenContext::Private private: struct Cachable { - Cachable() { maxJaxCodeFile=fileToString(Config_getString("MATHJAX_CODEFILE")); } + Cachable() { maxJaxCodeFile=fileToString(Config_getString(MATHJAX_CODEFILE)); } QCString maxJaxCodeFile; }; mutable Cachable m_cache; @@ -722,12 +731,12 @@ class TranslateContext::Private } TemplateVariant fileMembersDescription() const { - static bool extractAll = Config_getBool("EXTRACT_ALL"); + static bool extractAll = Config_getBool(EXTRACT_ALL); return theTranslator->trFileMembersDescription(extractAll); } TemplateVariant namespaceMembersDescription() const { - static bool extractAll = Config_getBool("EXTRACT_ALL"); + static bool extractAll = Config_getBool(EXTRACT_ALL); return theTranslator->trNamespaceMemberDescription(extractAll); } TemplateVariant classHierarchyDescription() const @@ -744,8 +753,8 @@ class TranslateContext::Private } TemplateVariant classMembersDescription() const { - static bool extractAll = Config_getBool("EXTRACT_ALL"); - static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); + static bool extractAll = Config_getBool(EXTRACT_ALL); + static bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); if (fortranOpt) { return theTranslator->trCompoundMembersDescriptionFortran(extractAll); @@ -893,17 +902,17 @@ class TranslateContext::Private } TemplateVariant fileListDescription() const { - bool extractAll = Config_getBool("EXTRACT_ALL"); + bool extractAll = Config_getBool(EXTRACT_ALL); return theTranslator->trFileListDescription(extractAll); } TemplateVariant modulesDescription() const { - bool extractAll = Config_getBool("EXTRACT_ALL"); + bool extractAll = Config_getBool(EXTRACT_ALL); return theTranslator->trModulesListDescription(extractAll); } TemplateVariant namespaceListDescription() const { - bool extractAll = Config_getBool("EXTRACT_ALL"); + bool extractAll = Config_getBool(EXTRACT_ALL); return theTranslator->trNamespaceListDescription(extractAll); } TemplateVariant directories() const @@ -916,8 +925,8 @@ class TranslateContext::Private } TemplateVariant functions() const { - static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); - static bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); + static bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); + static bool vhdlOpt = Config_getBool(OPTIMIZE_OUTPUT_VHDL); return fortranOpt ? theTranslator->trSubprograms() : vhdlOpt ? VhdlDocGen::trFunctionAndProc() : theTranslator->trFunctions(); @@ -1191,9 +1200,9 @@ class TranslateContext::Private init=TRUE; } - m_javaOpt = Config_getBool("OPTIMIZE_OUTPUT_JAVA"); - m_fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); - m_vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); + m_javaOpt = Config_getBool(OPTIMIZE_OUTPUT_JAVA); + m_fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); + m_vhdlOpt = Config_getBool(OPTIMIZE_OUTPUT_VHDL); } TemplateVariant get(const char *n) const { @@ -1296,7 +1305,7 @@ static TemplateVariant parseCode(MemberDef *md,const QCString &scopeName,const Q static TemplateVariant parseCode(FileDef *fd,const QCString &relPath) { - static bool filterSourceFiles = Config_getBool("FILTER_SOURCE_FILES"); + static bool filterSourceFiles = Config_getBool(FILTER_SOURCE_FILES); ParserInterface *pIntf = Doxygen::parserManager->getParser(fd->getDefFileExtension()); pIntf->resetCodeParserState(); QGString s; @@ -1430,7 +1439,7 @@ class DefinitionContext } QCString relPathAsString() const { - static bool createSubdirs = Config_getBool("CREATE_SUBDIRS"); + static bool createSubdirs = Config_getBool(CREATE_SUBDIRS); return createSubdirs ? QCString("../../") : QCString(""); } virtual TemplateVariant relPath() const @@ -1910,9 +1919,9 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private> TemplateVariant hasInheritanceDiagram() const { bool result=FALSE; - static bool haveDot = Config_getBool("HAVE_DOT"); - static bool classDiagrams = Config_getBool("CLASS_DIAGRAMS"); - static bool classGraph = Config_getBool("CLASS_GRAPH"); + static bool haveDot = Config_getBool(HAVE_DOT); + static bool classDiagrams = Config_getBool(CLASS_DIAGRAMS); + static bool classGraph = Config_getBool(CLASS_GRAPH); if (haveDot && (classDiagrams || classGraph)) { DotClassGraph *cg = getClassGraph(); @@ -1927,9 +1936,9 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private> TemplateVariant inheritanceDiagram() const { QGString result; - static bool haveDot = Config_getBool("HAVE_DOT"); - static bool classDiagrams = Config_getBool("CLASS_DIAGRAMS"); - static bool classGraph = Config_getBool("CLASS_GRAPH"); + static bool haveDot = Config_getBool(HAVE_DOT); + static bool classDiagrams = Config_getBool(CLASS_DIAGRAMS); + static bool classGraph = Config_getBool(CLASS_GRAPH); if (haveDot && (classDiagrams || classGraph)) { DotClassGraph *cg = getClassGraph(); @@ -2006,12 +2015,12 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private> } TemplateVariant hasCollaborationDiagram() const { - static bool haveDot = Config_getBool("HAVE_DOT"); + static bool haveDot = Config_getBool(HAVE_DOT); return haveDot && !getCollaborationGraph()->isTrivial(); } TemplateVariant collaborationDiagram() const { - static bool haveDot = Config_getBool("HAVE_DOT"); + static bool haveDot = Config_getBool(HAVE_DOT); QGString result; if (haveDot) { @@ -3009,13 +3018,13 @@ class FileContext::Private : public DefinitionContext<FileContext::Private> } TemplateVariant hasIncludeGraph() const { - static bool haveDot = Config_getBool("HAVE_DOT"); + static bool haveDot = Config_getBool(HAVE_DOT); DotInclDepGraph *incGraph = getIncludeGraph(); return (haveDot && !incGraph->isTooBig() && !incGraph->isTrivial()); } TemplateVariant includeGraph() const { - static bool haveDot = Config_getBool("HAVE_DOT"); + static bool haveDot = Config_getBool(HAVE_DOT); QGString result; if (haveDot) { @@ -3061,13 +3070,13 @@ class FileContext::Private : public DefinitionContext<FileContext::Private> } TemplateVariant hasIncludedByGraph() const { - static bool haveDot = Config_getBool("HAVE_DOT"); + static bool haveDot = Config_getBool(HAVE_DOT); DotInclDepGraph *incGraph = getIncludedByGraph(); return (haveDot && !incGraph->isTooBig() && !incGraph->isTrivial()); } TemplateVariant includedByGraph() const { - static bool haveDot = Config_getBool("HAVE_DOT"); + static bool haveDot = Config_getBool(HAVE_DOT); QGString result; if (haveDot) { @@ -3470,8 +3479,8 @@ class DirContext::Private : public DefinitionContext<DirContext::Private> TemplateVariant hasDirGraph() const { bool result=FALSE; - static bool haveDot = Config_getBool("HAVE_DOT"); - static bool dirGraph = Config_getBool("DIRECTORY_GRAPH"); + static bool haveDot = Config_getBool(HAVE_DOT); + static bool dirGraph = Config_getBool(DIRECTORY_GRAPH); if (haveDot && dirGraph) { DotDirDeps *graph = getDirDepsGraph(); @@ -3482,8 +3491,8 @@ class DirContext::Private : public DefinitionContext<DirContext::Private> TemplateVariant dirGraph() const { QGString result; - static bool haveDot = Config_getBool("HAVE_DOT"); - static bool dirGraph = Config_getBool("DIRECTORY_GRAPH"); + static bool haveDot = Config_getBool(HAVE_DOT); + static bool dirGraph = Config_getBool(DIRECTORY_GRAPH); if (haveDot && dirGraph) { DotDirDeps *graph = getDirDepsGraph(); @@ -3785,7 +3794,7 @@ class TextGeneratorLatex : public TextGeneratorIntf const char *anchor,const char *text ) const { - static bool pdfHyperlinks = Config_getBool("PDF_HYPERLINKS"); + static bool pdfHyperlinks = Config_getBool(PDF_HYPERLINKS); if (!ref && pdfHyperlinks) { m_ts << "\\hyperlink{"; @@ -4881,7 +4890,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private> } TemplateVariant hasCallGraph() const { - static bool haveDot = Config_getBool("HAVE_DOT"); + static bool haveDot = Config_getBool(HAVE_DOT); if (m_memberDef->hasCallGraph() && haveDot && (m_memberDef->isFunction() || m_memberDef->isSlot() || m_memberDef->isSignal())) { @@ -4941,7 +4950,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private> } TemplateVariant hasCallerGraph() const { - static bool haveDot = Config_getBool("HAVE_DOT"); + static bool haveDot = Config_getBool(HAVE_DOT); if (m_memberDef->hasCallerGraph() && haveDot && (m_memberDef->isFunction() || m_memberDef->isSlot() || m_memberDef->isSignal())) { @@ -5200,8 +5209,8 @@ class ModuleContext::Private : public DefinitionContext<ModuleContext::Private> TemplateVariant hasGroupGraph() const { bool result=FALSE; - static bool haveDot = Config_getBool("HAVE_DOT"); - static bool groupGraphs = Config_getBool("GROUP_GRAPHS"); + static bool haveDot = Config_getBool(HAVE_DOT); + static bool groupGraphs = Config_getBool(GROUP_GRAPHS); if (haveDot && groupGraphs) { DotGroupCollaboration *graph = getGroupGraph(); @@ -5212,8 +5221,8 @@ class ModuleContext::Private : public DefinitionContext<ModuleContext::Private> TemplateVariant groupGraph() const { QGString result; - static bool haveDot = Config_getBool("HAVE_DOT"); - static bool groupGraphs = Config_getBool("GROUP_GRAPHS"); + static bool haveDot = Config_getBool(HAVE_DOT); + static bool groupGraphs = Config_getBool(GROUP_GRAPHS); if (haveDot && groupGraphs) { DotGroupCollaboration *graph = getGroupGraph(); @@ -5792,8 +5801,8 @@ class ClassIndexContext::Private } TemplateVariant title() const { - static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); - static bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); + static bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); + static bool vhdlOpt = Config_getBool(OPTIMIZE_OUTPUT_VHDL); if (fortranOpt) { return theTranslator->trDataTypes(); @@ -5879,7 +5888,7 @@ static int computeNumNodesAtLevel(const TemplateStructIntf *s,int level,int maxL static int computePreferredDepth(const TemplateListIntf *list,int maxDepth) { - int preferredNumEntries = Config_getInt("HTML_INDEX_NUM_ENTRIES"); + int preferredNumEntries = Config_getInt(HTML_INDEX_NUM_ENTRIES); int preferredDepth=1; if (preferredNumEntries>0) { @@ -5991,7 +6000,7 @@ class ClassHierarchyContext::Private } TemplateVariant title() const { - static bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); + static bool vhdlOpt = Config_getBool(OPTIMIZE_OUTPUT_VHDL); if (vhdlOpt) { return VhdlDocGen::trDesignUnitHierarchy(); @@ -6227,7 +6236,7 @@ class NestingNodeContext::Private } QCString relPathAsString() const { - static bool createSubdirs = Config_getBool("CREATE_SUBDIRS"); + static bool createSubdirs = Config_getBool(CREATE_SUBDIRS); return createSubdirs ? QCString("../../") : QCString(""); } TemplateVariant brief() const @@ -6512,7 +6521,7 @@ class NestingContext::Private : public GenericNodeListContext GroupDef *gd; for (gli.toFirst();(gd=gli.current());++gli) { - static bool externalGroups = Config_getBool("EXTERNAL_GROUPS"); + static bool externalGroups = Config_getBool(EXTERNAL_GROUPS); if (!gd->isASubGroup() && gd->isVisible() && (!gd->isReference() || externalGroups) ) @@ -6744,8 +6753,8 @@ class ClassTreeContext::Private } TemplateVariant title() const { - static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); - static bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); + static bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); + static bool vhdlOpt = Config_getBool(OPTIMIZE_OUTPUT_VHDL); if (fortranOpt) { return theTranslator->trCompoundListFortran(); @@ -6912,9 +6921,9 @@ class NamespaceTreeContext::Private } TemplateVariant title() const { - static bool javaOpt = Config_getBool("OPTIMIZE_OUTPUT_JAVA"); - static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); - static bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); + static bool javaOpt = Config_getBool(OPTIMIZE_OUTPUT_JAVA); + static bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); + static bool vhdlOpt = Config_getBool(OPTIMIZE_OUTPUT_VHDL); if (javaOpt || vhdlOpt) { return theTranslator->trPackages(); @@ -7668,7 +7677,7 @@ class NavPathElemContext::Private } QCString relPathAsString() const { - static bool createSubdirs = Config_getBool("CREATE_SUBDIRS"); + static bool createSubdirs = Config_getBool(CREATE_SUBDIRS); return createSubdirs ? QCString("../../") : QCString(""); } TemplateVariant externalReference() const @@ -8302,8 +8311,8 @@ class InheritanceGraphContext::Private TemplateVariant graph() const { QGString result; - static bool haveDot = Config_getBool("HAVE_DOT"); - static bool graphicalHierarchy = Config_getBool("GRAPHICAL_HIERARCHY"); + static bool haveDot = Config_getBool(HAVE_DOT); + static bool graphicalHierarchy = Config_getBool(GRAPHICAL_HIERARCHY); if (haveDot && graphicalHierarchy) { FTextStream t(&result); @@ -8637,7 +8646,7 @@ class AllMembersListContext::Private : public GenericNodeListContext { if (ml) { - static bool hideUndocMembers = Config_getBool("HIDE_UNDOC_MEMBERS"); + static bool hideUndocMembers = Config_getBool(HIDE_UNDOC_MEMBERS); MemberNameInfoSDict::Iterator mnii(*ml); MemberNameInfo *mni; for (mnii.toFirst();(mni=mnii.current());++mnii) @@ -10157,18 +10166,18 @@ void generateOutputViaTemplate() //%% string space ctx->set("space"," "); - //if (Config_getBool("GENERATE_HTML")) + //if (Config_getBool(GENERATE_HTML)) { // render HTML output Template *tpl = e.loadByName("htmllayout.tpl",1); if (tpl) { g_globals.outputFormat = ContextOutputFormat_Html; g_globals.dynSectionId = 0; - g_globals.outputDir = Config_getString("HTML_OUTPUT"); + g_globals.outputDir = Config_getString(HTML_OUTPUT); QDir dir(g_globals.outputDir); createSubDirs(dir); HtmlEscaper htmlEsc; - ctx->setEscapeIntf(Config_getString("HTML_FILE_EXTENSION"),&htmlEsc); + ctx->setEscapeIntf(Config_getString(HTML_FILE_EXTENSION),&htmlEsc); HtmlSpaceless spl; ctx->setSpacelessIntf(&spl); ctx->setOutputDirectory(g_globals.outputDir); @@ -10180,7 +10189,7 @@ void generateOutputViaTemplate() // TODO: clean index before each run... - //if (Config_getBool("GENERATE_LATEX")) + //if (Config_getBool(GENERATE_LATEX)) if (0) { // render LaTeX output Template *tpl = e.loadByName("latexlayout.tpl",1); @@ -10188,7 +10197,7 @@ void generateOutputViaTemplate() { g_globals.outputFormat = ContextOutputFormat_Latex; g_globals.dynSectionId = 0; - g_globals.outputDir = Config_getString("LATEX_OUTPUT"); + g_globals.outputDir = Config_getString(LATEX_OUTPUT); QDir dir(g_globals.outputDir); createSubDirs(dir); LatexEscaper latexEsc; diff --git a/src/defgen.cpp b/src/defgen.cpp index 90ae0a2..cd69ab2 100644 --- a/src/defgen.cpp +++ b/src/defgen.cpp @@ -557,7 +557,7 @@ void generateDEFForFile(FileDef *fd,FTextStream &t) void generateDEF() { - QCString outputDirectory = Config_getString("OUTPUT_DIRECTORY"); + QCString outputDirectory = Config_getString(OUTPUT_DIRECTORY); if (outputDirectory.isEmpty()) { outputDirectory=QDir::currentDirPath().utf8(); diff --git a/src/define.cpp b/src/define.cpp index 121f5cb..b5d9170 100644 --- a/src/define.cpp +++ b/src/define.cpp @@ -50,5 +50,5 @@ Define::~Define() bool Define::hasDocumentation() { - return definition && (doc || Config_getBool("EXTRACT_ALL")); + return definition && (doc || Config_getBool(EXTRACT_ALL)); } diff --git a/src/definition.cpp b/src/definition.cpp index d04dd59..ec30cd5 100644 --- a/src/definition.cpp +++ b/src/definition.cpp @@ -149,7 +149,7 @@ void DefinitionImpl::init(const char *df, const char *n) static bool matchExcludedSymbols(const char *name) { - static QStrList &exclSyms = Config_getList("EXCLUDE_SYMBOLS"); + static QStrList &exclSyms = Config_getList(EXCLUDE_SYMBOLS); if (exclSyms.count()==0) return FALSE; // nothing specified const char *pat = exclSyms.first(); QCString symName = name; @@ -206,7 +206,7 @@ static bool matchExcludedSymbols(const char *name) void Definition::addToMap(const char *name,Definition *d) { - bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); + bool vhdlOpt = Config_getBool(OPTIMIZE_OUTPUT_VHDL); QCString symbolName = name; int index=computeQualifiedIndex(symbolName); if (!vhdlOpt && index!=-1) symbolName=symbolName.mid(index+2); @@ -631,7 +631,7 @@ static bool lastCharIsMultibyte(const QCString &s) void Definition::_setBriefDescription(const char *b,const char *briefFile,int briefLine) { - static QCString outputLanguage = Config_getEnum("OUTPUT_LANGUAGE"); + static QCString outputLanguage = Config_getEnum(OUTPUT_LANGUAGE); static bool needsDot = outputLanguage!="Japanese" && outputLanguage!="Chinese" && outputLanguage!="Korean"; @@ -728,8 +728,8 @@ void Definition::setInbodyDocumentation(const char *d,const char *inbodyFile,int bool readCodeFragment(const char *fileName, int &startLine,int &endLine,QCString &result) { - static bool filterSourceFiles = Config_getBool("FILTER_SOURCE_FILES"); - static int tabSize = Config_getInt("TAB_SIZE"); + static bool filterSourceFiles = Config_getBool(FILTER_SOURCE_FILES); + static int tabSize = Config_getInt(TAB_SIZE); //printf("readCodeFragment(%s,%d,%d)\n",fileName,startLine,endLine); if (fileName==0 || fileName[0]==0) return FALSE; // not a valid file name QCString filter = getFileFilter(fileName,TRUE); @@ -886,7 +886,7 @@ QCString Definition::getSourceFileBase() const { ASSERT(definitionType()!=Definition::TypeFile); // file overloads this method QCString fn; - static bool sourceBrowser = Config_getBool("SOURCE_BROWSER"); + static bool sourceBrowser = Config_getBool(SOURCE_BROWSER); if (sourceBrowser && m_impl->body && m_impl->body->startLine!=-1 && m_impl->body->fileDef) { @@ -917,8 +917,8 @@ QCString Definition::getSourceAnchor() const /*! Write a reference to the source code defining this definition */ void Definition::writeSourceDef(OutputList &ol,const char *) { - static bool latexSourceCode = Config_getBool("LATEX_SOURCE_CODE"); - static bool rtfSourceCode = Config_getBool("RTF_SOURCE_CODE"); + static bool latexSourceCode = Config_getBool(LATEX_SOURCE_CODE); + static bool rtfSourceCode = Config_getBool(RTF_SOURCE_CODE); ol.pushGeneratorState(); //printf("Definition::writeSourceRef %d %p\n",bodyLine,bodyDef); QCString fn = getSourceFileBase(); @@ -1096,7 +1096,7 @@ bool Definition::hasSources() const /*! Write code of this definition into the documentation */ void Definition::writeInlineCode(OutputList &ol,const char *scopeName) { - static bool inlineSources = Config_getBool("INLINE_SOURCES"); + static bool inlineSources = Config_getBool(INLINE_SOURCES); ol.pushGeneratorState(); //printf("Source Fragment %s: %d-%d bodyDef=%p\n",name().data(), // m_startBodyLine,m_endBodyLine,m_bodyDef); @@ -1142,10 +1142,10 @@ void Definition::writeInlineCode(OutputList &ol,const char *scopeName) void Definition::_writeSourceRefList(OutputList &ol,const char *scopeName, const QCString &text,MemberSDict *members,bool /*funcOnly*/) { - static bool latexSourceCode = Config_getBool("LATEX_SOURCE_CODE"); - static bool rtfSourceCode = Config_getBool("RTF_SOURCE_CODE"); - static bool sourceBrowser = Config_getBool("SOURCE_BROWSER"); - static bool refLinkSource = Config_getBool("REFERENCES_LINK_SOURCE"); + static bool latexSourceCode = Config_getBool(LATEX_SOURCE_CODE); + static bool rtfSourceCode = Config_getBool(RTF_SOURCE_CODE); + static bool sourceBrowser = Config_getBool(SOURCE_BROWSER); + static bool refLinkSource = Config_getBool(REFERENCES_LINK_SOURCE); ol.pushGeneratorState(); if (members) { @@ -1276,7 +1276,7 @@ void Definition::_writeSourceRefList(OutputList &ol,const char *scopeName, void Definition::writeSourceReffedBy(OutputList &ol,const char *scopeName) { - if (Config_getBool("REFERENCED_BY_RELATION")) + if (Config_getBool(REFERENCED_BY_RELATION)) { _writeSourceRefList(ol,scopeName,theTranslator->trReferencedBy(),m_impl->sourceRefByDict,FALSE); } @@ -1284,7 +1284,7 @@ void Definition::writeSourceReffedBy(OutputList &ol,const char *scopeName) void Definition::writeSourceRefs(OutputList &ol,const char *scopeName) { - if (Config_getBool("REFERENCES_RELATION")) + if (Config_getBool(REFERENCES_RELATION)) { _writeSourceRefList(ol,scopeName,theTranslator->trReferences(),m_impl->sourceRefsDict,TRUE); } @@ -1292,8 +1292,8 @@ void Definition::writeSourceRefs(OutputList &ol,const char *scopeName) bool Definition::hasDocumentation() const { - static bool extractAll = Config_getBool("EXTRACT_ALL"); - //static bool sourceBrowser = Config_getBool("SOURCE_BROWSER"); + static bool extractAll = Config_getBool(EXTRACT_ALL); + //static bool sourceBrowser = Config_getBool(SOURCE_BROWSER); bool hasDocs = (m_impl->details && !m_impl->details->doc.isEmpty()) || // has detailed docs (m_impl->brief && !m_impl->brief->doc.isEmpty()) || // has brief description @@ -1741,7 +1741,7 @@ QCString abbreviate(const char *s,const char *name) result=result.left(result.length()-1); // strip any predefined prefix - QStrList &briefDescAbbrev = Config_getList("ABBREVIATE_BRIEF"); + QStrList &briefDescAbbrev = Config_getList(ABBREVIATE_BRIEF); const char *p = briefDescAbbrev.first(); while (p) { @@ -1941,7 +1941,7 @@ void Definition::_setSymbolName(const QCString &name) bool Definition::hasBriefDescription() const { - static bool briefMemberDesc = Config_getBool("BRIEF_MEMBER_DESC"); + static bool briefMemberDesc = Config_getBool(BRIEF_MEMBER_DESC); return !briefDescription().isEmpty() && briefMemberDesc; } diff --git a/src/dia.cpp b/src/dia.cpp index 347acba..5adbc7c 100644 --- a/src/dia.cpp +++ b/src/dia.cpp @@ -37,7 +37,7 @@ void writeDiaGraphFromFile(const char *inFile,const char *outDir, // go to the html output directory (i.e. path) QDir::setCurrent(outDir); //printf("Going to dir %s\n",QDir::currentDirPath().data()); - QCString diaExe = Config_getString("DIA_PATH")+"dia"+portable_commandExtension(); + QCString diaExe = Config_getString(DIA_PATH)+"dia"+portable_commandExtension(); QCString diaArgs; QCString extension; diaArgs+="-n "; @@ -69,7 +69,7 @@ void writeDiaGraphFromFile(const char *inFile,const char *outDir, goto error; } portable_sysTimerStop(); - if ( (format==DIA_EPS) && (Config_getBool("USE_PDFLATEX")) ) + if ( (format==DIA_EPS) && (Config_getBool(USE_PDFLATEX)) ) { QCString epstopdfArgs(maxCmdLine); epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"", diff --git a/src/diagram.cpp b/src/diagram.cpp index 8a6ccf6..42792ad 100644 --- a/src/diagram.cpp +++ b/src/diagram.cpp @@ -321,7 +321,7 @@ QCString DiagramItem::label() const { result=classDef->displayName(); } - if (Config_getBool("HIDE_SCOPE_NAMES")) result=stripScope(result); + if (Config_getBool(HIDE_SCOPE_NAMES)) result=stripScope(result); return result; } @@ -1332,7 +1332,7 @@ void ClassDiagram::writeFigure(FTextStream &output,const char *path, super->drawConnectors(t,0,FALSE,FALSE,baseRows,superRows,0,0); f1.close(); - if (Config_getBool("USE_PDFLATEX")) + if (Config_getBool(USE_PDFLATEX)) { QCString epstopdfArgs(4096); epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"", diff --git a/src/dirdef.cpp b/src/dirdef.cpp index ddd0c37..b770ba9 100644 --- a/src/dirdef.cpp +++ b/src/dirdef.cpp @@ -20,7 +20,7 @@ static int g_dirCount=0; DirDef::DirDef(const char *path) : Definition(path,1,1,path), visited(FALSE) { - bool fullPathNames = Config_getBool("FULL_PATH_NAMES"); + bool fullPathNames = Config_getBool(FULL_PATH_NAMES); // get display name (stipping the paths mentioned in STRIP_FROM_PATH) // get short name (last part of path) m_shortName = path; @@ -119,7 +119,7 @@ QCString DirDef::getOutputFileBase() const void DirDef::writeDetailedDescription(OutputList &ol,const QCString &title) { - if ((!briefDescription().isEmpty() && Config_getBool("REPEAT_BRIEF")) || + if ((!briefDescription().isEmpty() && Config_getBool(REPEAT_BRIEF)) || !documentation().isEmpty()) { ol.pushGeneratorState(); @@ -135,12 +135,12 @@ void DirDef::writeDetailedDescription(OutputList &ol,const QCString &title) ol.endGroupHeader(); // repeat brief description - if (!briefDescription().isEmpty() && Config_getBool("REPEAT_BRIEF")) + if (!briefDescription().isEmpty() && Config_getBool(REPEAT_BRIEF)) { ol.generateDoc(briefFile(),briefLine(),this,0,briefDescription(),FALSE,FALSE); } // separator between brief and details - if (!briefDescription().isEmpty() && Config_getBool("REPEAT_BRIEF") && + if (!briefDescription().isEmpty() && Config_getBool(REPEAT_BRIEF) && !documentation().isEmpty()) { ol.pushGeneratorState(); @@ -164,7 +164,7 @@ void DirDef::writeDetailedDescription(OutputList &ol,const QCString &title) void DirDef::writeBriefDescription(OutputList &ol) { - if (!briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC")) + if (!briefDescription().isEmpty() && Config_getBool(BRIEF_MEMBER_DESC)) { DocRoot *rootNode = validatingParseDoc( briefFile(),briefLine(),this,0,briefDescription(),TRUE,FALSE); @@ -177,7 +177,7 @@ void DirDef::writeBriefDescription(OutputList &ol) ol.writeString(" \n"); ol.enable(OutputGenerator::RTF); - if (Config_getBool("REPEAT_BRIEF") || + if (Config_getBool(REPEAT_BRIEF) || !documentation().isEmpty() ) { @@ -198,7 +198,7 @@ void DirDef::writeBriefDescription(OutputList &ol) void DirDef::writeDirectoryGraph(OutputList &ol) { // write graph dependency graph - if (Config_getBool("DIRECTORY_GRAPH") && Config_getBool("HAVE_DOT")) + if (Config_getBool(DIRECTORY_GRAPH) && Config_getBool(HAVE_DOT)) { DotDirDeps dirDep(this); if (!dirDep.isTrivial()) @@ -235,7 +235,7 @@ void DirDef::writeSubDirList(OutputList &ol) ol.insertMemberAlign(); ol.writeObjectLink(dd->getReference(),dd->getOutputFileBase(),0,dd->shortName()); ol.endMemberItem(); - if (!dd->briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC")) + if (!dd->briefDescription().isEmpty() && Config_getBool(BRIEF_MEMBER_DESC)) { ol.startMemberDescription(dd->getOutputFileBase()); ol.generateDoc(briefFile(),briefLine(),dd,0,dd->briefDescription(), @@ -295,7 +295,7 @@ void DirDef::writeFileList(OutputList &ol) ol.popGeneratorState(); } ol.endMemberItem(); - if (!fd->briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC")) + if (!fd->briefDescription().isEmpty() && Config_getBool(BRIEF_MEMBER_DESC)) { ol.startMemberDescription(fd->getOutputFileBase()); ol.generateDoc(briefFile(),briefLine(),fd,0,fd->briefDescription(), @@ -330,7 +330,7 @@ QCString DirDef::shortTitle() const bool DirDef::hasDetailedDescription() const { - static bool repeatBrief = Config_getBool("REPEAT_BRIEF"); + static bool repeatBrief = Config_getBool(REPEAT_BRIEF); return (!briefDescription().isEmpty() && repeatBrief) || !documentation().isEmpty(); } @@ -383,7 +383,7 @@ void DirDef::writeTagFile(FTextStream &tagFile) void DirDef::writeDocumentation(OutputList &ol) { - static bool generateTreeView = Config_getBool("GENERATE_TREEVIEW"); + static bool generateTreeView = Config_getBool(GENERATE_TREEVIEW); ol.pushGeneratorState(); QCString title=theTranslator->trDirReference(m_dispName); @@ -679,7 +679,7 @@ bool DirDef::matchPath(const QCString &path,QStrList &l) } /*! strip part of \a path if it matches - * one of the paths in the Config_getList("STRIP_FROM_PATH") list + * one of the paths in the Config_getList(STRIP_FROM_PATH) list */ DirDef *DirDef::mergeDirectoryInTree(const QCString &path) { @@ -689,7 +689,7 @@ DirDef *DirDef::mergeDirectoryInTree(const QCString &path) while ((i=path.find('/',p))!=-1) { QCString part=path.left(i+1); - if (!matchPath(part,Config_getList("STRIP_FROM_PATH")) && (part!="/" && part!="//")) + if (!matchPath(part,Config_getList(STRIP_FROM_PATH)) && (part!="/" && part!="//")) { dir=createNewDir(part); } @@ -731,7 +731,7 @@ static void writePartialFilePath(OutputList &ol,const DirDef *root,const FileDef void DirRelation::writeDocumentation(OutputList &ol) { - static bool generateTreeView = Config_getBool("GENERATE_TREEVIEW"); + static bool generateTreeView = Config_getBool(GENERATE_TREEVIEW); ol.pushGeneratorState(); ol.disableAllBut(OutputGenerator::Html); @@ -947,7 +947,7 @@ void generateDirDocs(OutputList &ol) { dir->writeDocumentation(ol); } - if (Config_getBool("DIRECTORY_GRAPH")) + if (Config_getBool(DIRECTORY_GRAPH)) { SDict<DirRelation>::Iterator rdi(Doxygen::dirRelations); DirRelation *dr; diff --git a/src/docbookgen.cpp b/src/docbookgen.cpp index ac00e1f..345629e 100644 --- a/src/docbookgen.cpp +++ b/src/docbookgen.cpp @@ -116,7 +116,7 @@ inline void writeDocbookCodeString(FTextStream &t,const char *s, int &col) { case '\t': { - static int tabSize = Config_getInt("TAB_SIZE"); + static int tabSize = Config_getInt(TAB_SIZE); int spacesToNextTabStop = tabSize - (col%tabSize); col+=spacesToNextTabStop; while (spacesToNextTabStop--) t << " "; @@ -355,7 +355,7 @@ void writeDocbookCodeBlock(FTextStream &t,FileDef *fd) DocbookCodeGenerator *docbookGen = new DocbookCodeGenerator(t); pIntf->parseCode(*docbookGen, // codeOutIntf 0, // scopeName - fileToString(fd->absFilePath(),Config_getBool("FILTER_SOURCE_FILES")), + fileToString(fd->absFilePath(),Config_getBool(FILTER_SOURCE_FILES)), langExt, // lang FALSE, // isExampleBlock 0, // exampleName @@ -372,7 +372,7 @@ void writeDocbookCodeBlock(FTextStream &t,FileDef *fd) static QCString classOutputFileBase(ClassDef *cd) { - //static bool inlineGroupedClasses = Config_getBool("INLINE_GROUPED_CLASSES"); + //static bool inlineGroupedClasses = Config_getBool(INLINE_GROUPED_CLASSES); //if (inlineGroupedClasses && cd->partOfGroups()!=0) return cd->getOutputFileBase(); //else @@ -381,7 +381,7 @@ static QCString classOutputFileBase(ClassDef *cd) static QCString memberOutputFileBase(MemberDef *md) { - //static bool inlineGroupedClasses = Config_getBool("INLINE_GROUPED_CLASSES"); + //static bool inlineGroupedClasses = Config_getBool(INLINE_GROUPED_CLASSES); //if (inlineGroupedClasses && md->getClassDef() && md->getClassDef()->partOfGroups()!=0) // return md->getClassDef()->getDocbookOutputFileBase(); //else @@ -663,7 +663,7 @@ static void generateDocbookForMember(MemberDef *md,FTextStream &t,Definition *de writeDocbookString(t,emd->name()); t << "</term>" << endl; t << " <listitem>" << endl; - if(Config_getBool("REPEAT_BRIEF")) + if(Config_getBool(REPEAT_BRIEF)) { t << " <para>"; writeDocbookString(t,emd->briefDescription()); @@ -706,7 +706,7 @@ static void generateDocbookForMember(MemberDef *md,FTextStream &t,Definition *de } t << "_1" << md->anchor() << "\">" << endl; t << " <title>" << convertToXML(md->definition()) << "</title>"; - if(Config_getBool("REPEAT_BRIEF")) + if(Config_getBool(REPEAT_BRIEF)) { t << " <emphasis>"; writeDocbookString(t,md->briefDescription()); @@ -730,7 +730,7 @@ static void generateDocbookForMember(MemberDef *md,FTextStream &t,Definition *de } t << "_1" << md->anchor() << "\">" << endl; t << " <title>" << convertToXML(md->definition()) << " " << convertToXML(md->argsString()) << "</title>"; - if(Config_getBool("REPEAT_BRIEF")) + if(Config_getBool(REPEAT_BRIEF)) { t << " <emphasis>"; writeDocbookString(t,md->briefDescription()); @@ -795,7 +795,7 @@ static void generateDocbookForMember(MemberDef *md,FTextStream &t,Definition *de } t << "_1" << md->anchor() << "\">" << endl; t << " <title>" << convertToXML(md->definition()) << "</title>"; - if(Config_getBool("REPEAT_BRIEF")) + if(Config_getBool(REPEAT_BRIEF)) { t << " <emphasis>"; writeDocbookString(t,md->briefDescription()); @@ -849,7 +849,7 @@ static void generateDocbookSection(Definition *d,FTextStream &t,MemberList *ml,c { for (mli.toFirst();(md=mli.current());++mli) { - if (md->documentation().isEmpty() && !Config_getBool("REPEAT_BRIEF")) + if (md->documentation().isEmpty() && !Config_getBool(REPEAT_BRIEF)) { continue; } @@ -892,7 +892,7 @@ static void generateDocbookSection(Definition *d,FTextStream &t,MemberList *ml,c // to prevent this duplication in the Docbook output, we filter those here. if (d->definitionType()!=Definition::TypeFile || md->getNamespaceDef()==0) { - if (detailed && md->documentation().isEmpty() && !Config_getBool("REPEAT_BRIEF")) + if (detailed && md->documentation().isEmpty() && !Config_getBool(REPEAT_BRIEF)) { continue; } @@ -1137,7 +1137,7 @@ static void generateDocbookForClass(ClassDef *cd,FTextStream &ti) //Add the file Documentation info to index file ti << " <xi:include href=\"" << fileDocbook << "\" xmlns:xi=\"http://www.w3.org/2001/XInclude\"/>" << endl; - QCString outputDirectory = Config_getString("DOCBOOK_OUTPUT"); + QCString outputDirectory = Config_getString(DOCBOOK_OUTPUT); QCString fileName=outputDirectory+"/"+ classOutputFileBase(cd)+".xml"; QCString relPath = relativePathToRoot(fileName); QFile f(fileName); @@ -1194,18 +1194,18 @@ static void generateDocbookForClass(ClassDef *cd,FTextStream &ti) } } - if (Config_getBool("HAVE_DOT") && (Config_getBool("CLASS_DIAGRAMS") || Config_getBool("CLASS_GRAPH"))) + if (Config_getBool(HAVE_DOT) && (Config_getBool(CLASS_DIAGRAMS) || Config_getBool(CLASS_GRAPH))) { t << "<para>Inheritance diagram for " << convertToXML(cd->name()) << "</para>" << endl; DotClassGraph inheritanceGraph(cd,DotNode::Inheritance); - inheritanceGraph.writeGraph(t,GOF_BITMAP,EOF_DocBook,Config_getString("DOCBOOK_OUTPUT"),fileName,relPath,TRUE,FALSE); + inheritanceGraph.writeGraph(t,GOF_BITMAP,EOF_DocBook,Config_getString(DOCBOOK_OUTPUT),fileName,relPath,TRUE,FALSE); } - if (Config_getBool("HAVE_DOT") && Config_getBool("COLLABORATION_GRAPH")) + if (Config_getBool(HAVE_DOT) && Config_getBool(COLLABORATION_GRAPH)) { t << "<para>Collaboration diagram for " << convertToXML(cd->name()) << "</para>" << endl; DotClassGraph collaborationGraph(cd,DotNode::Collaboration); - collaborationGraph.writeGraph(t,GOF_BITMAP,EOF_DocBook,Config_getString("DOCBOOK_OUTPUT"),fileName,relPath,TRUE,FALSE); + collaborationGraph.writeGraph(t,GOF_BITMAP,EOF_DocBook,Config_getString(DOCBOOK_OUTPUT),fileName,relPath,TRUE,FALSE); } writeInnerClasses(cd->getClassSDict(),t); @@ -1233,7 +1233,7 @@ static void generateDocbookForClass(ClassDef *cd,FTextStream &ti) } } - if(Config_getBool("REPEAT_BRIEF")) + if(Config_getBool(REPEAT_BRIEF)) { if (cd->briefDescription()) { @@ -1316,7 +1316,7 @@ static void generateDocbookForNamespace(NamespaceDef *nd,FTextStream &ti) //Add the file Documentation info to index file ti << " <xi:include href=\"" << fileDocbook << "\" xmlns:xi=\"http://www.w3.org/2001/XInclude\"/>" << endl; - QCString outputDirectory = Config_getString("DOCBOOK_OUTPUT"); + QCString outputDirectory = Config_getString(DOCBOOK_OUTPUT); QCString fileName=outputDirectory+"/"+nd->getOutputFileBase()+".xml"; QFile f(fileName); if (!f.open(IO_WriteOnly)) @@ -1356,7 +1356,7 @@ static void generateDocbookForNamespace(NamespaceDef *nd,FTextStream &ti) } } - if(Config_getBool("REPEAT_BRIEF")) + if(Config_getBool(REPEAT_BRIEF)) { if (nd->briefDescription()) { @@ -1402,7 +1402,7 @@ static void generateDocbookForFile(FileDef *fd,FTextStream &ti) //Add the file Documentation info to index file ti << " <xi:include href=\"" << fileDocbook << "\" xmlns:xi=\"http://www.w3.org/2001/XInclude\"/>" << endl; - QCString outputDirectory = Config_getString("DOCBOOK_OUTPUT"); + QCString outputDirectory = Config_getString(DOCBOOK_OUTPUT); QCString fileName=outputDirectory+"/"+fd->getOutputFileBase()+".xml"; QCString relPath = relativePathToRoot(fileName); @@ -1449,19 +1449,19 @@ static void generateDocbookForFile(FileDef *fd,FTextStream &ti) t << "</programlisting>" << endl; } } - if (Config_getBool("HAVE_DOT")) + if (Config_getBool(HAVE_DOT)) { - if (Config_getBool("INCLUDE_GRAPH")) + if (Config_getBool(INCLUDE_GRAPH)) { t << "<para>Include dependency diagram for " << convertToXML(fd->name()) << "</para>" << endl; DotInclDepGraph idepGraph(fd, FALSE); - idepGraph.writeGraph(t,GOF_BITMAP,EOF_DocBook,Config_getString("DOCBOOK_OUTPUT"),fileName,relPath,FALSE); + idepGraph.writeGraph(t,GOF_BITMAP,EOF_DocBook,Config_getString(DOCBOOK_OUTPUT),fileName,relPath,FALSE); } - if (Config_getBool("INCLUDED_BY_GRAPH")) + if (Config_getBool(INCLUDED_BY_GRAPH)) { t << "<para>Included by dependency diagram for " << convertToXML(fd->name()) << "</para>" << endl; DotInclDepGraph ibdepGraph(fd, TRUE); - ibdepGraph.writeGraph(t,GOF_BITMAP,EOF_DocBook,Config_getString("DOCBOOK_OUTPUT"),fileName,relPath,FALSE); + ibdepGraph.writeGraph(t,GOF_BITMAP,EOF_DocBook,Config_getString(DOCBOOK_OUTPUT),fileName,relPath,FALSE); } } @@ -1499,7 +1499,7 @@ static void generateDocbookForFile(FileDef *fd,FTextStream &ti) t << " <title>" << theTranslator->trDetailedDescription() << "</title>" << endl; writeDocbookDocBlock(t,fd->briefFile(),fd->briefLine(),fd,0,fd->briefDescription()); writeDocbookDocBlock(t,fd->docFile(),fd->docLine(),fd,0,fd->documentation()); - if (Config_getBool("FULL_PATH_NAMES")) + if (Config_getBool(FULL_PATH_NAMES)) { t << " <para>Definition in file " << fd->getDefFileName() << "</para>" << endl; } @@ -1509,7 +1509,7 @@ static void generateDocbookForFile(FileDef *fd,FTextStream &ti) } t << " </simplesect>" << endl; - if (Config_getBool("DOCBOOK_PROGRAMLISTING")) + if (Config_getBool(DOCBOOK_PROGRAMLISTING)) { t << " <literallayout><computeroutput>" << endl; writeDocbookCodeBlock(t,fd); @@ -1542,7 +1542,7 @@ static void generateDocbookForGroup(GroupDef *gd,FTextStream &ti) ti << " <xi:include href=\"" << fileDocbook << "\" xmlns:xi=\"http://www.w3.org/2001/XInclude\"/>" << endl; } - QCString outputDirectory = Config_getString("DOCBOOK_OUTPUT"); + QCString outputDirectory = Config_getString(DOCBOOK_OUTPUT); QCString fileName=outputDirectory+"/"+gd->getOutputFileBase()+".xml"; QCString relPath = relativePathToRoot(fileName); @@ -1559,11 +1559,11 @@ static void generateDocbookForGroup(GroupDef *gd,FTextStream &ti) t << " <title>" << convertToXML(gd->groupTitle()) << "</title>" << endl; - if (Config_getBool("GROUP_GRAPHS") && Config_getBool("HAVE_DOT")) + if (Config_getBool(GROUP_GRAPHS) && Config_getBool(HAVE_DOT)) { t << "<para>Collaboration diagram for " << convertToXML(gd->groupTitle()) << "</para>" << endl; DotGroupCollaboration collaborationGraph(gd); - collaborationGraph.writeGraph(t,GOF_BITMAP,EOF_DocBook,Config_getString("DOCBOOK_OUTPUT"),fileName,relPath,FALSE); + collaborationGraph.writeGraph(t,GOF_BITMAP,EOF_DocBook,Config_getString(DOCBOOK_OUTPUT),fileName,relPath,FALSE); } if (gd->briefDescription()) @@ -1630,7 +1630,7 @@ static void generateDocbookForDir(DirDef *dd,FTextStream &ti) //Add the file Documentation info to index file ti << " <xi:include href=\"" << fileDocbook << "\" xmlns:xi=\"http://www.w3.org/2001/XInclude\"/>" << endl; - QCString outputDirectory = Config_getString("DOCBOOK_OUTPUT"); + QCString outputDirectory = Config_getString(DOCBOOK_OUTPUT); QCString fileName=outputDirectory+"/"+dd->getOutputFileBase()+".xml"; QFile f(fileName); QCString relPath = relativePathToRoot(fileName); @@ -1648,11 +1648,11 @@ static void generateDocbookForDir(DirDef *dd,FTextStream &ti) t << " <title>"; t << theTranslator->trDirReference(dd->displayName()); t << "</title>" << endl; - if (Config_getBool("DIRECTORY_GRAPH") && Config_getBool("HAVE_DOT")) + if (Config_getBool(DIRECTORY_GRAPH) && Config_getBool(HAVE_DOT)) { t << "<para>Directory dependency diagram for " << convertToXML(dd->displayName()) << "</para>" << endl; DotDirDeps dirdepGraph(dd); - dirdepGraph.writeGraph(t,GOF_BITMAP,EOF_DocBook,Config_getString("DOCBOOK_OUTPUT"),fileName,relPath,FALSE); + dirdepGraph.writeGraph(t,GOF_BITMAP,EOF_DocBook,Config_getString(DOCBOOK_OUTPUT),fileName,relPath,FALSE); } writeInnerDirs(&dd->subDirs(),t); @@ -1686,7 +1686,7 @@ static void generateDocbookForPage(PageDef *pd,FTextStream &ti,bool isExample) pageName="mainpage"; // to prevent overwriting the generated index page. } - QCString outputDirectory = Config_getString("DOCBOOK_OUTPUT"); + QCString outputDirectory = Config_getString(DOCBOOK_OUTPUT); QCString fileName=outputDirectory+"/"+pageName+".xml"; QFile f(fileName); if (!f.open(IO_WriteOnly)) @@ -1767,7 +1767,7 @@ void generateDocbook() // + related pages // - examples - QCString outputDirectory = Config_getString("DOCBOOK_OUTPUT"); + QCString outputDirectory = Config_getString(DOCBOOK_OUTPUT); if (outputDirectory.isEmpty()) { outputDirectory=QDir::currentDirPath().utf8(); @@ -1808,7 +1808,7 @@ void generateDocbook() createSubDirs(docbookDir); QCString fileName=outputDirectory+"/index.xml"; - QCString dbk_projectName = Config_getString("PROJECT_NAME"); + QCString dbk_projectName = Config_getString(PROJECT_NAME); QFile f(fileName); f.setName(fileName); @@ -1921,7 +1921,7 @@ void generateDocbook() // FILE DOCUMENTATION - static bool showFiles = Config_getBool("SHOW_FILES"); + static bool showFiles = Config_getBool(SHOW_FILES); if (showFiles) { FileNameListIterator fnli(*Doxygen::inputNameList); @@ -1953,7 +1953,7 @@ void generateDocbook() } // DIRECTORY DOCUMENTATION - if (Config_getBool("DIRECTORY_GRAPH") && Config_getBool("HAVE_DOT")) + if (Config_getBool(DIRECTORY_GRAPH) && Config_getBool(HAVE_DOT)) { DirDef *dir; DirSDict::Iterator sdi(*Doxygen::directories); diff --git a/src/docbookvisitor.cpp b/src/docbookvisitor.cpp index 70e9c53..ec320e9 100644 --- a/src/docbookvisitor.cpp +++ b/src/docbookvisitor.cpp @@ -242,7 +242,7 @@ void DocbookDocVisitor::visit(DocVerbatim *s) m_t << "<para>" << endl; name.sprintf("%s%d", "dot_inline_dotgraph_", dotindex); baseName.sprintf("%s%d", - (Config_getString("DOCBOOK_OUTPUT")+"/inline_dotgraph_").data(), + (Config_getString(DOCBOOK_OUTPUT)+"/inline_dotgraph_").data(), dotindex++ ); QFile file(baseName+".dot"); @@ -265,7 +265,7 @@ void DocbookDocVisitor::visit(DocVerbatim *s) m_t << "<para>" << endl; name.sprintf("%s%d", "msc_inline_mscgraph_", mscindex); baseName.sprintf("%s%d", - (Config_getString("DOCBOOK_OUTPUT")+"/inline_mscgraph_").data(), + (Config_getString(DOCBOOK_OUTPUT)+"/inline_mscgraph_").data(), mscindex++ ); QFile file(baseName+".msc"); @@ -284,7 +284,7 @@ void DocbookDocVisitor::visit(DocVerbatim *s) break; case DocVerbatim::PlantUML: { - static QCString docbookOutput = Config_getString("DOCBOOK_OUTPUT"); + static QCString docbookOutput = Config_getString(DOCBOOK_OUTPUT); QCString baseName = writePlantUMLSource(docbookOutput,s->exampleFile(),s->text()); QCString shortName = baseName; int i; @@ -913,7 +913,7 @@ void DocbookDocVisitor::visitPost(DocImage *img) m_file=fd->absFilePath(); } QFile inImage(m_file); - QFile outImage(Config_getString("DOCBOOK_OUTPUT")+"/"+baseName.data()); + QFile outImage(Config_getString(DOCBOOK_OUTPUT)+"/"+baseName.data()); if (inImage.open(IO_ReadOnly)) { if (outImage.open(IO_WriteOnly)) @@ -1220,7 +1220,7 @@ void DocbookDocVisitor::writeMscFile(const QCString &baseName, DocVerbatim *s) { shortName=shortName.right(shortName.length()-i-1); } - QCString outDir = Config_getString("DOCBOOK_OUTPUT"); + QCString outDir = Config_getString(DOCBOOK_OUTPUT); writeMscGraphFromFile(baseName+".msc",outDir,shortName,MSC_BITMAP); visitPreStart(m_t, s->hasCaption(), shortName, s->width(),s->height()); visitCaption(this, s->children()); @@ -1235,7 +1235,7 @@ void DocbookDocVisitor::writePlantUMLFile(const QCString &baseName, DocVerbatim { shortName=shortName.right(shortName.length()-i-1); } - QCString outDir = Config_getString("DOCBOOK_OUTPUT"); + QCString outDir = Config_getString(DOCBOOK_OUTPUT); generatePlantUMLOutput(baseName,outDir,PUML_BITMAP); visitPreStart(m_t, s->hasCaption(), shortName, s->width(),s->height()); visitCaption(this, s->children()); @@ -1259,7 +1259,7 @@ void DocbookDocVisitor::startMscFile(const QCString &fileName, baseName=baseName.left(i); } baseName.prepend("msc_"); - QCString outDir = Config_getString("DOCBOOK_OUTPUT"); + QCString outDir = Config_getString(DOCBOOK_OUTPUT); writeMscGraphFromFile(fileName,outDir,baseName,MSC_BITMAP); m_t << "<para>" << endl; visitPreStart(m_t, hasCaption, baseName + ".png", width, height); @@ -1280,7 +1280,7 @@ void DocbookDocVisitor::writeDiaFile(const QCString &baseName, DocVerbatim *s) { shortName=shortName.right(shortName.length()-i-1); } - QCString outDir = Config_getString("DOCBOOK_OUTPUT"); + QCString outDir = Config_getString(DOCBOOK_OUTPUT); writeDiaGraphFromFile(baseName+".dia",outDir,shortName,DIA_BITMAP); visitPreStart(m_t, s->hasCaption(), shortName, s->width(),s->height()); visitCaption(this, s->children()); @@ -1304,7 +1304,7 @@ void DocbookDocVisitor::startDiaFile(const QCString &fileName, baseName=baseName.left(i); } baseName.prepend("dia_"); - QCString outDir = Config_getString("DOCBOOK_OUTPUT"); + QCString outDir = Config_getString(DOCBOOK_OUTPUT); writeDiaGraphFromFile(fileName,outDir,baseName,DIA_BITMAP); m_t << "<para>" << endl; visitPreStart(m_t, hasCaption, baseName + ".png", width, height); @@ -1325,7 +1325,7 @@ void DocbookDocVisitor::writeDotFile(const QCString &baseName, DocVerbatim *s) { shortName=shortName.right(shortName.length()-i-1); } - QCString outDir = Config_getString("DOCBOOK_OUTPUT"); + QCString outDir = Config_getString(DOCBOOK_OUTPUT); writeDotGraphFromFile(baseName+".dot",outDir,shortName,GOF_BITMAP); visitPreStart(m_t, s->hasCaption(), baseName + ".dot", s->width(),s->height()); visitCaption(this, s->children()); @@ -1349,7 +1349,7 @@ void DocbookDocVisitor::startDotFile(const QCString &fileName, baseName=baseName.left(i); } baseName.prepend("dot_"); - QCString outDir = Config_getString("DOCBOOK_OUTPUT"); + QCString outDir = Config_getString(DOCBOOK_OUTPUT); QCString imgExt = getDotImageExtension(); writeDotGraphFromFile(fileName,outDir,baseName,GOF_BITMAP); m_t << "<para>" << endl; diff --git a/src/docparser.cpp b/src/docparser.cpp index 099213d..5dfa7b3 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -282,20 +282,20 @@ static QCString findAndCopyImage(const char *fileName,DocImage::Type type) switch(type) { case DocImage::Html: - if (!Config_getBool("GENERATE_HTML")) return result; - outputDir = Config_getString("HTML_OUTPUT"); + if (!Config_getBool(GENERATE_HTML)) return result; + outputDir = Config_getString(HTML_OUTPUT); break; case DocImage::Latex: - if (!Config_getBool("GENERATE_LATEX")) return result; - outputDir = Config_getString("LATEX_OUTPUT"); + if (!Config_getBool(GENERATE_LATEX)) return result; + outputDir = Config_getString(LATEX_OUTPUT); break; case DocImage::DocBook: - if (!Config_getBool("GENERATE_DOCBOOK")) return result; - outputDir = Config_getString("DOCBOOK_OUTPUT"); + if (!Config_getBool(GENERATE_DOCBOOK)) return result; + outputDir = Config_getString(DOCBOOK_OUTPUT); break; case DocImage::Rtf: - if (!Config_getBool("GENERATE_RTF")) return result; - outputDir = Config_getString("RTF_OUTPUT"); + if (!Config_getBool(GENERATE_RTF)) return result; + outputDir = Config_getString(RTF_OUTPUT); break; } QCString outputFile = outputDir+"/"+result; @@ -336,11 +336,11 @@ static QCString findAndCopyImage(const char *fileName,DocImage::Type type) "could not open image %s",qPrint(fileName)); } - if (type==DocImage::Latex && Config_getBool("USE_PDFLATEX") && + if (type==DocImage::Latex && Config_getBool(USE_PDFLATEX) && fd->name().right(4)==".eps" ) { // we have an .eps image in pdflatex mode => convert it to a pdf. - QCString outputDir = Config_getString("LATEX_OUTPUT"); + QCString outputDir = Config_getString(LATEX_OUTPUT); QCString baseName = fd->name().left(fd->name().length()-4); QCString epstopdfArgs(4096); epstopdfArgs.sprintf("\"%s/%s.eps\" --outfile=\"%s/%s.pdf\"", @@ -385,7 +385,7 @@ static QCString findAndCopyImage(const char *fileName,DocImage::Type type) */ static void checkArgumentName(const QCString &name,bool isParam) { - if (!Config_getBool("WARN_IF_DOC_ERROR")) return; + if (!Config_getBool(WARN_IF_DOC_ERROR)) return; if (g_memberDef==0) return; // not a member ArgumentList *al=g_memberDef->isDocsForDefinition() ? g_memberDef->argumentList() : @@ -454,7 +454,7 @@ static void checkArgumentName(const QCString &name,bool isParam) */ static void checkUndocumentedParams() { - if (g_memberDef && g_hasParamCommand && Config_getBool("WARN_IF_DOC_ERROR")) + if (g_memberDef && g_hasParamCommand && Config_getBool(WARN_IF_DOC_ERROR)) { ArgumentList *al=g_memberDef->isDocsForDefinition() ? g_memberDef->argumentList() : @@ -526,7 +526,7 @@ static void checkUndocumentedParams() */ static void detectNoDocumentedParams() { - if (g_memberDef && Config_getBool("WARN_NO_PARAMDOC")) + if (g_memberDef && Config_getBool(WARN_NO_PARAMDOC)) { ArgumentList *al = g_memberDef->argumentList(); ArgumentList *declAl = g_memberDef->declArgumentList(); @@ -1054,7 +1054,7 @@ static void handleUnclosedStyleCommands() static void handleLinkedWord(DocNode *parent,QList<DocNode> &children,bool ignoreAutoLinkFlag=FALSE) { QCString name = linkToText(SrcLangExt_Unknown,g_token->name,TRUE); - static bool autolinkSupport = Config_getBool("AUTOLINK_SUPPORT"); + static bool autolinkSupport = Config_getBool(AUTOLINK_SUPPORT); if (!autolinkSupport && !ignoreAutoLinkFlag) // no autolinking -> add as normal word { children.append(new DocWord(parent,name)); @@ -1760,11 +1760,11 @@ static void readTextFileByName(const QCString &file,QCString &text) QFileInfo fi(file); if (fi.exists()) { - text = fileToString(file,Config_getBool("FILTER_SOURCE_FILES")); + text = fileToString(file,Config_getBool(FILTER_SOURCE_FILES)); return; } } - QStrList &examplePathList = Config_getList("EXAMPLE_PATH"); + QStrList &examplePathList = Config_getList(EXAMPLE_PATH); char *s=examplePathList.first(); while (s) { @@ -1772,7 +1772,7 @@ static void readTextFileByName(const QCString &file,QCString &text) QFileInfo fi(absFileName); if (fi.exists()) { - text = fileToString(absFileName,Config_getBool("FILTER_SOURCE_FILES")); + text = fileToString(absFileName,Config_getBool(FILTER_SOURCE_FILES)); return; } s=examplePathList.next(); @@ -1783,7 +1783,7 @@ static void readTextFileByName(const QCString &file,QCString &text) FileDef *fd; if ((fd=findFileDef(Doxygen::exampleNameDict,file,ambig))) { - text = fileToString(fd->absFilePath(),Config_getBool("FILTER_SOURCE_FILES")); + text = fileToString(fd->absFilePath(),Config_getBool(FILTER_SOURCE_FILES)); } else if (ambig) { @@ -2162,10 +2162,10 @@ bool DocXRefItem::parse() if (refList && ( // either not a built-in list or the list is enabled - (m_key!="todo" || Config_getBool("GENERATE_TODOLIST")) && - (m_key!="test" || Config_getBool("GENERATE_TESTLIST")) && - (m_key!="bug" || Config_getBool("GENERATE_BUGLIST")) && - (m_key!="deprecated" || Config_getBool("GENERATE_DEPRECATEDLIST")) + (m_key!="todo" || Config_getBool(GENERATE_TODOLIST)) && + (m_key!="test" || Config_getBool(GENERATE_TESTLIST)) && + (m_key!="bug" || Config_getBool(GENERATE_BUGLIST)) && + (m_key!="deprecated" || Config_getBool(GENERATE_DEPRECATEDLIST)) ) ) { @@ -2599,7 +2599,7 @@ void DocRef::parse() DocCite::DocCite(DocNode *parent,const QCString &target,const QCString &) //context) { - static uint numBibFiles = Config_getList("CITE_BIB_FILES").count(); + static uint numBibFiles = Config_getList(CITE_BIB_FILES).count(); m_parent = parent; //printf("DocCite::DocCite(target=%s)\n",target.data()); ASSERT(!target.isEmpty()); @@ -5543,7 +5543,7 @@ int DocPara::handleCommand(const QCString &cmdName) break; case CMD_STARTUML: { - static QCString jarPath = Config_getString("PLANTUML_JAR_PATH"); + static QCString jarPath = Config_getString(PLANTUML_JAR_PATH); doctokenizerYYsetStatePlantUMLOpt(); retval = doctokenizerYYlex(); QCString plantFile(g_token->sectionId); @@ -5964,7 +5964,7 @@ int DocPara::handleHtmlStartTag(const QCString &tagName,const HtmlAttribList &ta { if (paramName.isEmpty()) { - if (Config_getBool("WARN_NO_PARAMDOC")) + if (Config_getBool(WARN_NO_PARAMDOC)) { warn_doc_error(g_fileName,doctokenizerYYlineno,"empty 'name' attribute for <param%s> tag.",tagId==XML_PARAM?"":"type"); } @@ -7190,7 +7190,7 @@ DocRoot *validatingParseDoc(const char *fileName,int startLine, //g_token = new TokenInfo; // store parser state so we can re-enter this function if needed - //bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); + //bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); docParserPushContext(); if (ctx && ctx!=Doxygen::globalScope && diff --git a/src/docsets.cpp b/src/docsets.cpp index 9772d4e..4bdb2c9 100644 --- a/src/docsets.cpp +++ b/src/docsets.cpp @@ -43,22 +43,22 @@ DocSets::~DocSets() void DocSets::initialize() { // -- get config options - QCString projectName = Config_getString("PROJECT_NAME"); + QCString projectName = Config_getString(PROJECT_NAME); if (projectName.isEmpty()) projectName="root"; - QCString bundleId = Config_getString("DOCSET_BUNDLE_ID"); + QCString bundleId = Config_getString(DOCSET_BUNDLE_ID); if (bundleId.isEmpty()) bundleId="org.doxygen.Project"; - QCString feedName = Config_getString("DOCSET_FEEDNAME"); + QCString feedName = Config_getString(DOCSET_FEEDNAME); if (feedName.isEmpty()) feedName="FeedName"; - QCString publisherId = Config_getString("DOCSET_PUBLISHER_ID"); + QCString publisherId = Config_getString(DOCSET_PUBLISHER_ID); if (publisherId.isEmpty()) publisherId="PublisherId"; - QCString publisherName = Config_getString("DOCSET_PUBLISHER_NAME"); + QCString publisherName = Config_getString(DOCSET_PUBLISHER_NAME); if (publisherName.isEmpty()) publisherName="PublisherName"; - QCString projectNumber = Config_getString("PROJECT_NUMBER"); + QCString projectNumber = Config_getString(PROJECT_NUMBER); if (projectNumber.isEmpty()) projectNumber="ProjectNumber"; // -- write Makefile { - QCString mfName = Config_getString("HTML_OUTPUT") + "/Makefile"; + QCString mfName = Config_getString(HTML_OUTPUT) + "/Makefile"; QFile makefile(mfName); if (!makefile.open(IO_WriteOnly)) { @@ -109,7 +109,7 @@ void DocSets::initialize() // -- write Info.plist { - QCString plName = Config_getString("HTML_OUTPUT") + "/Info.plist"; + QCString plName = Config_getString(HTML_OUTPUT) + "/Info.plist"; QFile plist(plName); if (!plist.open(IO_WriteOnly)) { @@ -145,14 +145,14 @@ void DocSets::initialize() } // -- start Nodes.xml - QCString notes = Config_getString("HTML_OUTPUT") + "/Nodes.xml"; + QCString notes = Config_getString(HTML_OUTPUT) + "/Nodes.xml"; m_nf = new QFile(notes); if (!m_nf->open(IO_WriteOnly)) { err("Could not open file %s for writing\n",notes.data()); exit(1); } - //QCString indexName=Config_getBool("GENERATE_TREEVIEW")?"main":"index"; + //QCString indexName=Config_getBool(GENERATE_TREEVIEW)?"main":"index"; QCString indexName="index"; m_nts.setDevice(m_nf); m_nts << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl; @@ -166,7 +166,7 @@ void DocSets::initialize() m_firstNode.resize(m_dc); m_firstNode.at(0)=TRUE; - QCString tokens = Config_getString("HTML_OUTPUT") + "/Tokens.xml"; + QCString tokens = Config_getString(HTML_OUTPUT) + "/Tokens.xml"; m_tf = new QFile(tokens); if (!m_tf->open(IO_WriteOnly)) { diff --git a/src/doctokenizer.l b/src/doctokenizer.l index 3169fc0..de35d33 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -128,7 +128,7 @@ static int computeIndent(const char *str,int length) { int i; int indent=0; - static int tabSize=Config_getInt("TAB_SIZE"); + static int tabSize=Config_getInt(TAB_SIZE); for (i=0;i<length;i++) { if (str[i]=='\t') diff --git a/src/dot.cpp b/src/dot.cpp index 0a4f136..8bc8608 100644 --- a/src/dot.cpp +++ b/src/dot.cpp @@ -232,7 +232,7 @@ static EdgeProperties umlEdgeProps = static QCString getDotFontName() { - static QCString dotFontName = Config_getString("DOT_FONTNAME"); + static QCString dotFontName = Config_getString(DOT_FONTNAME); if (dotFontName.isEmpty()) { //dotFontName="FreeSans.ttf"; @@ -243,14 +243,14 @@ static QCString getDotFontName() static int getDotFontSize() { - static int dotFontSize = Config_getInt("DOT_FONTSIZE"); + static int dotFontSize = Config_getInt(DOT_FONTSIZE); if (dotFontSize<4) dotFontSize=4; return dotFontSize; } static void writeGraphHeader(FTextStream &t,const QCString &title=QCString()) { - static bool interactiveSVG = Config_getBool("INTERACTIVE_SVG"); + static bool interactiveSVG = Config_getBool(INTERACTIVE_SVG); t << "digraph "; if (title.isEmpty()) { @@ -266,7 +266,7 @@ static void writeGraphHeader(FTextStream &t,const QCString &title=QCString()) { t << " // INTERACTIVE_SVG=YES\n"; } - if (Config_getBool("DOT_TRANSPARENT")) + if (Config_getBool(DOT_TRANSPARENT)) { t << " bgcolor=\"transparent\";" << endl; } @@ -445,7 +445,7 @@ static void setDotFontPath(const char *path) { ASSERT(g_dotFontPath.isEmpty()); g_dotFontPath = portable_getenv("DOTFONTPATH"); - QCString newFontPath = Config_getString("DOT_FONTPATH"); + QCString newFontPath = Config_getString(DOT_FONTPATH); QCString spath = path; if (!newFontPath.isEmpty() && !spath.isEmpty()) { @@ -519,7 +519,7 @@ static bool writeVecGfxFigure(FTextStream &out,const QCString &baseName, const QCString &figureName) { int width=400,height=550; - static bool usePdfLatex = Config_getBool("USE_PDFLATEX"); + static bool usePdfLatex = Config_getBool(USE_PDFLATEX); if (usePdfLatex) { if (!readBoundingBox(figureName+".pdf",&width,&height,FALSE)) @@ -713,7 +713,7 @@ static bool insertMapFile(FTextStream &out,const QCString &mapFile, static void removeDotGraph(const QCString &dotName) { - static bool dotCleanUp = Config_getBool("DOT_CLEANUP"); + static bool dotCleanUp = Config_getBool(DOT_CLEANUP); if (dotCleanUp) { QDir d; @@ -792,13 +792,13 @@ int DotNodeList::compareValues(const DotNode *n1,const DotNode *n2) const DotRunner::DotRunner(const QCString &file,const QCString &path, bool checkResult,const QCString &imageName) - : m_dotExe(Config_getString("DOT_PATH")+"dot"), + : m_dotExe(Config_getString(DOT_PATH)+"dot"), m_file(file), m_path(path), m_checkResult(checkResult), m_imageName(imageName), m_imgExt(getDotImageExtension()) { - static bool dotCleanUp = Config_getBool("DOT_CLEANUP"); - static bool dotMultiTargets = Config_getBool("DOT_MULTI_TARGETS"); + static bool dotCleanUp = Config_getBool(DOT_CLEANUP); + static bool dotMultiTargets = Config_getBool(DOT_MULTI_TARGETS); m_cleanUp = dotCleanUp; m_multiTargets = dotMultiTargets; m_jobs.setAutoDelete(TRUE); @@ -946,7 +946,7 @@ int DotFilePatcher::addSVGObject(const QCString &baseName, bool DotFilePatcher::run() { //printf("DotFilePatcher::run(): %s\n",m_patchFile.data()); - static bool interactiveSVG = Config_getBool("INTERACTIVE_SVG"); + static bool interactiveSVG = Config_getBool(INTERACTIVE_SVG); bool isSVGFile = m_patchFile.right(4)==".svg"; int graphId = -1; QCString relPath; @@ -1233,7 +1233,7 @@ DotManager::DotManager() : m_dotMaps(1009) m_dotMaps.setAutoDelete(TRUE); m_queue = new DotRunnerQueue; int i; - int numThreads = QMIN(32,Config_getInt("DOT_NUM_THREADS")); + int numThreads = QMIN(32,Config_getInt(DOT_NUM_THREADS)); if (numThreads!=1) { if (numThreads==0) numThreads = QMAX(2,QThread::idealThreadCount()+1); @@ -1333,19 +1333,19 @@ bool DotManager::run() QListIterator<DotRunner> li(m_dotRuns); bool setPath=FALSE; - if (Config_getBool("GENERATE_HTML")) + if (Config_getBool(GENERATE_HTML)) { - setDotFontPath(Config_getString("HTML_OUTPUT")); + setDotFontPath(Config_getString(HTML_OUTPUT)); setPath=TRUE; } - else if (Config_getBool("GENERATE_LATEX")) + else if (Config_getBool(GENERATE_LATEX)) { - setDotFontPath(Config_getString("LATEX_OUTPUT")); + setDotFontPath(Config_getString(LATEX_OUTPUT)); setPath=TRUE; } - else if (Config_getBool("GENERATE_RTF")) + else if (Config_getBool(GENERATE_RTF)) { - setDotFontPath(Config_getString("RTF_OUTPUT")); + setDotFontPath(Config_getString(RTF_OUTPUT)); setPath=TRUE; } portable_sysTimerStart(); @@ -1673,7 +1673,7 @@ static void writeBoxMemberList(FTextStream &t, if (mma->getClassDef() == scope && (skipNames==0 || skipNames->find(mma->name())==0)) { - static int limit = Config_getInt("UML_LIMIT_NUM_FIELDS"); + static int limit = Config_getInt(UML_LIMIT_NUM_FIELDS); if (limit>0 && (totalCount>limit*3/2 && count>=limit)) { t << theTranslator->trAndMore(QCString().sprintf("%d",totalCount-count)) << "\\l"; @@ -1731,7 +1731,7 @@ void DotNode::writeBox(FTextStream &t, (hasNonReachableChildren) ? "red" : "black" ); t << " Node" << reNumberNode(m_number,reNumber) << " [label=\""; - static bool umlLook = Config_getBool("UML_LOOK"); + static bool umlLook = Config_getBool(UML_LOOK); if (m_classDef && umlLook && (gt==Inheritance || gt==Collaboration)) { @@ -1763,7 +1763,7 @@ void DotNode::writeBox(FTextStream &t, } //printf("DotNode::writeBox for %s\n",m_classDef->name().data()); - static bool extractPrivate = Config_getBool("EXTRACT_PRIVATE"); + static bool extractPrivate = Config_getBool(EXTRACT_PRIVATE); t << "{" << convertLabel(m_label); t << "\\n|"; writeBoxMemberList(t,'+',m_classDef->getMemberList(MemberListType_pubAttribs),m_classDef,FALSE,&arrowNames); @@ -1819,7 +1819,7 @@ void DotNode::writeBox(FTextStream &t, } else { - static bool dotTransparent = Config_getBool("DOT_TRANSPARENT"); + static bool dotTransparent = Config_getBool(DOT_TRANSPARENT); if (!dotTransparent) { t << ",color=\"" << labCol << "\", fillcolor=\""; @@ -1873,7 +1873,7 @@ void DotNode::writeArrow(FTextStream &t, t << reNumberNode(cn->number(),reNumber); t << " ["; - static bool umlLook = Config_getBool("UML_LOOK"); + static bool umlLook = Config_getBool(UML_LOOK); const EdgeProperties *eProps = umlLook ? ¨EdgeProps : &normalEdgeProps; QCString aStyle = eProps->arrowStyleMap[ei->m_color]; bool umlUseArrow = aStyle=="odiamond"; @@ -2274,7 +2274,7 @@ void DotGfxHierarchyTable::createGraph(DotNode *n,FTextStream &out, QDir d(path); QCString baseName; QCString imgExt = getDotImageExtension(); - QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgFmt = Config_getEnum(DOT_IMAGE_FORMAT); baseName.sprintf("inherit_graph_%d",id); QCString imgName = baseName+"."+ imgExt; QCString mapName = baseName+".map"; @@ -2590,7 +2590,7 @@ int DotClassGraph::m_curNodeNumber = 0; void DotClassGraph::addClass(ClassDef *cd,DotNode *n,int prot, const char *label,const char *usedName,const char *templSpec,bool base,int distance) { - if (Config_getBool("HIDE_UNDOC_CLASSES") && !cd->isLinkable()) return; + if (Config_getBool(HIDE_UNDOC_CLASSES) && !cd->isLinkable()) return; int edgeStyle = (label || prot==EdgeInfo::Orange || prot==EdgeInfo::Orange2) ? EdgeInfo::Dashed : EdgeInfo::Solid; QCString className; @@ -2632,7 +2632,7 @@ void DotClassGraph::addClass(ClassDef *cd,DotNode *n,int prot, else // new class { QCString displayName=className; - if (Config_getBool("HIDE_SCOPE_NAMES")) displayName=stripScope(displayName); + if (Config_getBool(HIDE_SCOPE_NAMES)) displayName=stripScope(displayName); QCString tmp_url; if (cd->isLinkable() && !cd->isHidden()) { @@ -2719,7 +2719,7 @@ bool DotClassGraph::determineVisibleNodes(DotNode *rootNode, // despite being marked visible in the child loop while ((childQueue.count()>0 || parentQueue.count()>0) && maxNodes>0) { - static int maxDistance = Config_getInt("MAX_DOT_GRAPH_DEPTH"); + static int maxDistance = Config_getInt(MAX_DOT_GRAPH_DEPTH); if (childQueue.count()>0) { DotNode *n = childQueue.take(0); @@ -2782,7 +2782,7 @@ bool DotClassGraph::determineVisibleNodes(DotNode *rootNode, } } } - if (Config_getBool("UML_LOOK")) return FALSE; // UML graph are always top to bottom + if (Config_getBool(UML_LOOK)) return FALSE; // UML graph are always top to bottom int maxWidth=0; int maxHeight=(int)QMAX(childTreeWidth.size(),parentTreeWidth.size()); uint i; @@ -2803,7 +2803,7 @@ bool DotClassGraph::determineVisibleNodes(DotNode *rootNode, void DotClassGraph::buildGraph(ClassDef *cd,DotNode *n,bool base,int distance) { - static bool templateRelations = Config_getBool("TEMPLATE_RELATIONS"); + static bool templateRelations = Config_getBool(TEMPLATE_RELATIONS); //printf("DocClassGraph::buildGraph(%s,distance=%d,base=%d)\n", // cd->name().data(),distance,base); // ---- Add inheritance relations @@ -2969,7 +2969,7 @@ DotClassGraph::DotClassGraph(ClassDef *cd,DotNode::GraphType t) if (t==DotNode::Inheritance) buildGraph(cd,m_startNode,FALSE,1); //} - static int maxNodes = Config_getInt("DOT_GRAPH_MAX_NODES"); + static int maxNodes = Config_getInt(DOT_GRAPH_MAX_NODES); //int directChildNodes = 1; //if (m_startNode->m_children!=0) // directChildNodes+=m_startNode->m_children->count(); @@ -2987,7 +2987,7 @@ DotClassGraph::DotClassGraph(ClassDef *cd,DotNode::GraphType t) bool DotClassGraph::isTrivial() const { - static bool umlLook = Config_getBool("UML_LOOK"); + static bool umlLook = Config_getBool(UML_LOOK); if (m_graphType==DotNode::Inheritance) return m_startNode->m_children==0 && m_startNode->m_parents==0; else @@ -2996,7 +2996,7 @@ bool DotClassGraph::isTrivial() const bool DotClassGraph::isTooBig() const { - static int maxNodes = Config_getInt("DOT_GRAPH_MAX_NODES"); + static int maxNodes = Config_getInt(DOT_GRAPH_MAX_NODES); int numNodes = 0; numNodes+= m_startNode->m_children ? m_startNode->m_children->count() : 0; if (m_graphType==DotNode::Inheritance) @@ -3146,7 +3146,7 @@ QCString DotClassGraph::writeGraph(FTextStream &out, { err("Output dir %s does not exist!\n",path); exit(1); } - static bool usePDFLatex = Config_getBool("USE_PDFLATEX"); + static bool usePDFLatex = Config_getBool(USE_PDFLATEX); QCString baseName; QCString mapName; @@ -3169,7 +3169,7 @@ QCString DotClassGraph::writeGraph(FTextStream &out, // derive target file names from baseName QCString imgExt = getDotImageExtension(); - QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgFmt = Config_getEnum(DOT_IMAGE_FORMAT); QCString absBaseName = d.absPath().utf8()+"/"+baseName; QCString absDotName = absBaseName+".dot"; QCString absMapName = absBaseName+".map"; @@ -3361,7 +3361,7 @@ void DotInclDepGraph::buildGraph(DotNode *n,FileDef *fd,int distance) doc = bfd->isLinkable() && !bfd->isHidden(); src = bfd->generateSourceFile(); } - if (doc || src || !Config_getBool("HIDE_UNDOC_RELATIONS")) + if (doc || src || !Config_getBool(HIDE_UNDOC_RELATIONS)) { QCString url=""; if (bfd) url=bfd->getOutputFileBase().copy(); @@ -3409,7 +3409,7 @@ void DotInclDepGraph::determineVisibleNodes(QList<DotNode> &queue, int &maxNodes { while (queue.count()>0 && maxNodes>0) { - static int maxDistance = Config_getInt("MAX_DOT_GRAPH_DEPTH"); + static int maxDistance = Config_getInt(MAX_DOT_GRAPH_DEPTH); DotNode *n = queue.take(0); if (!n->isVisible() && n->distance()<=maxDistance) // not yet processed { @@ -3472,7 +3472,7 @@ DotInclDepGraph::DotInclDepGraph(FileDef *fd,bool inverse) m_usedNodes->insert(fd->absFilePath(),m_startNode); buildGraph(m_startNode,fd,1); - static int nodes = Config_getInt("DOT_GRAPH_MAX_NODES"); + static int nodes = Config_getInt(DOT_GRAPH_MAX_NODES); int maxNodes = nodes; //int directChildNodes = 1; //if (m_startNode->m_children!=0) @@ -3516,7 +3516,7 @@ QCString DotInclDepGraph::writeGraph(FTextStream &out, { err("Output dir %s does not exist!\n",path); exit(1); } - static bool usePDFLatex = Config_getBool("USE_PDFLATEX"); + static bool usePDFLatex = Config_getBool(USE_PDFLATEX); QCString baseName=m_diskName; if (m_inverse) baseName+="_dep"; @@ -3526,7 +3526,7 @@ QCString DotInclDepGraph::writeGraph(FTextStream &out, if (m_inverse) mapName+="dep"; QCString imgExt = getDotImageExtension(); - QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgFmt = Config_getEnum(DOT_IMAGE_FORMAT); QCString absBaseName = d.absPath().utf8()+"/"+baseName; QCString absDotName = absBaseName+".dot"; QCString absMapName = absBaseName+".map"; @@ -3640,7 +3640,7 @@ bool DotInclDepGraph::isTrivial() const bool DotInclDepGraph::isTooBig() const { - static int maxNodes = Config_getInt("DOT_GRAPH_MAX_NODES"); + static int maxNodes = Config_getInt(DOT_GRAPH_MAX_NODES); int numNodes = m_startNode->m_children ? m_startNode->m_children->count() : 0; return numNodes>=maxNodes; } @@ -3693,7 +3693,7 @@ void DotCallGraph::buildGraph(DotNode *n,MemberDef *md,int distance) else { QCString name; - if (Config_getBool("HIDE_SCOPE_NAMES")) + if (Config_getBool(HIDE_SCOPE_NAMES)) { name = rmd->getOuterScope()==m_scope ? rmd->name() : rmd->qualifiedName(); @@ -3726,7 +3726,7 @@ void DotCallGraph::determineVisibleNodes(QList<DotNode> &queue, int &maxNodes) { while (queue.count()>0 && maxNodes>0) { - static int maxDistance = Config_getInt("MAX_DOT_GRAPH_DEPTH"); + static int maxDistance = Config_getInt(MAX_DOT_GRAPH_DEPTH); DotNode *n = queue.take(0); if (!n->isVisible() && n->distance()<=maxDistance) // not yet processed { @@ -3782,7 +3782,7 @@ DotCallGraph::DotCallGraph(MemberDef *md,bool inverse) uniqueId = md->getReference()+"$"+ md->getOutputFileBase()+"#"+md->anchor(); QCString name; - if (Config_getBool("HIDE_SCOPE_NAMES")) + if (Config_getBool(HIDE_SCOPE_NAMES)) { name = md->name(); } @@ -3801,7 +3801,7 @@ DotCallGraph::DotCallGraph(MemberDef *md,bool inverse) m_usedNodes->insert(uniqueId,m_startNode); buildGraph(m_startNode,md,1); - static int nodes = Config_getInt("DOT_GRAPH_MAX_NODES"); + static int nodes = Config_getInt(DOT_GRAPH_MAX_NODES); int maxNodes = nodes; //int directChildNodes = 1; //if (m_startNode->m_children!=0) @@ -3833,13 +3833,13 @@ QCString DotCallGraph::writeGraph(FTextStream &out, GraphOutputFormat graphForma { err("Output dir %s does not exist!\n",path); exit(1); } - static bool usePDFLatex = Config_getBool("USE_PDFLATEX"); + static bool usePDFLatex = Config_getBool(USE_PDFLATEX); QCString baseName = m_diskName + (m_inverse ? "_icgraph" : "_cgraph"); QCString mapName = baseName; QCString imgExt = getDotImageExtension(); - QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgFmt = Config_getEnum(DOT_IMAGE_FORMAT); QCString absBaseName = d.absPath().utf8()+"/"+baseName; QCString absDotName = absBaseName+".dot"; QCString absMapName = absBaseName+".map"; @@ -3958,7 +3958,7 @@ bool DotCallGraph::isTrivial() const bool DotCallGraph::isTooBig() const { - static int maxNodes = Config_getInt("DOT_GRAPH_MAX_NODES"); + static int maxNodes = Config_getInt(DOT_GRAPH_MAX_NODES); int numNodes = m_startNode->m_children ? m_startNode->m_children->count() : 0; return numNodes>=maxNodes; } @@ -3990,13 +3990,13 @@ QCString DotDirDeps::writeGraph(FTextStream &out, { err("Output dir %s does not exist!\n",path); exit(1); } - static bool usePDFLatex = Config_getBool("USE_PDFLATEX"); + static bool usePDFLatex = Config_getBool(USE_PDFLATEX); QCString baseName=m_dir->getOutputFileBase()+"_dep"; QCString mapName=escapeCharsInString(baseName,FALSE); QCString imgExt = getDotImageExtension(); - QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgFmt = Config_getEnum(DOT_IMAGE_FORMAT); QCString absBaseName = d.absPath().utf8()+"/"+baseName; QCString absDotName = absBaseName+".dot"; QCString absMapName = absBaseName+".map"; @@ -4161,7 +4161,7 @@ void generateGraphLegend(const char *path) QCString absBaseName = (QCString)path+"/graph_legend"; QCString absDotName = absBaseName+".dot"; QCString imgExt = getDotImageExtension(); - QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgFmt = Config_getEnum(DOT_IMAGE_FORMAT); QCString imgName = "graph_legend."+imgExt; QCString absImgName = absBaseName+"."+imgExt; if (checkAndUpdateMd5Signature(absBaseName,sigStr) || @@ -4193,7 +4193,7 @@ void generateGraphLegend(const char *path) if (imgExt=="svg") { DotManager::instance()->addSVGObject( - absBaseName+Config_getString("HTML_FILE_EXTENSION"), + absBaseName+Config_getString(HTML_FILE_EXTENSION), "graph_legend", absImgName,QCString()); } @@ -4210,7 +4210,7 @@ void writeDotGraphFromFile(const char *inFile,const char *outDir, } QCString imgExt = getDotImageExtension(); - QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgFmt = Config_getEnum(DOT_IMAGE_FORMAT); QCString imgName = (QCString)outFile+"."+imgExt; QCString absImgName = d.absPath().utf8()+"/"+imgName; QCString absOutFile = d.absPath().utf8()+"/"+outFile; @@ -4220,7 +4220,7 @@ void writeDotGraphFromFile(const char *inFile,const char *outDir, dotRun.addJob(imgFmt,absImgName); else // format==GOF_EPS { - if (Config_getBool("USE_PDFLATEX")) + if (Config_getBool(USE_PDFLATEX)) { dotRun.addJob("pdf",absOutFile+".pdf"); } @@ -4266,7 +4266,7 @@ void writeDotImageMapFromFile(FTextStream &t, QCString mapName = baseName+".map"; QCString imgExt = getDotImageExtension(); - QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgFmt = Config_getEnum(DOT_IMAGE_FORMAT); QCString imgName = baseName+"."+imgExt; QCString absOutFile = d.absPath().utf8()+"/"+mapName; @@ -4527,7 +4527,7 @@ QCString DotGroupCollaboration::writeGraph( FTextStream &t, { err("Output dir %s does not exist!\n",path); exit(1); } - static bool usePDFLatex = Config_getBool("USE_PDFLATEX"); + static bool usePDFLatex = Config_getBool(USE_PDFLATEX); QGString theGraph; FTextStream md5stream(&theGraph); @@ -4562,7 +4562,7 @@ QCString DotGroupCollaboration::writeGraph( FTextStream &t, MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig); MD5SigToString(md5_sig,sigStr.rawData(),33); QCString imgExt = getDotImageExtension(); - QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgFmt = Config_getEnum(DOT_IMAGE_FORMAT); QCString baseName = m_diskName; QCString imgName = baseName+"."+imgExt; QCString absPath = d.absPath().data(); @@ -4756,7 +4756,7 @@ void DotGroupCollaboration::writeGraphHeader(FTextStream &t, } t << endl; t << "{" << endl; - if (Config_getBool("DOT_TRANSPARENT")) + if (Config_getBool(DOT_TRANSPARENT)) { t << " bgcolor=\"transparent\";" << endl; } @@ -4769,7 +4769,7 @@ void DotGroupCollaboration::writeGraphHeader(FTextStream &t, void writeDotDirDepGraph(FTextStream &t,DirDef *dd,bool linkRelations) { t << "digraph \"" << dd->displayName() << "\" {\n"; - if (Config_getBool("DOT_TRANSPARENT")) + if (Config_getBool(DOT_TRANSPARENT)) { t << " bgcolor=transparent;\n"; } @@ -4859,7 +4859,7 @@ void writeDotDirDepGraph(FTextStream &t,DirDef *dd,bool linkRelations) << usedDir->shortName() << "\""; if (usedDir->isCluster()) { - if (!Config_getBool("DOT_TRANSPARENT")) + if (!Config_getBool(DOT_TRANSPARENT)) { t << " fillcolor=\"white\" style=\"filled\""; } diff --git a/src/doxygen.cpp b/src/doxygen.cpp index a3a3d2a..12e2c5d 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -766,7 +766,7 @@ static void organizeSubGroups(EntryNav *rootNav) static void buildFileList(EntryNav *rootNav) { if (((rootNav->section()==Entry::FILEDOC_SEC) || - ((rootNav->section() & Entry::FILE_MASK) && Config_getBool("EXTRACT_ALL"))) && + ((rootNav->section() & Entry::FILE_MASK) && Config_getBool(EXTRACT_ALL))) && !rootNav->name().isEmpty() && !rootNav->tagInfo() // skip any file coming from tag files ) { @@ -845,13 +845,13 @@ static void addIncludeFile(ClassDef *cd,FileDef *ifd,Entry *root) if ( (!root->doc.stripWhiteSpace().isEmpty() || !root->brief.stripWhiteSpace().isEmpty() || - Config_getBool("EXTRACT_ALL") + Config_getBool(EXTRACT_ALL) ) && root->protection!=Private ) { //printf(">>>>>> includeFile=%s\n",root->includeFile.data()); - bool local=Config_getBool("FORCE_LOCAL_INCLUDES"); + bool local=Config_getBool(FORCE_LOCAL_INCLUDES); QCString includeFile = root->includeFile; if (!includeFile.isEmpty() && includeFile.at(0)=='"') { @@ -915,7 +915,7 @@ static void addIncludeFile(ClassDef *cd,FileDef *ifd,Entry *root) iName=fd->name(); } } - else if (!Config_getList("STRIP_FROM_INC_PATH").isEmpty()) + else if (!Config_getList(STRIP_FROM_INC_PATH).isEmpty()) { iName=stripFromIncludePath(fd->absFilePath()); } @@ -1491,7 +1491,7 @@ static void resolveClassNestingRelations() void distributeClassGroupRelations() { - //static bool inlineGroupedClasses = Config_getBool("INLINE_GROUPED_CLASSES"); + //static bool inlineGroupedClasses = Config_getBool(INLINE_GROUPED_CLASSES); //if (!inlineGroupedClasses) return; //printf("** distributeClassGroupRelations()\n"); @@ -2270,7 +2270,7 @@ static MemberDef *addVariableToClass( QCString def; if (!root->type.isEmpty()) { - if (related || mtype==MemberType_Friend || Config_getBool("HIDE_SCOPE_NAMES")) + if (related || mtype==MemberType_Friend || Config_getBool(HIDE_SCOPE_NAMES)) { if (root->spec&Entry::Alias) // turn 'typedef B A' into 'using A = B' { @@ -2295,7 +2295,7 @@ static MemberDef *addVariableToClass( } else { - if (Config_getBool("HIDE_SCOPE_NAMES")) + if (Config_getBool(HIDE_SCOPE_NAMES)) { def=name+root->args; } @@ -2437,7 +2437,7 @@ static MemberDef *addVariableToFile( FileDef *fd = rootNav->fileDef(); // see if we have a typedef that should hide a struct or union - if (mtype==MemberType_Typedef && Config_getBool("TYPEDEF_HIDES_STRUCT")) + if (mtype==MemberType_Typedef && Config_getBool(TYPEDEF_HIDES_STRUCT)) { QCString type = root->type; type.stripPrefix("typedef "); @@ -2480,7 +2480,7 @@ static MemberDef *addVariableToFile( // determine the definition of the global variable if (nd && !nd->name().isEmpty() && nd->name().at(0)!='@' && - !Config_getBool("HIDE_SCOPE_NAMES") + !Config_getBool(HIDE_SCOPE_NAMES) ) // variable is inside a namespace, so put the scope before the name { @@ -2959,7 +2959,7 @@ static void addVariable(EntryNav *rootNav,int isFuncPtr=-1) //int anonyScopes = 0; //bool added=FALSE; - static bool inlineSimpleStructs = Config_getBool("INLINE_SIMPLE_STRUCTS"); + static bool inlineSimpleStructs = Config_getBool(INLINE_SIMPLE_STRUCTS); if (si!=-1 && !inlineSimpleStructs) // anonymous scope or type { QCString pScope; @@ -3322,7 +3322,7 @@ static void addMethodToClass(EntryNav *rootNav,ClassDef *cd, // for PHP we use Class::method and Namespace\method scopeSeparator="::"; } - if (!root->relates.isEmpty() || isFriend || Config_getBool("HIDE_SCOPE_NAMES")) + if (!root->relates.isEmpty() || isFriend || Config_getBool(HIDE_SCOPE_NAMES)) { if (!root->type.isEmpty()) { @@ -4306,7 +4306,7 @@ static void findUsedClassesForClass(EntryNav *rootNav, if (!found && !type.isEmpty()) // used class is not documented in any scope { ClassDef *usedCd = Doxygen::hiddenClasses->find(type); - if (usedCd==0 && !Config_getBool("HIDE_UNDOC_RELATIONS")) + if (usedCd==0 && !Config_getBool(HIDE_UNDOC_RELATIONS)) { if (type.right(2)=="(*" || type.right(2)=="(^") // type is a function pointer { @@ -4381,8 +4381,8 @@ static void findBaseClassesForClass( { // 1.8.2: decided to show inheritance relations even if not documented, // we do make them artificial, so they do not appear in the index - //if (!Config_getBool("HIDE_UNDOC_RELATIONS")) - bool b = Config_getBool("HIDE_UNDOC_RELATIONS") ? TRUE : isArtificial; + //if (!Config_getBool(HIDE_UNDOC_RELATIONS)) + bool b = Config_getBool(HIDE_UNDOC_RELATIONS) ? TRUE : isArtificial; //{ // no documented base class -> try to find an undocumented one findClassRelation(rootNav,context,instanceCd,&tbi,templateNames,Undocumented,b); @@ -4810,7 +4810,7 @@ static bool findClassRelation( usedName=biName; //printf("***** usedName=%s templSpec=%s\n",usedName.data(),templSpec.data()); } - static bool sipSupport = Config_getBool("SIP_SUPPORT"); + static bool sipSupport = Config_getBool(SIP_SUPPORT); if (sipSupport) bi->prot=Public; if (!cd->isSubClass(baseClass)) // check for recursion, see bug690787 { @@ -5057,9 +5057,9 @@ static void computeClassRelations() { if (!root->name.isEmpty() && root->name.find('@')==-1 && // normal name (guessSection(root->fileName)==Entry::HEADER_SEC || - Config_getBool("EXTRACT_LOCAL_CLASSES")) && // not defined in source file + Config_getBool(EXTRACT_LOCAL_CLASSES)) && // not defined in source file protectionLevelVisible(root->protection) && // hidden by protection - !Config_getBool("HIDE_UNDOC_CLASSES") // undocumented class are visible + !Config_getBool(HIDE_UNDOC_CLASSES) // undocumented class are visible ) warn_undoc( root->fileName,root->startLine, @@ -5590,7 +5590,7 @@ static bool findGlobalMember(EntryNav *rootNav, if (root->type!="friend class" && root->type!="friend struct" && root->type!="friend union" && - (!Config_getBool("TYPEDEF_HIDES_STRUCT") || + (!Config_getBool(TYPEDEF_HIDES_STRUCT) || root->type.find("typedef ")==-1) ) { @@ -5999,7 +5999,7 @@ static void findMember(EntryNav *rootNav, //printf("scopeName=`%s' className=`%s'\n",scopeName.data(),className.data()); // rebuild the function declaration (needed to get the scope right). - if (!scopeName.isEmpty() && !isRelated && !isFriend && !Config_getBool("HIDE_SCOPE_NAMES")) + if (!scopeName.isEmpty() && !isRelated && !isFriend && !Config_getBool(HIDE_SCOPE_NAMES)) { if (!funcType.isEmpty()) { @@ -6323,7 +6323,7 @@ static void findMember(EntryNav *rootNav, } } } - static bool strictProtoMatching = Config_getBool("STRICT_PROTO_MATCHING"); + static bool strictProtoMatching = Config_getBool(STRICT_PROTO_MATCHING); if (!strictProtoMatching) { if (candidates==1 && ucd && umd) @@ -6760,7 +6760,7 @@ static void findMember(EntryNav *rootNav, localObjCMethod: ClassDef *cd; //printf("scopeName=`%s' className=`%s'\n",scopeName.data(),className.data()); - if (Config_getBool("EXTRACT_LOCAL_METHODS") && (cd=getClass(scopeName))) + if (Config_getBool(EXTRACT_LOCAL_METHODS) && (cd=getClass(scopeName))) { Debug::print(Debug::FindMembers,0,"4. Local objective C method %s\n" " scopeName=%s className=%s\n",qPrint(root->name),qPrint(scopeName),qPrint(className)); @@ -7133,7 +7133,7 @@ static void findEnums(EntryNav *rootNav) if (nd && !nd->name().isEmpty() && nd->name().at(0)!='@') { - if (isRelated || Config_getBool("HIDE_SCOPE_NAMES")) + if (isRelated || Config_getBool(HIDE_SCOPE_NAMES)) { md->setDefinition(name+baseType); } @@ -7165,7 +7165,7 @@ static void findEnums(EntryNav *rootNav) } else if (cd) { - if (isRelated || Config_getBool("HIDE_SCOPE_NAMES")) + if (isRelated || Config_getBool(HIDE_SCOPE_NAMES)) { md->setDefinition(name+baseType); } @@ -7819,7 +7819,7 @@ static void generateFileSources() if (Doxygen::inputNameList->count()>0) { #if USE_LIBCLANG - static bool clangAssistedParsing = Config_getBool("CLANG_ASSISTED_PARSING"); + static bool clangAssistedParsing = Config_getBool(CLANG_ASSISTED_PARSING); if (clangAssistedParsing) { QDict<void> g_processedFiles(10007); @@ -8560,7 +8560,7 @@ static void findDefineDocumentation(EntryNav *rootNav) } else if (!root->doc.isEmpty() || !root->brief.isEmpty()) // define not found { - static bool preEnabled = Config_getBool("ENABLE_PREPROCESSING"); + static bool preEnabled = Config_getBool(ENABLE_PREPROCESSING); if (preEnabled) { warn(root->fileName,root->startLine, @@ -8673,7 +8673,7 @@ static void buildPageList(EntryNav *rootNav) QCString title=root->args.stripWhiteSpace(); if (title.isEmpty()) title=theTranslator->trMainPage(); - //QCString name = Config_getBool("GENERATE_TREEVIEW")?"main":"index"; + //QCString name = Config_getBool(GENERATE_TREEVIEW)?"main":"index"; QCString name = "index"; addRefItem(root->sli, name, @@ -8700,7 +8700,7 @@ static void findMainPage(EntryNav *rootNav) Entry *root = rootNav->entry(); //printf("Found main page! \n======\n%s\n=======\n",root->doc.data()); QCString title=root->args.stripWhiteSpace(); - //QCString indexName=Config_getBool("GENERATE_TREEVIEW")?"main":"index"; + //QCString indexName=Config_getBool(GENERATE_TREEVIEW)?"main":"index"; QCString indexName="index"; Doxygen::mainPage = new PageDef(root->docFile,root->docLine, indexName, root->brief+root->doc+root->inbodyDocs,title); @@ -9112,7 +9112,7 @@ static void generateConfigFile(const char *configFile,bool shortList, if (fileOpened) { FTextStream t(&f); - Config::instance()->writeTemplate(t,shortList,updateOnly); + Config::writeTemplate(t,shortList,updateOnly); if (!writeToStdout) { if (!updateOnly) @@ -9189,7 +9189,7 @@ static void readTagFile(Entry *root,const char *tl) //---------------------------------------------------------------------------- static void copyLatexStyleSheet() { - QStrList latexExtraStyleSheet = Config_getList("LATEX_EXTRA_STYLESHEET"); + QStrList latexExtraStyleSheet = Config_getList(LATEX_EXTRA_STYLESHEET); for (uint i=0; i<latexExtraStyleSheet.count(); ++i) { QCString fileName(latexExtraStyleSheet.at(i)); @@ -9202,7 +9202,7 @@ static void copyLatexStyleSheet() } else { - QCString destFileName = Config_getString("LATEX_OUTPUT")+"/"+fi.fileName().data(); + QCString destFileName = Config_getString(LATEX_OUTPUT)+"/"+fi.fileName().data(); if (!checkExtension(fi.fileName().data(), latexStyleExtension)) { destFileName += latexStyleExtension; @@ -9216,7 +9216,7 @@ static void copyLatexStyleSheet() //---------------------------------------------------------------------------- static void copyStyleSheet() { - QCString &htmlStyleSheet = Config_getString("HTML_STYLESHEET"); + QCString &htmlStyleSheet = Config_getString(HTML_STYLESHEET); if (!htmlStyleSheet.isEmpty()) { QFileInfo fi(htmlStyleSheet); @@ -9227,11 +9227,11 @@ static void copyStyleSheet() } else { - QCString destFileName = Config_getString("HTML_OUTPUT")+"/"+fi.fileName().data(); + QCString destFileName = Config_getString(HTML_OUTPUT)+"/"+fi.fileName().data(); copyFile(htmlStyleSheet,destFileName); } } - QStrList htmlExtraStyleSheet = Config_getList("HTML_EXTRA_STYLESHEET"); + QStrList htmlExtraStyleSheet = Config_getList(HTML_EXTRA_STYLESHEET); for (uint i=0; i<htmlExtraStyleSheet.count(); ++i) { QCString fileName(htmlExtraStyleSheet.at(i)); @@ -9248,7 +9248,7 @@ static void copyStyleSheet() } else { - QCString destFileName = Config_getString("HTML_OUTPUT")+"/"+fi.fileName().data(); + QCString destFileName = Config_getString(HTML_OUTPUT)+"/"+fi.fileName().data(); copyFile(fileName, destFileName); } } @@ -9257,7 +9257,7 @@ static void copyStyleSheet() static void copyLogo() { - QCString &projectLogo = Config_getString("PROJECT_LOGO"); + QCString &projectLogo = Config_getString(PROJECT_LOGO); if (!projectLogo.isEmpty()) { QFileInfo fi(projectLogo); @@ -9268,16 +9268,15 @@ static void copyLogo() } else { - QCString destFileName = Config_getString("HTML_OUTPUT")+"/"+fi.fileName().data(); + QCString destFileName = Config_getString(HTML_OUTPUT)+"/"+fi.fileName().data(); copyFile(projectLogo,destFileName); Doxygen::indexList->addImageFile(fi.fileName().data()); } } } -static void copyExtraFiles(const QCString& filesOption,const QCString &outputOption) +static void copyExtraFiles(QStrList files,const QString &filesOption,const QCString &outputOption) { - QStrList files = Config_getList(filesOption); uint i; for (i=0; i<files.count(); ++i) { @@ -9288,11 +9287,11 @@ static void copyExtraFiles(const QCString& filesOption,const QCString &outputOpt QFileInfo fi(fileName); if (!fi.exists()) { - err("Extra file '%s' specified in " + filesOption + " does not exist!\n", fileName.data()); + err("Extra file '%s' specified in %s does not exist!\n", fileName.data(),filesOption.data()); } else { - QCString destFileName = Config_getString(outputOption)+"/"+fi.fileName().data(); + QCString destFileName = outputOption+"/"+fi.fileName().data(); Doxygen::indexList->addImageFile(fi.fileName().utf8()); copyFile(fileName, destFileName); } @@ -9325,7 +9324,7 @@ static void parseFile(ParserInterface *parser, bool sameTu,QStrList &filesInSameTu) { #if USE_LIBCLANG - static bool clangAssistedParsing = Config_getBool("CLANG_ASSISTED_PARSING"); + static bool clangAssistedParsing = Config_getBool(CLANG_ASSISTED_PARSING); #else static bool clangAssistedParsing = FALSE; #endif @@ -9344,7 +9343,7 @@ static void parseFile(ParserInterface *parser, QFileInfo fi(fileName); BufStr preBuf(fi.size()+4096); - if (Config_getBool("ENABLE_PREPROCESSING") && + if (Config_getBool(ENABLE_PREPROCESSING) && parser->needsPreprocessing(extension)) { BufStr inBuf(fi.size()+4096); @@ -9387,7 +9386,7 @@ static void parseFile(ParserInterface *parser, static void parseFiles(Entry *root,EntryNav *rootNav) { #if USE_LIBCLANG - static bool clangAssistedParsing = Config_getBool("CLANG_ASSISTED_PARSING"); + static bool clangAssistedParsing = Config_getBool(CLANG_ASSISTED_PARSING); if (clangAssistedParsing) { QDict<void> g_processedFiles(10007); @@ -9599,7 +9598,7 @@ int readDir(QFileInfo *fi, } } else if (cfi->isFile() && - (!Config_getBool("EXCLUDE_SYMLINKS") || !cfi->isSymLink()) && + (!Config_getBool(EXCLUDE_SYMLINKS) || !cfi->isSymLink()) && (patList==0 || patternMatch(*cfi,patList)) && !patternMatch(*cfi,exclPatList) && (killDict==0 || killDict->find(cfi->absFilePath().utf8())==0) @@ -9634,7 +9633,7 @@ int readDir(QFileInfo *fi, if (killDict) killDict->insert(cfi->absFilePath().utf8(),(void *)0x8); } else if (recursive && - (!Config_getBool("EXCLUDE_SYMLINKS") || !cfi->isSymLink()) && + (!Config_getBool(EXCLUDE_SYMLINKS) || !cfi->isSymLink()) && cfi->isDir() && !patternMatch(*cfi,exclPatList) && cfi->fileName().at(0)!='.') // skip "." ".." and ".dir" @@ -9690,7 +9689,7 @@ int readFileOrDirectory(const char *s, warn_uncond("source %s is not a readable file or directory... skipping.\n",s); } } - else if (!Config_getBool("EXCLUDE_SYMLINKS") || !fi.isSymLink()) + else if (!Config_getBool(EXCLUDE_SYMLINKS) || !fi.isSymLink()) { if (fi.isFile()) { @@ -9750,7 +9749,7 @@ int readFileOrDirectory(const char *s, void readFormulaRepository() { - QFile f(Config_getString("HTML_OUTPUT")+"/formula.repository"); + QFile f(Config_getString(HTML_OUTPUT)+"/formula.repository"); if (f.open(IO_ReadOnly)) // open repository { msg("Reading formula repository...\n"); @@ -9832,7 +9831,7 @@ void readAliases() { // add aliases to a dictionary Doxygen::aliasDict.setAutoDelete(TRUE); - QStrList &aliasList = Config_getList("ALIASES"); + QStrList &aliasList = Config_getList(ALIASES); const char *s=aliasList.first(); while (s) { @@ -10019,7 +10018,6 @@ void initDoxygen() Doxygen::functionNameSDict->setAutoDelete(TRUE); Doxygen::groupSDict = new GroupSDict(17); Doxygen::groupSDict->setAutoDelete(TRUE); - Doxygen::globalScope = new NamespaceDef("<globalScope>",1,1,"<globalScope>"); Doxygen::namespaceSDict = new NamespaceSDict(20); Doxygen::namespaceSDict->setAutoDelete(TRUE); Doxygen::classSDict = new ClassSDict(1009); @@ -10032,15 +10030,6 @@ void initDoxygen() Doxygen::pageSDict->setAutoDelete(TRUE); Doxygen::exampleSDict = new PageSDict(1009); // all examples Doxygen::exampleSDict->setAutoDelete(TRUE); - Doxygen::inputNameDict = new FileNameDict(10007); - Doxygen::includeNameDict = new FileNameDict(10007); - Doxygen::exampleNameDict = new FileNameDict(1009); - Doxygen::exampleNameDict->setAutoDelete(TRUE); - Doxygen::imageNameDict = new FileNameDict(257); - Doxygen::imageNameDict->setAutoDelete(TRUE); - Doxygen::dotFileNameDict = new FileNameDict(257); - Doxygen::mscFileNameDict = new FileNameDict(257); - Doxygen::diaFileNameDict = new FileNameDict(257); Doxygen::memGrpInfoDict.setAutoDelete(TRUE); Doxygen::tagDestinationDict.setAutoDelete(TRUE); Doxygen::dirRelations.setAutoDelete(TRUE); @@ -10053,6 +10042,17 @@ void initDoxygen() Doxygen::sectionDict = new SectionDict(257); Doxygen::sectionDict->setAutoDelete(TRUE); + // initialisation of these globals depends on + // configuration switches so we need to postpone these + Doxygen::globalScope = 0; + Doxygen::inputNameDict = 0; + Doxygen::includeNameDict = 0; + Doxygen::exampleNameDict = 0; + Doxygen::imageNameDict = 0; + Doxygen::dotFileNameDict = 0; + Doxygen::mscFileNameDict = 0; + Doxygen::diaFileNameDict = 0; + /************************************************************************** * Initialize some global constants **************************************************************************/ @@ -10258,23 +10258,18 @@ void readConfiguration(int argc, char **argv) if (optind+4<argc || QFileInfo("Doxyfile").exists()) { QCString df = optind+4<argc ? argv[optind+4] : QCString("Doxyfile"); - if (!Config::instance()->parse(df)) + if (!Config::parse(df)) { err("error opening or reading configuration file %s!\n",argv[optind+4]); cleanUpDoxygen(); exit(1); } - Config::instance()->substituteEnvironmentVars(); - Config::instance()->convertStrToVal(); - // avoid bootstrapping issues when the config file already - // refers to the files that we are supposed to parse. - Config_getString("HTML_HEADER")=""; - Config_getString("HTML_FOOTER")=""; - Config::instance()->check(); + Config::postProcess(TRUE); + Config::checkAndCorrect(); } else { - Config::instance()->init(); + Config::init(); } if (optind+3>=argc) { @@ -10283,7 +10278,7 @@ void readConfiguration(int argc, char **argv) exit(1); } - QCString outputLanguage=Config_getEnum("OUTPUT_LANGUAGE"); + QCString outputLanguage=Config_getEnum(OUTPUT_LANGUAGE); if (!setTranslator(outputLanguage)) { warn_uncond("Output language %s not supported! Using English instead.\n", outputLanguage.data()); @@ -10312,21 +10307,18 @@ void readConfiguration(int argc, char **argv) if (optind+4<argc || QFileInfo("Doxyfile").exists()) { QCString df = optind+4<argc ? argv[optind+4] : QCString("Doxyfile"); - if (!Config::instance()->parse(df)) + if (!Config::parse(df)) { err("error opening or reading configuration file %s!\n",argv[optind+4]); cleanUpDoxygen(); exit(1); } - Config::instance()->substituteEnvironmentVars(); - Config::instance()->convertStrToVal(); - Config_getString("LATEX_HEADER")=""; - Config_getString("LATEX_FOOTER")=""; - Config::instance()->check(); + Config::postProcess(TRUE); + Config::checkAndCorrect(); } else // use default config { - Config::instance()->init(); + Config::init(); } if (optind+3>=argc) { @@ -10335,7 +10327,7 @@ void readConfiguration(int argc, char **argv) exit(1); } - QCString outputLanguage=Config_getEnum("OUTPUT_LANGUAGE"); + QCString outputLanguage=Config_getEnum(OUTPUT_LANGUAGE); if (!setTranslator(outputLanguage)) { warn_uncond("Output language %s not supported! Using English instead.\n", outputLanguage.data()); @@ -10420,7 +10412,7 @@ void readConfiguration(int argc, char **argv) * Parse or generate the config file * **************************************************************************/ - Config::instance()->init(); + Config::init(); if (genConfig) { @@ -10469,7 +10461,7 @@ void readConfiguration(int argc, char **argv) } - if (!Config::instance()->parse(configName,updateConfig)) + if (!Config::parse(configName,updateConfig)) { err("could not open or read configuration file %s!\n",configName); cleanUpDoxygen(); @@ -10493,23 +10485,32 @@ void readConfiguration(int argc, char **argv) void checkConfiguration() { - Config::instance()->substituteEnvironmentVars(); - Config::instance()->convertStrToVal(); - Config::instance()->check(); - + Config::postProcess(FALSE); + Config::checkAndCorrect(); initWarningFormat(); } /** adjust globals that depend on configuration settings. */ void adjustConfiguration() { - QCString outputLanguage=Config_getEnum("OUTPUT_LANGUAGE"); + Doxygen::globalScope = new NamespaceDef("<globalScope>",1,1,"<globalScope>"); + Doxygen::inputNameDict = new FileNameDict(10007); + Doxygen::includeNameDict = new FileNameDict(10007); + Doxygen::exampleNameDict = new FileNameDict(1009); + Doxygen::exampleNameDict->setAutoDelete(TRUE); + Doxygen::imageNameDict = new FileNameDict(257); + Doxygen::imageNameDict->setAutoDelete(TRUE); + Doxygen::dotFileNameDict = new FileNameDict(257); + Doxygen::mscFileNameDict = new FileNameDict(257); + Doxygen::diaFileNameDict = new FileNameDict(257); + + QCString outputLanguage=Config_getEnum(OUTPUT_LANGUAGE); if (!setTranslator(outputLanguage)) { warn_uncond("Output language %s not supported! Using English instead.\n", outputLanguage.data()); } - QStrList &includePath = Config_getList("INCLUDE_PATH"); + QStrList &includePath = Config_getList(INCLUDE_PATH); char *s=includePath.first(); while (s) { @@ -10519,23 +10520,23 @@ void adjustConfiguration() } /* Set the global html file extension. */ - Doxygen::htmlFileExtension = Config_getString("HTML_FILE_EXTENSION"); + Doxygen::htmlFileExtension = Config_getString(HTML_FILE_EXTENSION); Doxygen::xrefLists->setAutoDelete(TRUE); - Doxygen::parseSourcesNeeded = Config_getBool("CALL_GRAPH") || - Config_getBool("CALLER_GRAPH") || - Config_getBool("REFERENCES_RELATION") || - Config_getBool("REFERENCED_BY_RELATION"); + Doxygen::parseSourcesNeeded = Config_getBool(CALL_GRAPH) || + Config_getBool(CALLER_GRAPH) || + Config_getBool(REFERENCES_RELATION) || + Config_getBool(REFERENCED_BY_RELATION); - Doxygen::markdownSupport = Config_getBool("MARKDOWN_SUPPORT"); + Doxygen::markdownSupport = Config_getBool(MARKDOWN_SUPPORT); /************************************************************************** * Add custom extension mappings **************************************************************************/ - QStrList &extMaps = Config_getList("EXTENSION_MAPPING"); + QStrList &extMaps = Config_getList(EXTENSION_MAPPING); char *mapping = extMaps.first(); while (mapping) { @@ -10562,7 +10563,7 @@ void adjustConfiguration() // add predefined macro name to a dictionary - QStrList &expandAsDefinedList =Config_getList("EXPAND_AS_DEFINED"); + QStrList &expandAsDefinedList =Config_getList(EXPAND_AS_DEFINED); s=expandAsDefinedList.first(); while (s) { @@ -10577,7 +10578,7 @@ void adjustConfiguration() readAliases(); // store number of spaces in a tab into Doxygen::spaces - int &tabSize = Config_getInt("TAB_SIZE"); + int &tabSize = Config_getInt(TAB_SIZE); Doxygen::spaces.resize(tabSize+1); int sp;for (sp=0;sp<tabSize;sp++) Doxygen::spaces.at(sp)=' '; Doxygen::spaces.at(tabSize)='\0'; @@ -10603,7 +10604,7 @@ static void stopDoxygen(int) static void writeTagFile() { - QCString &generateTagFile = Config_getString("GENERATE_TAGFILE"); + QCString &generateTagFile = Config_getString(GENERATE_TAGFILE); if (generateTagFile.isEmpty()) return; QFile tag(generateTagFile); @@ -10661,7 +10662,7 @@ static void writeTagFile() if (Doxygen::mainPage) Doxygen::mainPage->writeTagFile(tagFile); /* - if (Doxygen::mainPage && !Config_getString("GENERATE_TAGFILE").isEmpty()) + if (Doxygen::mainPage && !Config_getString(GENERATE_TAGFILE).isEmpty()) { tagFile << " <compound kind=\"page\">" << endl << " <name>" @@ -10700,11 +10701,10 @@ static void exitDoxygen() } static QCString createOutputDirectory(const QCString &baseDirName, - const char *formatDirOption, + QCString &formatDirName, const char *defaultDirName) { // Note the & on the next line, we modify the formatDirOption! - QCString &formatDirName = Config_getString(formatDirOption); if (formatDirName.isEmpty()) { formatDirName = baseDirName + defaultDirName; @@ -10725,14 +10725,14 @@ static QCString createOutputDirectory(const QCString &baseDirName, static QCString getQchFileName() { - QCString const & qchFile = Config_getString("QCH_FILE"); + QCString const & qchFile = Config_getString(QCH_FILE); if (!qchFile.isEmpty()) { return qchFile; } - QCString const & projectName = Config_getString("PROJECT_NAME"); - QCString const & versionText = Config_getString("PROJECT_NUMBER"); + QCString const & projectName = Config_getString(PROJECT_NAME); + QCString const & versionText = Config_getString(PROJECT_NUMBER); return QCString("../qch/") + (projectName.isEmpty() ? QCString("index") : projectName) @@ -10742,21 +10742,21 @@ static QCString getQchFileName() void searchInputFiles() { - QStrList &exclPatterns = Config_getList("EXCLUDE_PATTERNS"); - bool alwaysRecursive = Config_getBool("RECURSIVE"); + QStrList &exclPatterns = Config_getList(EXCLUDE_PATTERNS); + bool alwaysRecursive = Config_getBool(RECURSIVE); StringDict excludeNameDict(1009); excludeNameDict.setAutoDelete(TRUE); // gather names of all files in the include path g_s.begin("Searching for include files...\n"); - QStrList &includePathList = Config_getList("INCLUDE_PATH"); + QStrList &includePathList = Config_getList(INCLUDE_PATH); char *s=includePathList.first(); while (s) { - QStrList &pl = Config_getList("INCLUDE_FILE_PATTERNS"); + QStrList &pl = Config_getList(INCLUDE_FILE_PATTERNS); if (pl.count()==0) { - pl = Config_getList("FILE_PATTERNS"); + pl = Config_getList(FILE_PATTERNS); } readFileOrDirectory(s,0,Doxygen::includeNameDict,0,&pl, &exclPatterns,0,0, @@ -10766,20 +10766,20 @@ void searchInputFiles() g_s.end(); g_s.begin("Searching for example files...\n"); - QStrList &examplePathList = Config_getList("EXAMPLE_PATH"); + QStrList &examplePathList = Config_getList(EXAMPLE_PATH); s=examplePathList.first(); while (s) { readFileOrDirectory(s,0,Doxygen::exampleNameDict,0, - &Config_getList("EXAMPLE_PATTERNS"), + &Config_getList(EXAMPLE_PATTERNS), 0,0,0, - (alwaysRecursive || Config_getBool("EXAMPLE_RECURSIVE"))); + (alwaysRecursive || Config_getBool(EXAMPLE_RECURSIVE))); s=examplePathList.next(); } g_s.end(); g_s.begin("Searching for images...\n"); - QStrList &imagePathList=Config_getList("IMAGE_PATH"); + QStrList &imagePathList=Config_getList(IMAGE_PATH); s=imagePathList.first(); while (s) { @@ -10791,7 +10791,7 @@ void searchInputFiles() g_s.end(); g_s.begin("Searching for dot files...\n"); - QStrList &dotFileList=Config_getList("DOTFILE_DIRS"); + QStrList &dotFileList=Config_getList(DOTFILE_DIRS); s=dotFileList.first(); while (s) { @@ -10803,7 +10803,7 @@ void searchInputFiles() g_s.end(); g_s.begin("Searching for msc files...\n"); - QStrList &mscFileList=Config_getList("MSCFILE_DIRS"); + QStrList &mscFileList=Config_getList(MSCFILE_DIRS); s=mscFileList.first(); while (s) { @@ -10815,7 +10815,7 @@ void searchInputFiles() g_s.end(); g_s.begin("Searching for dia files...\n"); - QStrList &diaFileList=Config_getList("DIAFILE_DIRS"); + QStrList &diaFileList=Config_getList(DIAFILE_DIRS); s=diaFileList.first(); while (s) { @@ -10827,11 +10827,11 @@ void searchInputFiles() g_s.end(); g_s.begin("Searching for files to exclude\n"); - QStrList &excludeList = Config_getList("EXCLUDE"); + QStrList &excludeList = Config_getList(EXCLUDE); s=excludeList.first(); while (s) { - readFileOrDirectory(s,0,0,0,&Config_getList("FILE_PATTERNS"), + readFileOrDirectory(s,0,0,0,&Config_getList(FILE_PATTERNS), 0,0,&excludeNameDict, alwaysRecursive, FALSE); @@ -10845,7 +10845,7 @@ void searchInputFiles() g_s.begin("Searching INPUT for files to process...\n"); QDict<void> *killDict = new QDict<void>(10007); - QStrList &inputList=Config_getList("INPUT"); + QStrList &inputList=Config_getList(INPUT); g_inputFiles.setAutoDelete(TRUE); s=inputList.first(); while (s) @@ -10862,7 +10862,7 @@ void searchInputFiles() Doxygen::inputNameList, Doxygen::inputNameDict, &excludeNameDict, - &Config_getList("FILE_PATTERNS"), + &Config_getList(FILE_PATTERNS), &exclPatterns, &g_inputFiles,0, alwaysRecursive, @@ -10885,7 +10885,7 @@ void parseInput() /************************************************************************** * Make sure the output directory exists **************************************************************************/ - QCString &outputDirectory = Config_getString("OUTPUT_DIRECTORY"); + QCString &outputDirectory = Config_getString(OUTPUT_DIRECTORY); if (outputDirectory.isEmpty()) { outputDirectory=QDir::currentDirPath().utf8(); @@ -10920,7 +10920,7 @@ void parseInput() Doxygen::symbolStorage = new Store; // also scale lookup cache with SYMBOL_CACHE_SIZE - int cacheSize = Config_getInt("LOOKUP_CACHE_SIZE"); + int cacheSize = Config_getInt(LOOKUP_CACHE_SIZE); if (cacheSize<0) cacheSize=0; if (cacheSize>9) cacheSize=9; uint lookupSize = 65536 << cacheSize; @@ -10950,43 +10950,43 @@ void parseInput() **************************************************************************/ QCString htmlOutput; - bool &generateHtml = Config_getBool("GENERATE_HTML"); + bool &generateHtml = Config_getBool(GENERATE_HTML); if (generateHtml || g_useOutputTemplate /* TODO: temp hack */) - htmlOutput = createOutputDirectory(outputDirectory,"HTML_OUTPUT","/html"); + htmlOutput = createOutputDirectory(outputDirectory,Config_getString(HTML_OUTPUT),"/html"); QCString docbookOutput; - bool &generateDocbook = Config_getBool("GENERATE_DOCBOOK"); + bool &generateDocbook = Config_getBool(GENERATE_DOCBOOK); if (generateDocbook) - docbookOutput = createOutputDirectory(outputDirectory,"DOCBOOK_OUTPUT","/docbook"); + docbookOutput = createOutputDirectory(outputDirectory,Config_getString(DOCBOOK_OUTPUT),"/docbook"); QCString xmlOutput; - bool &generateXml = Config_getBool("GENERATE_XML"); + bool &generateXml = Config_getBool(GENERATE_XML); if (generateXml) - xmlOutput = createOutputDirectory(outputDirectory,"XML_OUTPUT","/xml"); + xmlOutput = createOutputDirectory(outputDirectory,Config_getString(XML_OUTPUT),"/xml"); QCString latexOutput; - bool &generateLatex = Config_getBool("GENERATE_LATEX"); + bool &generateLatex = Config_getBool(GENERATE_LATEX); if (generateLatex) - latexOutput = createOutputDirectory(outputDirectory,"LATEX_OUTPUT","/latex"); + latexOutput = createOutputDirectory(outputDirectory,Config_getString(LATEX_OUTPUT),"/latex"); QCString rtfOutput; - bool &generateRtf = Config_getBool("GENERATE_RTF"); + bool &generateRtf = Config_getBool(GENERATE_RTF); if (generateRtf) - rtfOutput = createOutputDirectory(outputDirectory,"RTF_OUTPUT","/rtf"); + rtfOutput = createOutputDirectory(outputDirectory,Config_getString(RTF_OUTPUT),"/rtf"); QCString manOutput; - bool &generateMan = Config_getBool("GENERATE_MAN"); + bool &generateMan = Config_getBool(GENERATE_MAN); if (generateMan) - manOutput = createOutputDirectory(outputDirectory,"MAN_OUTPUT","/man"); + manOutput = createOutputDirectory(outputDirectory,Config_getString(MAN_OUTPUT),"/man"); //QCString sqlOutput; - //bool &generateSql = Config_getBool("GENERATE_SQLITE3"); + //bool &generateSql = Config_getBool(GENERATE_SQLITE3); //if (generateSql) // sqlOutput = createOutputDirectory(outputDirectory,"SQLITE3_OUTPUT","/sqlite3"); - if (Config_getBool("HAVE_DOT")) + if (Config_getBool(HAVE_DOT)) { - QCString curFontPath = Config_getString("DOT_FONTPATH"); + QCString curFontPath = Config_getString(DOT_FONTPATH); if (curFontPath.isEmpty()) { portable_getenv("DOTFONTPATH"); @@ -11011,7 +11011,7 @@ void parseInput() **************************************************************************/ LayoutDocManager::instance().init(); - QCString &layoutFileName = Config_getString("LAYOUT_FILE"); + QCString &layoutFileName = Config_getString(LAYOUT_FILE); bool defaultLayoutUsed = FALSE; if (layoutFileName.isEmpty()) { @@ -11037,7 +11037,7 @@ void parseInput() **************************************************************************/ // prevent search in the output directories - QStrList &exclPatterns = Config_getList("EXCLUDE_PATTERNS"); + QStrList &exclPatterns = Config_getList(EXCLUDE_PATTERNS); if (generateHtml) exclPatterns.append(htmlOutput); if (generateDocbook) exclPatterns.append(docbookOutput); if (generateXml) exclPatterns.append(xmlOutput); @@ -11049,7 +11049,7 @@ void parseInput() // Notice: the order of the function calls below is very important! - if (Config_getBool("GENERATE_HTML")) + if (Config_getBool(GENERATE_HTML)) { readFormulaRepository(); } @@ -11071,7 +11071,7 @@ void parseInput() rootNav->setEntry(root); msg("Reading and parsing tag files\n"); - QStrList &tagFileList = Config_getList("TAGFILES"); + QStrList &tagFileList = Config_getList(TAGFILES); char *s=tagFileList.first(); while (s) { @@ -11084,7 +11084,7 @@ void parseInput() * Parse source files * **************************************************************************/ - if (Config_getBool("BUILTIN_STL_SUPPORT")) + if (Config_getBool(BUILTIN_STL_SUPPORT)) { addSTLClasses(rootNav); } @@ -11210,7 +11210,7 @@ void parseInput() findUsedTemplateInstances(); g_s.end(); - if (Config_getBool("INLINE_SIMPLE_STRUCTS")) + if (Config_getBool(INLINE_SIMPLE_STRUCTS)) { g_s.begin("Searching for tag less structs...\n"); findTagLessClasses(); @@ -11221,14 +11221,10 @@ void parseInput() flushCachedTemplateRelations(); g_s.end(); - g_s.begin("Creating members for template instances...\n"); - createTemplateInstanceMembers(); - g_s.end(); - g_s.begin("Computing class relations...\n"); computeTemplateClassRelations(); flushUnresolvedRelations(); - if (Config_getBool("OPTIMIZE_OUTPUT_VHDL")) + if (Config_getBool(OPTIMIZE_OUTPUT_VHDL)) { VhdlDocGen::computeVhdlComponentRelations(); } @@ -11249,6 +11245,12 @@ void parseInput() transferFunctionDocumentation(); g_s.end(); + // moved to after finding and copying documentation, + // as this introduces new members see bug 722654 + g_s.begin("Creating members for template instances...\n"); + createTemplateInstanceMembers(); + g_s.end(); + g_s.begin("Building page list...\n"); buildPageList(rootNav); g_s.end(); @@ -11300,7 +11302,7 @@ void parseInput() addMembersToMemberGroup(); g_s.end(); - if (Config_getBool("DISTRIBUTE_GROUP_DOC")) + if (Config_getBool(DISTRIBUTE_GROUP_DOC)) { g_s.begin("Distributing member group documentation.\n"); distributeMemberGroupDocumentation(); @@ -11311,7 +11313,7 @@ void parseInput() computeMemberReferences(); g_s.end(); - if (Config_getBool("INHERIT_DOCS")) + if (Config_getBool(INHERIT_DOCS)) { g_s.begin("Inheriting documentation...\n"); inheritDocumentation(); @@ -11337,7 +11339,7 @@ void parseInput() sortMemberLists(); g_s.end(); - if (Config_getBool("DIRECTORY_GRAPH")) + if (Config_getBool(DIRECTORY_GRAPH)) { g_s.begin("Computing dependencies between directories...\n"); computeDirDependencies(); @@ -11394,10 +11396,10 @@ void generateOutput() initSearchIndexer(); - bool generateHtml = Config_getBool("GENERATE_HTML"); - bool generateLatex = Config_getBool("GENERATE_LATEX"); - bool generateMan = Config_getBool("GENERATE_MAN"); - bool generateRtf = Config_getBool("GENERATE_RTF"); + bool generateHtml = Config_getBool(GENERATE_HTML); + bool generateLatex = Config_getBool(GENERATE_LATEX); + bool generateMan = Config_getBool(GENERATE_MAN); + bool generateRtf = Config_getBool(GENERATE_RTF); g_outputList = new OutputList(TRUE); @@ -11407,11 +11409,11 @@ void generateOutput() HtmlGenerator::init(); // add HTML indexers that are enabled - bool generateHtmlHelp = Config_getBool("GENERATE_HTMLHELP"); - bool generateEclipseHelp = Config_getBool("GENERATE_ECLIPSEHELP"); - bool generateQhp = Config_getBool("GENERATE_QHP"); - bool generateTreeView = Config_getBool("GENERATE_TREEVIEW"); - bool generateDocSet = Config_getBool("GENERATE_DOCSET"); + bool generateHtmlHelp = Config_getBool(GENERATE_HTMLHELP); + bool generateEclipseHelp = Config_getBool(GENERATE_ECLIPSEHELP); + bool generateQhp = Config_getBool(GENERATE_QHP); + bool generateTreeView = Config_getBool(GENERATE_TREEVIEW); + bool generateDocSet = Config_getBool(GENERATE_DOCSET); if (generateEclipseHelp) Doxygen::indexList->addIndex(new EclipseHelp); if (generateHtmlHelp) Doxygen::indexList->addIndex(new HtmlHelp); if (generateQhp) Doxygen::indexList->addIndex(new Qhp); @@ -11435,10 +11437,10 @@ void generateOutput() g_outputList->add(new RTFGenerator); RTFGenerator::init(); } - if (Config_getBool("USE_HTAGS")) + if (Config_getBool(USE_HTAGS)) { Htags::useHtags = TRUE; - QCString htmldir = Config_getString("HTML_OUTPUT"); + QCString htmldir = Config_getString(HTML_OUTPUT); if (!Htags::execute(htmldir)) err("USE_HTAGS is YES but htags(1) failed. \n"); if (!Htags::loadFilemap(htmldir)) @@ -11449,17 +11451,17 @@ void generateOutput() * Generate documentation * **************************************************************************/ - if (generateHtml) writeDoxFont(Config_getString("HTML_OUTPUT")); - if (generateLatex) writeDoxFont(Config_getString("LATEX_OUTPUT")); - if (generateRtf) writeDoxFont(Config_getString("RTF_OUTPUT")); + if (generateHtml) writeDoxFont(Config_getString(HTML_OUTPUT)); + if (generateLatex) writeDoxFont(Config_getString(LATEX_OUTPUT)); + if (generateRtf) writeDoxFont(Config_getString(RTF_OUTPUT)); g_s.begin("Generating style sheet...\n"); //printf("writing style info\n"); g_outputList->writeStyleInfo(0); // write first part g_s.end(); - static bool searchEngine = Config_getBool("SEARCHENGINE"); - static bool serverBasedSearch = Config_getBool("SERVER_BASED_SEARCH"); + static bool searchEngine = Config_getBool(SEARCHENGINE); + static bool serverBasedSearch = Config_getBool(SERVER_BASED_SEARCH); g_s.begin("Generating search indices...\n"); if (searchEngine && !serverBasedSearch && (generateHtml || g_useOutputTemplate)) @@ -11472,7 +11474,7 @@ void generateOutput() // what categories we find in this function. if (generateHtml && searchEngine) { - QCString searchDirName = Config_getString("HTML_OUTPUT")+"/search"; + QCString searchDirName = Config_getString(HTML_OUTPUT)+"/search"; QDir searchDir(searchDirName); if (!searchDir.exists() && !searchDir.mkdir(searchDirName)) { @@ -11519,7 +11521,7 @@ void generateOutput() generateNamespaceDocs(); g_s.end(); - if (Config_getBool("GENERATE_LEGEND")) + if (Config_getBool(GENERATE_LEGEND)) { g_s.begin("Generating graph info page...\n"); writeGraphInfo(*g_outputList); @@ -11531,14 +11533,14 @@ void generateOutput() g_s.end(); if (Doxygen::formulaList->count()>0 && generateHtml - && !Config_getBool("USE_MATHJAX")) + && !Config_getBool(USE_MATHJAX)) { g_s.begin("Generating bitmaps for formulas in HTML...\n"); - Doxygen::formulaList->generateBitmaps(Config_getString("HTML_OUTPUT")); + Doxygen::formulaList->generateBitmaps(Config_getString(HTML_OUTPUT)); g_s.end(); } - if (Config_getBool("SORT_GROUP_NAMES")) + if (Config_getBool(SORT_GROUP_NAMES)) { Doxygen::groupSDict->sort(); GroupSDict::Iterator gli(*Doxygen::groupSDict); @@ -11562,17 +11564,17 @@ void generateOutput() writeTagFile(); g_s.end(); - if (Config_getBool("DOT_CLEANUP")) + if (Config_getBool(DOT_CLEANUP)) { if (generateHtml) - removeDoxFont(Config_getString("HTML_OUTPUT")); + removeDoxFont(Config_getString(HTML_OUTPUT)); if (generateRtf) - removeDoxFont(Config_getString("RTF_OUTPUT")); + removeDoxFont(Config_getString(RTF_OUTPUT)); if (generateLatex) - removeDoxFont(Config_getString("LATEX_OUTPUT")); + removeDoxFont(Config_getString(LATEX_OUTPUT)); } - if (Config_getBool("GENERATE_XML")) + if (Config_getBool(GENERATE_XML)) { g_s.begin("Generating XML output...\n"); Doxygen::generatingXmlOutput=TRUE; @@ -11587,20 +11589,20 @@ void generateOutput() g_s.end(); } - if (Config_getBool("GENERATE_DOCBOOK")) + if (Config_getBool(GENERATE_DOCBOOK)) { g_s.begin("Generating Docbook output...\n"); generateDocbook(); g_s.end(); } - if (Config_getBool("GENERATE_AUTOGEN_DEF")) + if (Config_getBool(GENERATE_AUTOGEN_DEF)) { g_s.begin("Generating AutoGen DEF output...\n"); generateDEF(); g_s.end(); } - if (Config_getBool("GENERATE_PERLMOD")) + if (Config_getBool(GENERATE_PERLMOD)) { g_s.begin("Generating Perl module output...\n"); generatePerlMod(); @@ -11612,19 +11614,19 @@ void generateOutput() if (Doxygen::searchIndex->kind()==SearchIndexIntf::Internal) // write own search index { HtmlGenerator::writeSearchPage(); - Doxygen::searchIndex->write(Config_getString("HTML_OUTPUT")+"/search/search.idx"); + Doxygen::searchIndex->write(Config_getString(HTML_OUTPUT)+"/search/search.idx"); } else // write data for external search index { HtmlGenerator::writeExternalSearchPage(); - QCString searchDataFile = Config_getString("SEARCHDATA_FILE"); + QCString searchDataFile = Config_getString(SEARCHDATA_FILE); if (searchDataFile.isEmpty()) { searchDataFile="searchdata.xml"; } if (!portable_isAbsolutePath(searchDataFile)) { - searchDataFile.prepend(Config_getString("OUTPUT_DIRECTORY")+"/"); + searchDataFile.prepend(Config_getString(OUTPUT_DIRECTORY)+"/"); } Doxygen::searchIndex->write(searchDataFile); } @@ -11636,14 +11638,14 @@ void generateOutput() if (generateRtf) { g_s.begin("Combining RTF output...\n"); - if (!RTFGenerator::preProcessFileInplace(Config_getString("RTF_OUTPUT"),"refman.rtf")) + if (!RTFGenerator::preProcessFileInplace(Config_getString(RTF_OUTPUT),"refman.rtf")) { err("An error occurred during post-processing the RTF files!\n"); } g_s.end(); } - if (Config_getBool("HAVE_DOT")) + if (Config_getBool(HAVE_DOT)) { g_s.begin("Running dot...\n"); DotManager::instance()->run(); @@ -11656,23 +11658,23 @@ void generateOutput() FTVHelp::generateTreeViewImages(); copyStyleSheet(); copyLogo(); - copyExtraFiles("HTML_EXTRA_FILES","HTML_OUTPUT"); + copyExtraFiles(Config_getList(HTML_EXTRA_FILES),"HTML_EXTRA_FILES",Config_getString(HTML_OUTPUT)); } if (generateLatex) { copyLatexStyleSheet(); - copyExtraFiles("LATEX_EXTRA_FILES","LATEX_OUTPUT"); + copyExtraFiles(Config_getList(LATEX_EXTRA_FILES),"LATEX_EXTRA_FILES",Config_getString(LATEX_OUTPUT)); } if (generateHtml && - Config_getBool("GENERATE_HTMLHELP") && - !Config_getString("HHC_LOCATION").isEmpty()) + Config_getBool(GENERATE_HTMLHELP) && + !Config_getString(HHC_LOCATION).isEmpty()) { g_s.begin("Running html help compiler...\n"); QString oldDir = QDir::currentDirPath(); - QDir::setCurrent(Config_getString("HTML_OUTPUT")); + QDir::setCurrent(Config_getString(HTML_OUTPUT)); portable_sysTimerStart(); - if (portable_system(Config_getString("HHC_LOCATION"), "index.hhp", Debug::isFlagSet(Debug::ExtCmd))) + if (portable_system(Config_getString(HHC_LOCATION), "index.hhp", Debug::isFlagSet(Debug::ExtCmd))) { err("failed to run html help compiler on index.hhp\n"); } @@ -11681,8 +11683,8 @@ void generateOutput() g_s.end(); } if ( generateHtml && - Config_getBool("GENERATE_QHP") && - !Config_getString("QHG_LOCATION").isEmpty()) + Config_getBool(GENERATE_QHP) && + !Config_getString(QHG_LOCATION).isEmpty()) { g_s.begin("Running qhelpgenerator...\n"); QCString const qhpFileName = Qhp::getQhpFileName(); @@ -11690,9 +11692,9 @@ 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")); + QDir::setCurrent(Config_getString(HTML_OUTPUT)); portable_sysTimerStart(); - if (portable_system(Config_getString("QHG_LOCATION"), args.data(), FALSE)) + if (portable_system(Config_getString(QHG_LOCATION), args.data(), FALSE)) { err("failed to run qhelpgenerator on index.qhp\n"); } @@ -11708,7 +11710,7 @@ void generateOutput() Doxygen::lookupCache->hits(), Doxygen::lookupCache->misses()); cacheParam = computeIdealCacheParam(Doxygen::lookupCache->misses()*2/3); // part of the cache is flushed, hence the 2/3 correction factor - if (cacheParam>Config_getInt("LOOKUP_CACHE_SIZE")) + if (cacheParam>Config_getInt(LOOKUP_CACHE_SIZE)) { msg("Note: based on cache misses the ideal setting for LOOKUP_CACHE_SIZE is %d at the cost of higher memory usage.\n",cacheParam); } @@ -11737,7 +11739,7 @@ void generateOutput() Doxygen::symbolStorage->close(); QDir thisDir; thisDir.remove(Doxygen::objDBFileName); - Config::deleteInstance(); + Config::deinit(); QTextCodec::deleteAllCodecs(); delete Doxygen::symbolMap; delete Doxygen::clangUsrMap; diff --git a/src/doxygen.h b/src/doxygen.h index 2195a35..b3467c1 100644 --- a/src/doxygen.h +++ b/src/doxygen.h @@ -1,8 +1,5 @@ /****************************************************************************** * - * - * - * * Copyright (C) 1997-2015 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its diff --git a/src/eclipsehelp.cpp b/src/eclipsehelp.cpp index db5ed4f..bf150b4 100644 --- a/src/eclipsehelp.cpp +++ b/src/eclipsehelp.cpp @@ -64,11 +64,11 @@ void EclipseHelp::openedTag() void EclipseHelp::initialize() { // -- read path prefix from the configuration - //m_pathprefix = Config_getString("ECLIPSE_PATHPREFIX"); + //m_pathprefix = Config_getString(ECLIPSE_PATHPREFIX); //if (m_pathprefix.isEmpty()) m_pathprefix = "html/"; // -- open the contents file - QCString name = Config_getString("HTML_OUTPUT") + "/toc.xml"; + QCString name = Config_getString(HTML_OUTPUT) + "/toc.xml"; m_tocfile = new QFile(name); if (!m_tocfile->open(IO_WriteOnly)) { @@ -81,7 +81,7 @@ void EclipseHelp::initialize() //m_tocstream.setEncoding(FTextStream::UnicodeUTF8); // -- write the opening tag - QCString title = Config_getString("PROJECT_NAME"); + QCString title = Config_getString(PROJECT_NAME); if (title.isEmpty()) { title = "Doxygen generated documentation"; @@ -111,11 +111,11 @@ void EclipseHelp::finalize() m_tocfile->close(); delete m_tocfile; m_tocfile = 0; - QCString name = Config_getString("HTML_OUTPUT") + "/plugin.xml"; + QCString name = Config_getString(HTML_OUTPUT) + "/plugin.xml"; QFile pluginFile(name); if (pluginFile.open(IO_WriteOnly)) { - QString docId = Config_getString("ECLIPSE_DOC_ID"); + QString docId = Config_getString(ECLIPSE_DOC_ID); FTextStream t(&pluginFile); t << "<plugin name=\"" << docId << "\" id=\"" << docId << "\"" << endl; t << " version=\"1.0.0\" provider-name=\"Doxygen\">" << endl; diff --git a/src/entry.cpp b/src/entry.cpp index bf45f87..9d15ec8 100644 --- a/src/entry.cpp +++ b/src/entry.cpp @@ -216,8 +216,8 @@ void Entry::addSubEntry(Entry *current) void Entry::reset() { - static bool entryCallGraph = Config_getBool("CALL_GRAPH"); - static bool entryCallerGraph = Config_getBool("CALLER_GRAPH"); + static bool entryCallGraph = Config_getBool(CALL_GRAPH); + static bool entryCallerGraph = Config_getBool(CALLER_GRAPH); //printf("Entry::reset()\n"); name.resize(0); type.resize(0); diff --git a/src/filedef.cpp b/src/filedef.cpp index 2a09c41..d5f736d 100644 --- a/src/filedef.cpp +++ b/src/filedef.cpp @@ -99,14 +99,14 @@ FileDef::FileDef(const char *p,const char *nm, m_isSource = guessSection(nm)==Entry::SOURCE_SEC; m_docname = nm; m_dir = 0; - if (Config_getBool("FULL_PATH_NAMES")) + if (Config_getBool(FULL_PATH_NAMES)) { m_docname.prepend(stripFromPath(m_path.copy())); } setLanguage(getLanguageFromFileName(name())); m_memberGroupSDict = 0; acquireFileVersion(); - m_subGrouping=Config_getBool("SUBGROUPING"); + m_subGrouping=Config_getBool(SUBGROUPING); } /*! destroy the file definition */ @@ -172,8 +172,8 @@ void FileDef::findSectionsInDocumentation() bool FileDef::hasDetailedDescription() const { - static bool repeatBrief = Config_getBool("REPEAT_BRIEF"); - static bool sourceBrowser = Config_getBool("SOURCE_BROWSER"); + static bool repeatBrief = Config_getBool(REPEAT_BRIEF); + static bool sourceBrowser = Config_getBool(SOURCE_BROWSER); return ((!briefDescription().isEmpty() && repeatBrief) || !documentation().stripWhiteSpace().isEmpty() || // avail empty section (sourceBrowser && getStartBodyLine()!=-1 && getBodyDef()) @@ -303,11 +303,11 @@ void FileDef::writeDetailedDescription(OutputList &ol,const QCString &title) ol.endGroupHeader(); ol.startTextBlock(); - if (!briefDescription().isEmpty() && Config_getBool("REPEAT_BRIEF")) + if (!briefDescription().isEmpty() && Config_getBool(REPEAT_BRIEF)) { ol.generateDoc(briefFile(),briefLine(),this,0,briefDescription(),FALSE,FALSE); } - if (!briefDescription().isEmpty() && Config_getBool("REPEAT_BRIEF") && + if (!briefDescription().isEmpty() && Config_getBool(REPEAT_BRIEF) && !documentation().isEmpty()) { ol.pushGeneratorState(); @@ -325,15 +325,15 @@ void FileDef::writeDetailedDescription(OutputList &ol,const QCString &title) ol.generateDoc(docFile(),docLine(),this,0,documentation()+"\n",TRUE,FALSE); } //printf("Writing source ref for file %s\n",name().data()); - if (Config_getBool("SOURCE_BROWSER")) + if (Config_getBool(SOURCE_BROWSER)) { //if Latex enabled and LATEX_SOURCE_CODE isn't -> skip, bug_738548 ol.pushGeneratorState(); - if (ol.isEnabled(OutputGenerator::Latex) && !Config_getBool("LATEX_SOURCE_CODE")) + if (ol.isEnabled(OutputGenerator::Latex) && !Config_getBool(LATEX_SOURCE_CODE)) { ol.disable(OutputGenerator::Latex); } - if (ol.isEnabled(OutputGenerator::RTF) && !Config_getBool("RTF_SOURCE_CODE")) + if (ol.isEnabled(OutputGenerator::RTF) && !Config_getBool(RTF_SOURCE_CODE)) { ol.disable(OutputGenerator::RTF); } @@ -359,7 +359,7 @@ void FileDef::writeDetailedDescription(OutputList &ol,const QCString &title) void FileDef::writeBriefDescription(OutputList &ol) { - if (!briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC")) + if (!briefDescription().isEmpty() && Config_getBool(BRIEF_MEMBER_DESC)) { DocRoot *rootNode = validatingParseDoc(briefFile(),briefLine(),this,0, briefDescription(),TRUE,FALSE,0,TRUE,FALSE); @@ -373,7 +373,7 @@ void FileDef::writeBriefDescription(OutputList &ol) ol.writeString(" \n"); ol.enable(OutputGenerator::RTF); - if (Config_getBool("REPEAT_BRIEF") || + if (Config_getBool(REPEAT_BRIEF) || !documentation().isEmpty() ) { @@ -461,7 +461,7 @@ void FileDef::writeIncludeFiles(OutputList &ol) void FileDef::writeIncludeGraph(OutputList &ol) { - if (Config_getBool("HAVE_DOT") /*&& Config_getBool("INCLUDE_GRAPH")*/) + if (Config_getBool(HAVE_DOT) /*&& Config_getBool(INCLUDE_GRAPH)*/) { //printf("Graph for file %s\n",name().data()); DotInclDepGraph incDepGraph(this,FALSE); @@ -479,13 +479,13 @@ void FileDef::writeIncludeGraph(OutputList &ol) ol.enableAll(); ol.endTextBlock(TRUE); } - //incDepGraph.writeGraph(Config_getString("HTML_OUTPUT"),fd->getOutputFileBase()); + //incDepGraph.writeGraph(Config_getString(HTML_OUTPUT),fd->getOutputFileBase()); } } void FileDef::writeIncludedByGraph(OutputList &ol) { - if (Config_getBool("HAVE_DOT") /*&& Config_getBool("INCLUDED_BY_GRAPH")*/) + if (Config_getBool(HAVE_DOT) /*&& Config_getBool(INCLUDED_BY_GRAPH)*/) { //printf("Graph for file %s\n",name().data()); DotInclDepGraph incDepGraph(this,TRUE); @@ -503,7 +503,7 @@ void FileDef::writeIncludedByGraph(OutputList &ol) ol.enableAll(); ol.endTextBlock(TRUE); } - //incDepGraph.writeGraph(Config_getString("HTML_OUTPUT"),fd->getOutputFileBase()); + //incDepGraph.writeGraph(Config_getString(HTML_OUTPUT),fd->getOutputFileBase()); } } @@ -561,7 +561,7 @@ void FileDef::endMemberDeclarations(OutputList &ol) void FileDef::startMemberDocumentation(OutputList &ol) { - if (Config_getBool("SEPARATE_MEMBER_PAGES")) + if (Config_getBool(SEPARATE_MEMBER_PAGES)) { ol.disable(OutputGenerator::Html); Doxygen::suppressDocWarnings = TRUE; @@ -570,7 +570,7 @@ void FileDef::startMemberDocumentation(OutputList &ol) void FileDef::endMemberDocumentation(OutputList &ol) { - if (Config_getBool("SEPARATE_MEMBER_PAGES")) + if (Config_getBool(SEPARATE_MEMBER_PAGES)) { ol.enable(OutputGenerator::Html); Doxygen::suppressDocWarnings = FALSE; @@ -604,7 +604,7 @@ void FileDef::writeAuthorSection(OutputList &ol) ol.startGroupHeader(); ol.parseText(theTranslator->trAuthor(TRUE,TRUE)); ol.endGroupHeader(); - ol.parseText(theTranslator->trGeneratedAutomatically(Config_getString("PROJECT_NAME"))); + ol.parseText(theTranslator->trGeneratedAutomatically(Config_getString(PROJECT_NAME))); ol.popGeneratorState(); } @@ -653,11 +653,11 @@ void FileDef::writeSummaryLinks(OutputList &ol) */ void FileDef::writeDocumentation(OutputList &ol) { - static bool generateTreeView = Config_getBool("GENERATE_TREEVIEW"); + static bool generateTreeView = Config_getBool(GENERATE_TREEVIEW); //funcList->countDecMembers(); //QCString fn = name(); - //if (Config_getBool("FULL_PATH_NAMES")) + //if (Config_getBool(FULL_PATH_NAMES)) //{ // fn.prepend(stripFromPath(getPath().copy())); //} @@ -839,7 +839,7 @@ void FileDef::writeDocumentation(OutputList &ol) endFileWithNavPath(this,ol); - if (Config_getBool("SEPARATE_MEMBER_PAGES")) + if (Config_getBool(SEPARATE_MEMBER_PAGES)) { MemberList *ml = getMemberList(MemberListType_allMembersList); if (ml) ml->sort(); @@ -867,7 +867,7 @@ void FileDef::writeMemberPages(OutputList &ol) void FileDef::writeQuickMemberLinks(OutputList &ol,MemberDef *currentMd) const { - static bool createSubDirs=Config_getBool("CREATE_SUBDIRS"); + static bool createSubDirs=Config_getBool(CREATE_SUBDIRS); ol.writeString(" <div class=\"navtab\">\n"); ol.writeString(" <table>\n"); @@ -911,10 +911,10 @@ void FileDef::writeQuickMemberLinks(OutputList &ol,MemberDef *currentMd) const /*! Write a source listing of this file to the output */ void FileDef::writeSource(OutputList &ol,bool sameTu,QStrList &filesInSameTu) { - static bool generateTreeView = Config_getBool("GENERATE_TREEVIEW"); - static bool filterSourceFiles = Config_getBool("FILTER_SOURCE_FILES"); - static bool latexSourceCode = Config_getBool("LATEX_SOURCE_CODE"); - static bool rtfSourceCode = Config_getBool("RTF_SOURCE_CODE"); + static bool generateTreeView = Config_getBool(GENERATE_TREEVIEW); + static bool filterSourceFiles = Config_getBool(FILTER_SOURCE_FILES); + static bool latexSourceCode = Config_getBool(LATEX_SOURCE_CODE); + static bool rtfSourceCode = Config_getBool(RTF_SOURCE_CODE); DevNullCodeDocInterface devNullIntf; QCString title = m_docname; if (!m_fileVersion.isEmpty()) @@ -967,7 +967,7 @@ void FileDef::writeSource(OutputList &ol,bool sameTu,QStrList &filesInSameTu) (void)sameTu; (void)filesInSameTu; #if USE_LIBCLANG - static bool clangAssistedParsing = Config_getBool("CLANG_ASSISTED_PARSING"); + static bool clangAssistedParsing = Config_getBool(CLANG_ASSISTED_PARSING); if (clangAssistedParsing && (getLanguage()==SrcLangExt_Cpp || getLanguage()==SrcLangExt_ObjC)) { @@ -1026,12 +1026,12 @@ void FileDef::writeSource(OutputList &ol,bool sameTu,QStrList &filesInSameTu) void FileDef::parseSource(bool sameTu,QStrList &filesInSameTu) { - static bool filterSourceFiles = Config_getBool("FILTER_SOURCE_FILES"); + static bool filterSourceFiles = Config_getBool(FILTER_SOURCE_FILES); DevNullCodeDocInterface devNullIntf; (void)sameTu; (void)filesInSameTu; #if USE_LIBCLANG - static bool clangAssistedParsing = Config_getBool("CLANG_ASSISTED_PARSING"); + static bool clangAssistedParsing = Config_getBool(CLANG_ASSISTED_PARSING); if (clangAssistedParsing && (getLanguage()==SrcLangExt_Cpp || getLanguage()==SrcLangExt_ObjC)) { @@ -1158,7 +1158,7 @@ void FileDef::insertClass(ClassDef *cd) { m_classSDict = new ClassSDict(17); } - if (Config_getBool("SORT_BRIEF_DOCS")) + if (Config_getBool(SORT_BRIEF_DOCS)) { m_classSDict->inSort(cd->name(),cd); } @@ -1179,7 +1179,7 @@ void FileDef::insertNamespace(NamespaceDef *nd) { m_namespaceSDict = new NamespaceSDict; } - if (Config_getBool("SORT_BRIEF_DOCS")) + if (Config_getBool(SORT_BRIEF_DOCS)) { m_namespaceSDict->inSort(nd->name(),nd); } @@ -1192,7 +1192,7 @@ void FileDef::insertNamespace(NamespaceDef *nd) QCString FileDef::name() const { - if (Config_getBool("FULL_PATH_NAMES")) + if (Config_getBool(FULL_PATH_NAMES)) return m_fileName; else return Definition::name(); @@ -1395,8 +1395,8 @@ bool FileDef::isIncluded(const QCString &name) const bool FileDef::generateSourceFile() const { - static bool sourceBrowser = Config_getBool("SOURCE_BROWSER"); - static bool verbatimHeaders = Config_getBool("VERBATIM_HEADERS"); + static bool sourceBrowser = Config_getBool(SOURCE_BROWSER); + static bool verbatimHeaders = Config_getBool(VERBATIM_HEADERS); QCString extension = name().right(4); return !isReference() && (sourceBrowser || @@ -1736,7 +1736,7 @@ bool FileDef::isDocumentationFile() const void FileDef::acquireFileVersion() { - QCString vercmd = Config_getString("FILE_VERSION_FILTER"); + QCString vercmd = Config_getString(FILE_VERSION_FILTER); if (!vercmd.isEmpty() && !m_filePath.isEmpty() && m_filePath!="generated" && m_filePath!="graph_legend") { @@ -1806,8 +1806,8 @@ MemberList *FileDef::createMemberList(MemberListType lt) void FileDef::addMemberToList(MemberListType lt,MemberDef *md) { - static bool sortBriefDocs = Config_getBool("SORT_BRIEF_DOCS"); - static bool sortMemberDocs = Config_getBool("SORT_MEMBER_DOCS"); + static bool sortBriefDocs = Config_getBool(SORT_BRIEF_DOCS); + static bool sortMemberDocs = Config_getBool(SORT_MEMBER_DOCS); MemberList *ml = createMemberList(lt); ml->setNeedsSorting( ((ml->listType()&MemberListType_declarationLists) && sortBriefDocs) || @@ -1852,7 +1852,7 @@ MemberList *FileDef::getMemberList(MemberListType lt) const void FileDef::writeMemberDeclarations(OutputList &ol,MemberListType lt,const QCString &title) { - static bool optVhdl = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); + static bool optVhdl = Config_getBool(OPTIMIZE_OUTPUT_VHDL); MemberList * ml = getMemberList(lt); if (ml) { @@ -1876,7 +1876,7 @@ void FileDef::writeMemberDocumentation(OutputList &ol,MemberListType lt,const QC bool FileDef::isLinkableInProject() const { - static bool showFiles = Config_getBool("SHOW_FILES"); + static bool showFiles = Config_getBool(SHOW_FILES); return hasDocumentation() && !isReference() && showFiles; } diff --git a/src/filename.cpp b/src/filename.cpp index aa51249..dfa763c 100644 --- a/src/filename.cpp +++ b/src/filename.cpp @@ -130,7 +130,7 @@ void FileNameList::generateDiskNames() int FileNameList::compareValues(const FileName *f1, const FileName *f2) const { - return Config_getBool("FULL_PATH_NAMES") ? + return Config_getBool(FULL_PATH_NAMES) ? qstricmp(f1->fullName(),f2->fullName()) : qstricmp(f1->fileName(),f2->fileName()); } @@ -142,7 +142,7 @@ FileNameListIterator::FileNameListIterator(const FileNameList &fnlist) : static bool getCaseSenseNames() { - static bool caseSenseNames = Config_getBool("CASE_SENSE_NAMES"); + static bool caseSenseNames = Config_getBool(CASE_SENSE_NAMES); return caseSenseNames; } diff --git a/src/formula.cpp b/src/formula.cpp index 182ddaa..a4415a9 100644 --- a/src/formula.cpp +++ b/src/formula.cpp @@ -67,14 +67,14 @@ void FormulaList::generateBitmaps(const char *path) if (f.open(IO_WriteOnly)) { FTextStream t(&f); - if (Config_getBool("LATEX_BATCHMODE")) t << "\\batchmode" << endl; + if (Config_getBool(LATEX_BATCHMODE)) t << "\\batchmode" << endl; t << "\\documentclass{article}" << endl; t << "\\usepackage{epsfig}" << endl; // for those who want to include images - const char *s=Config_getList("EXTRA_PACKAGES").first(); + const char *s=Config_getList(EXTRA_PACKAGES).first(); while (s) { t << "\\usepackage{" << s << "}\n"; - s=Config_getList("EXTRA_PACKAGES").next(); + s=Config_getList(EXTRA_PACKAGES).next(); } t << "\\pagestyle{empty}" << endl; t << "\\begin{document}" << endl; @@ -101,7 +101,7 @@ void FormulaList::generateBitmaps(const char *path) { //printf("Running latex...\n"); //system("latex _formulas.tex </dev/null >/dev/null"); - QCString latexCmd = Config_getString("LATEX_CMD_NAME"); + QCString latexCmd = Config_getString(LATEX_CMD_NAME); if (latexCmd.isEmpty()) latexCmd="latex"; portable_sysTimerStart(); if (portable_system(latexCmd,"_formulas.tex")!=0) @@ -173,7 +173,7 @@ void FormulaList::generateBitmaps(const char *path) // scale the image so that it is four times larger than needed. // and the sizes are a multiple of four. double scaleFactor = 16.0/3.0; - int zoomFactor = Config_getInt("FORMULA_FONTSIZE"); + int zoomFactor = Config_getInt(FORMULA_FONTSIZE); if (zoomFactor<8 || zoomFactor>50) zoomFactor=10; scaleFactor *= zoomFactor/10.0; int gx = (((int)((x2-x1)*scaleFactor))+3)&~1; diff --git a/src/fortrancode.l b/src/fortrancode.l index 82e78c1..b6e9d67 100644 --- a/src/fortrancode.l +++ b/src/fortrancode.l @@ -356,7 +356,7 @@ static void codifyLines(QCString str) static void writeMultiLineCodeLink(CodeOutputInterface &ol, Definition *d,const char *text) { - static bool sourceTooltips = Config_getBool("SOURCE_TOOLTIPS"); + static bool sourceTooltips = Config_getBool(SOURCE_TOOLTIPS); TooltipManager::instance()->addTooltip(d); QCString ref = d->getReference(); QCString file = d->getOutputFileBase(); @@ -1086,7 +1086,7 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I } <DocBlock>"\n" { // comment block ends at the end of this line // remove special comment (default config) - if (Config_getBool("STRIP_CODE_COMMENTS")) + if (Config_getBool(STRIP_CODE_COMMENTS)) { g_yyLineNr+=((QCString)docBlock).contains('\n'); g_yyLineNr+=1; @@ -1206,7 +1206,7 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I } <*><<EOF>> { if (YY_START == DocBlock) { - if (!Config_getBool("STRIP_CODE_COMMENTS")) + if (!Config_getBool(STRIP_CODE_COMMENTS)) { startFontClass("comment"); codifyLines(docBlock); diff --git a/src/fortranscanner.l b/src/fortranscanner.l index 45e1686..ad4a63f 100644 --- a/src/fortranscanner.l +++ b/src/fortranscanner.l @@ -1074,7 +1074,7 @@ private { current->docLine = yyLineNr; docBlockJavaStyle = FALSE; docBlock.resize(0); - docBlockJavaStyle = Config_getBool("JAVADOC_AUTOBRIEF"); + docBlockJavaStyle = Config_getBool(JAVADOC_AUTOBRIEF); startCommentBlock(TRUE); yy_push_state(DocBackLine); } @@ -1129,7 +1129,7 @@ private { docBlockJavaStyle = FALSE; if (YY_START==SubprogBody) docBlockInBody = TRUE; docBlock.resize(0); - docBlockJavaStyle = Config_getBool("JAVADOC_AUTOBRIEF"); + docBlockJavaStyle = Config_getBool(JAVADOC_AUTOBRIEF); startCommentBlock(TRUE); BEGIN(DocBlock); //cout << "start DocBlock " << endl; @@ -2267,7 +2267,7 @@ static void startCommentBlock(bool brief) static void handleCommentBlock(const QCString &doc,bool brief) { bool needsEntry = FALSE; - static bool hideInBodyDocs = Config_getBool("HIDE_IN_BODY_DOCS"); + static bool hideInBodyDocs = Config_getBool(HIDE_IN_BODY_DOCS); int position=0; if (docBlockInBody && hideInBodyDocs) { diff --git a/src/ftvhelp.cpp b/src/ftvhelp.cpp index a70e243..3ec1b88 100644 --- a/src/ftvhelp.cpp +++ b/src/ftvhelp.cpp @@ -490,7 +490,7 @@ static QCString convertFileId2Var(const QCString &fileId) static bool generateJSTree(NavIndexEntryList &navIndex,FTextStream &t, const QList<FTVNode> &nl,int level,bool &first) { - static QCString htmlOutput = Config_getString("HTML_OUTPUT"); + static QCString htmlOutput = Config_getString(HTML_OUTPUT); QCString indentStr; indentStr.fill(' ',level*2); bool found=FALSE; @@ -579,7 +579,7 @@ static bool generateJSTree(NavIndexEntryList &navIndex,FTextStream &t, static void generateJSNavTree(const QList<FTVNode> &nodeList) { - QCString htmlOutput = Config_getString("HTML_OUTPUT"); + QCString htmlOutput = Config_getString(HTML_OUTPUT); QFile f(htmlOutput+"/navtreedata.js"); NavIndexEntryList navIndex; if (f.open(IO_WriteOnly) /*&& fidx.open(IO_WriteOnly)*/) @@ -591,7 +591,7 @@ static void generateJSNavTree(const QList<FTVNode> &nodeList) t << "var NAVTREE =" << endl; t << "[" << endl; t << " [ "; - QCString &projName = Config_getString("PROJECT_NAME"); + QCString &projName = Config_getString(PROJECT_NAME); if (projName.isEmpty()) { if (Doxygen::mainPage && !Doxygen::mainPage->title().isEmpty()) // Use title of main page as root @@ -689,7 +689,7 @@ static void generateJSNavTree(const QList<FTVNode> &nodeList) // new style images void FTVHelp::generateTreeViewImages() { - QCString dname=Config_getString("HTML_OUTPUT"); + QCString dname=Config_getString(HTML_OUTPUT); const ResourceMgr &rm = ResourceMgr::instance(); rm.copyResource("doc.luma",dname); rm.copyResource("folderopen.luma",dname); @@ -702,7 +702,7 @@ void FTVHelp::generateTreeViewImages() // new style scripts void FTVHelp::generateTreeViewScripts() { - QCString htmlOutput = Config_getString("HTML_OUTPUT"); + QCString htmlOutput = Config_getString(HTML_OUTPUT); // generate navtree.js & navtreeindex.js generateJSNavTree(m_indentNodes[0]); @@ -715,7 +715,7 @@ void FTVHelp::generateTreeViewScripts() // write tree inside page void FTVHelp::generateTreeViewInline(FTextStream &t) { - int preferredNumEntries = Config_getInt("HTML_INDEX_NUM_ENTRIES"); + int preferredNumEntries = Config_getInt(HTML_INDEX_NUM_ENTRIES); t << "<div class=\"directory\">\n"; QListIterator<FTVNode> li(m_indentNodes[0]); FTVNode *n; diff --git a/src/groupdef.cpp b/src/groupdef.cpp index 7a74c65..48acb68 100644 --- a/src/groupdef.cpp +++ b/src/groupdef.cpp @@ -71,7 +71,7 @@ GroupDef::GroupDef(const char *df,int dl,const char *na,const char *t, visited = 0; groupScope = 0; - m_subGrouping=Config_getBool("SUBGROUPING"); + m_subGrouping=Config_getBool(SUBGROUPING); } GroupDef::~GroupDef() @@ -137,7 +137,7 @@ void GroupDef::findSectionsInDocumentation() void GroupDef::addFile(const FileDef *def) { - static bool sortBriefDocs = Config_getBool("SORT_BRIEF_DOCS"); + static bool sortBriefDocs = Config_getBool(SORT_BRIEF_DOCS); if (def->isHidden()) return; updateLanguage(def); if (sortBriefDocs) @@ -148,7 +148,7 @@ void GroupDef::addFile(const FileDef *def) bool GroupDef::addClass(const ClassDef *cd) { - static bool sortBriefDocs = Config_getBool("SORT_BRIEF_DOCS"); + static bool sortBriefDocs = Config_getBool(SORT_BRIEF_DOCS); if (cd->isHidden()) return FALSE; updateLanguage(cd); QCString qn = cd->name(); @@ -196,7 +196,7 @@ bool GroupDef::addClass(const ClassDef *cd) bool GroupDef::addNamespace(const NamespaceDef *def) { - static bool sortBriefDocs = Config_getBool("SORT_BRIEF_DOCS"); + static bool sortBriefDocs = Config_getBool(SORT_BRIEF_DOCS); if (def->isHidden()) return FALSE; updateLanguage(def); if (namespaceSDict->find(def->name())==0) @@ -213,7 +213,7 @@ bool GroupDef::addNamespace(const NamespaceDef *def) void GroupDef::addDir(const DirDef *def) { if (def->isHidden()) return; - if (Config_getBool("SORT_BRIEF_DOCS")) + if (Config_getBool(SORT_BRIEF_DOCS)) dirList->inSort(def); else dirList->append(def); @@ -532,7 +532,7 @@ bool GroupDef::findGroup(const GroupDef *def) const void GroupDef::addGroup(const GroupDef *def) { //printf("adding group `%s' to group `%s'\n",def->name().data(),name().data()); - //if (Config_getBool("SORT_MEMBER_DOCS")) + //if (Config_getBool(SORT_MEMBER_DOCS)) // groupList->inSort(def); //else groupList->append(def); @@ -707,7 +707,7 @@ void GroupDef::writeTagFile(FTextStream &tagFile) void GroupDef::writeDetailedDescription(OutputList &ol,const QCString &title) { - if ((!briefDescription().isEmpty() && Config_getBool("REPEAT_BRIEF")) + if ((!briefDescription().isEmpty() && Config_getBool(REPEAT_BRIEF)) || !documentation().isEmpty() || !inbodyDocumentation().isEmpty() ) { @@ -727,12 +727,12 @@ void GroupDef::writeDetailedDescription(OutputList &ol,const QCString &title) } // repeat brief description - if (!briefDescription().isEmpty() && Config_getBool("REPEAT_BRIEF")) + if (!briefDescription().isEmpty() && Config_getBool(REPEAT_BRIEF)) { ol.generateDoc(briefFile(),briefLine(),this,0,briefDescription(),FALSE,FALSE); } // write separator between brief and details - if (!briefDescription().isEmpty() && Config_getBool("REPEAT_BRIEF") && + if (!briefDescription().isEmpty() && Config_getBool(REPEAT_BRIEF) && !documentation().isEmpty()) { ol.pushGeneratorState(); @@ -762,7 +762,7 @@ void GroupDef::writeDetailedDescription(OutputList &ol,const QCString &title) void GroupDef::writeBriefDescription(OutputList &ol) { - if (!briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC")) + if (!briefDescription().isEmpty() && Config_getBool(BRIEF_MEMBER_DESC)) { DocRoot *rootNode = validatingParseDoc(briefFile(),briefLine(),this,0, briefDescription(),TRUE,FALSE,0,TRUE,FALSE); @@ -775,7 +775,7 @@ void GroupDef::writeBriefDescription(OutputList &ol) ol.writeString(" \n"); ol.enable(OutputGenerator::RTF); - if (Config_getBool("REPEAT_BRIEF") || + if (Config_getBool(REPEAT_BRIEF) || !documentation().isEmpty() ) { @@ -793,7 +793,7 @@ void GroupDef::writeBriefDescription(OutputList &ol) void GroupDef::writeGroupGraph(OutputList &ol) { - if (Config_getBool("HAVE_DOT") /*&& Config_getBool("GROUP_GRAPHS")*/ ) + if (Config_getBool(HAVE_DOT) /*&& Config_getBool(GROUP_GRAPHS)*/ ) { DotGroupCollaboration graph(this); if (!graph.isTrivial()) @@ -831,7 +831,7 @@ void GroupDef::writeFiles(OutputList &ol,const QCString &title) ol.insertMemberAlign(); ol.writeObjectLink(fd->getReference(),fd->getOutputFileBase(),0,fd->name()); ol.endMemberItem(); - if (!fd->briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC")) + if (!fd->briefDescription().isEmpty() && Config_getBool(BRIEF_MEMBER_DESC)) { ol.startMemberDescription(fd->getOutputFileBase()); ol.generateDoc(briefFile(),briefLine(),fd,0,fd->briefDescription(),FALSE,FALSE,0,TRUE,FALSE); @@ -868,7 +868,7 @@ void GroupDef::writeNestedGroups(OutputList &ol,const QCString &title) ol.parseText(title); ol.endMemberHeader(); ol.startMemberList(); - if (Config_getBool("SORT_GROUP_NAMES")) + if (Config_getBool(SORT_GROUP_NAMES)) { groupList->sort(); } @@ -886,7 +886,7 @@ void GroupDef::writeNestedGroups(OutputList &ol,const QCString &title) ol.insertMemberAlign(); ol.writeObjectLink(gd->getReference(),gd->getOutputFileBase(),0,gd->groupTitle()); ol.endMemberItem(); - if (!gd->briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC")) + if (!gd->briefDescription().isEmpty() && Config_getBool(BRIEF_MEMBER_DESC)) { ol.startMemberDescription(gd->getOutputFileBase()); ol.generateDoc(briefFile(),briefLine(),gd,0,gd->briefDescription(),FALSE,FALSE,0,TRUE,FALSE); @@ -919,7 +919,7 @@ void GroupDef::writeDirs(OutputList &ol,const QCString &title) ol.insertMemberAlign(); ol.writeObjectLink(dd->getReference(),dd->getOutputFileBase(),0,dd->shortName()); ol.endMemberItem(); - if (!dd->briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC")) + if (!dd->briefDescription().isEmpty() && Config_getBool(BRIEF_MEMBER_DESC)) { ol.startMemberDescription(dd->getOutputFileBase()); ol.generateDoc(briefFile(),briefLine(),dd,0,dd->briefDescription(),FALSE,FALSE,0,TRUE,FALSE); @@ -995,7 +995,7 @@ void GroupDef::endMemberDeclarations(OutputList &ol) void GroupDef::startMemberDocumentation(OutputList &ol) { //printf("** GroupDef::startMemberDocumentation()\n"); - if (Config_getBool("SEPARATE_MEMBER_PAGES")) + if (Config_getBool(SEPARATE_MEMBER_PAGES)) { ol.pushGeneratorState(); ol.disable(OutputGenerator::Html); @@ -1006,7 +1006,7 @@ void GroupDef::startMemberDocumentation(OutputList &ol) void GroupDef::endMemberDocumentation(OutputList &ol) { //printf("** GroupDef::endMemberDocumentation()\n"); - if (Config_getBool("SEPARATE_MEMBER_PAGES")) + if (Config_getBool(SEPARATE_MEMBER_PAGES)) { ol.popGeneratorState(); Doxygen::suppressDocWarnings = FALSE; @@ -1021,7 +1021,7 @@ void GroupDef::writeAuthorSection(OutputList &ol) ol.startGroupHeader(); ol.parseText(theTranslator->trAuthor(TRUE,TRUE)); ol.endGroupHeader(); - ol.parseText(theTranslator->trGeneratedAutomatically(Config_getString("PROJECT_NAME"))); + ol.parseText(theTranslator->trGeneratedAutomatically(Config_getString(PROJECT_NAME))); ol.popGeneratorState(); } @@ -1072,7 +1072,7 @@ void GroupDef::writeSummaryLinks(OutputList &ol) void GroupDef::writeDocumentation(OutputList &ol) { - //static bool generateTreeView = Config_getBool("GENERATE_TREEVIEW"); + //static bool generateTreeView = Config_getBool(GENERATE_TREEVIEW); ol.pushGeneratorState(); startFile(ol,getOutputFileBase(),name(),title,HLI_Modules); @@ -1234,7 +1234,7 @@ void GroupDef::writeDocumentation(OutputList &ol) ol.popGeneratorState(); - if (Config_getBool("SEPARATE_MEMBER_PAGES")) + if (Config_getBool(SEPARATE_MEMBER_PAGES)) { allMemberList->sort(); writeMemberPages(ol); @@ -1262,7 +1262,7 @@ void GroupDef::writeMemberPages(OutputList &ol) void GroupDef::writeQuickMemberLinks(OutputList &ol,MemberDef *currentMd) const { - static bool createSubDirs=Config_getBool("CREATE_SUBDIRS"); + static bool createSubDirs=Config_getBool(CREATE_SUBDIRS); ol.writeString(" <div class=\"navtab\">\n"); ol.writeString(" <table>\n"); @@ -1571,8 +1571,8 @@ MemberList *GroupDef::createMemberList(MemberListType lt) void GroupDef::addMemberToList(MemberListType lt,MemberDef *md) { - static bool sortBriefDocs = Config_getBool("SORT_BRIEF_DOCS"); - static bool sortMemberDocs = Config_getBool("SORT_MEMBER_DOCS"); + static bool sortBriefDocs = Config_getBool(SORT_BRIEF_DOCS); + static bool sortMemberDocs = Config_getBool(SORT_MEMBER_DOCS); MemberList *ml = createMemberList(lt); ml->setNeedsSorting( ((ml->listType()&MemberListType_declarationLists) && sortBriefDocs) || @@ -1606,7 +1606,7 @@ MemberList *GroupDef::getMemberList(MemberListType lt) const void GroupDef::writeMemberDeclarations(OutputList &ol,MemberListType lt,const QCString &title) { - static bool optimizeVhdl = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); + static bool optimizeVhdl = Config_getBool(OPTIMIZE_OUTPUT_VHDL); MemberList * ml = getMemberList(lt); if (optimizeVhdl && ml) @@ -1659,7 +1659,7 @@ void GroupDef::updateLanguage(const Definition *d) bool GroupDef::hasDetailedDescription() const { - static bool repeatBrief = Config_getBool("REPEAT_BRIEF"); + static bool repeatBrief = Config_getBool(REPEAT_BRIEF); return ((!briefDescription().isEmpty() && repeatBrief) || !documentation().isEmpty()); } diff --git a/src/htags.cpp b/src/htags.cpp index 460d54d..77b1f8d 100644 --- a/src/htags.cpp +++ b/src/htags.cpp @@ -36,12 +36,12 @@ static QDict<QCString> g_symbolDict(10007); */ bool Htags::execute(const QCString &htmldir) { - static QStrList &inputSource = Config_getList("INPUT"); - static bool quiet = Config_getBool("QUIET"); - static bool warnings = Config_getBool("WARNINGS"); - static QCString htagsOptions = ""; //Config_getString("HTAGS_OPTIONS"); - static QCString projectName = Config_getString("PROJECT_NAME"); - static QCString projectNumber = Config_getString("PROJECT_NUMBER"); + static QStrList &inputSource = Config_getList(INPUT); + static bool quiet = Config_getBool(QUIET); + static bool warnings = Config_getBool(WARNINGS); + static QCString htagsOptions = ""; //Config_getString(HTAGS_OPTIONS); + static QCString projectName = Config_getString(PROJECT_NAME); + static QCString projectNumber = Config_getString(PROJECT_NUMBER); QCString cwd = QDir::currentDirPath().utf8(); if (inputSource.isEmpty()) diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index 0533f87..a42d086 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -409,7 +409,7 @@ void HtmlDocVisitor::visit(DocVerbatim *s) forceEndParagraph(s); fileName.sprintf("%s%d%s", - (Config_getString("HTML_OUTPUT")+"/inline_dotgraph_").data(), + (Config_getString(HTML_OUTPUT)+"/inline_dotgraph_").data(), dotindex++, ".dot" ); @@ -430,7 +430,7 @@ void HtmlDocVisitor::visit(DocVerbatim *s) visitPostCaption(m_t, s); m_t << "</div>" << endl; - if (Config_getBool("DOT_CLEANUP")) file.remove(); + if (Config_getBool(DOT_CLEANUP)) file.remove(); } forceStartParagraph(s); } @@ -443,7 +443,7 @@ void HtmlDocVisitor::visit(DocVerbatim *s) QCString baseName(4096); baseName.sprintf("%s%d", - (Config_getString("HTML_OUTPUT")+"/inline_mscgraph_").data(), + (Config_getString(HTML_OUTPUT)+"/inline_mscgraph_").data(), mscindex++ ); QFile file(baseName+".msc"); @@ -467,7 +467,7 @@ void HtmlDocVisitor::visit(DocVerbatim *s) visitPostCaption(m_t, s); m_t << "</div>" << endl; - if (Config_getBool("DOT_CLEANUP")) file.remove(); + if (Config_getBool(DOT_CLEANUP)) file.remove(); } forceStartParagraph(s); } @@ -476,7 +476,7 @@ void HtmlDocVisitor::visit(DocVerbatim *s) { forceEndParagraph(s); - static QCString htmlOutput = Config_getString("HTML_OUTPUT"); + static QCString htmlOutput = Config_getString(HTML_OUTPUT); QCString baseName = writePlantUMLSource(htmlOutput,s->exampleFile(),s->text()); m_t << "<div align=\"center\">" << endl; writePlantUMLFile(baseName,s->relPath(),s->context()); @@ -645,7 +645,7 @@ void HtmlDocVisitor::visit(DocFormula *f) m_t << "<p class=\"formulaDsp\">" << endl; } - if (Config_getBool("USE_MATHJAX")) + if (Config_getBool(USE_MATHJAX)) { QCString text = f->text(); bool closeInline = FALSE; @@ -1604,7 +1604,7 @@ void HtmlDocVisitor::visitPost(DocSecRefList *s) //void HtmlDocVisitor::visitPre(DocLanguage *l) //{ -// QString langId = Config_getEnum("OUTPUT_LANGUAGE"); +// QString langId = Config_getEnum(OUTPUT_LANGUAGE); // if (l->id().lower()!=langId.lower()) // { // pushEnabled(); @@ -1614,7 +1614,7 @@ void HtmlDocVisitor::visitPost(DocSecRefList *s) // //void HtmlDocVisitor::visitPost(DocLanguage *l) //{ -// QString langId = Config_getEnum("OUTPUT_LANGUAGE"); +// QString langId = Config_getEnum(OUTPUT_LANGUAGE); // if (l->id().lower()!=langId.lower()) // { // popEnabled(); @@ -1962,7 +1962,7 @@ void HtmlDocVisitor::writeDotFile(const QCString &fn,const QCString &relPath, baseName=baseName.left(i); } baseName.prepend("dot_"); - QCString outDir = Config_getString("HTML_OUTPUT"); + QCString outDir = Config_getString(HTML_OUTPUT); writeDotGraphFromFile(fn,outDir,baseName,GOF_BITMAP); writeDotImageMapFromFile(m_t,fn,outDir,relPath,baseName,context); } @@ -1982,7 +1982,7 @@ void HtmlDocVisitor::writeMscFile(const QCString &fileName, baseName=baseName.left(i); } baseName.prepend("msc_"); - QCString outDir = Config_getString("HTML_OUTPUT"); + QCString outDir = Config_getString(HTML_OUTPUT); QCString imgExt = getDotImageExtension(); MscOutputFormat mscFormat = MSC_BITMAP; if ("svg" == imgExt) @@ -2006,7 +2006,7 @@ void HtmlDocVisitor::writeDiaFile(const QCString &fileName, baseName=baseName.left(i); } baseName.prepend("dia_"); - QCString outDir = Config_getString("HTML_OUTPUT"); + QCString outDir = Config_getString(HTML_OUTPUT); writeDiaGraphFromFile(fileName,outDir,baseName,DIA_BITMAP); m_t << "<img src=\"" << relPath << baseName << ".png" << "\" />" << endl; @@ -2026,7 +2026,7 @@ void HtmlDocVisitor::writePlantUMLFile(const QCString &fileName, { baseName=baseName.left(i); } - static QCString outDir = Config_getString("HTML_OUTPUT"); + static QCString outDir = Config_getString(HTML_OUTPUT); QCString imgExt = getDotImageExtension(); if (imgExt=="svg") { diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index 9e02dee..239a9fe 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -74,7 +74,7 @@ static void writeClientSearchBox(FTextStream &t,const char *relPath) static void writeServerSearchBox(FTextStream &t,const char *relPath,bool highlightSearch) { - static bool externalSearch = Config_getBool("EXTERNAL_SEARCH"); + static bool externalSearch = Config_getBool(EXTERNAL_SEARCH); t << " <div id=\"MSearchBox\" class=\"MSearchBoxInactive\">\n"; t << " <div class=\"left\">\n"; t << " <form id=\"FSearchBox\" action=\"" << relPath; @@ -228,21 +228,21 @@ static QCString substituteHtmlKeywords(const QCString &s, QCString mathJaxJs; QCString extraCssText; - static QCString projectName = Config_getString("PROJECT_NAME"); - static bool timeStamp = Config_getBool("HTML_TIMESTAMP"); - static bool treeView = Config_getBool("GENERATE_TREEVIEW"); - static bool searchEngine = Config_getBool("SEARCHENGINE"); - static bool serverBasedSearch = Config_getBool("SERVER_BASED_SEARCH"); - static bool mathJax = Config_getBool("USE_MATHJAX"); - static QCString mathJaxFormat = Config_getEnum("MATHJAX_FORMAT"); - static bool disableIndex = Config_getBool("DISABLE_INDEX"); + static QCString projectName = Config_getString(PROJECT_NAME); + static bool timeStamp = Config_getBool(HTML_TIMESTAMP); + static bool treeView = Config_getBool(GENERATE_TREEVIEW); + static bool searchEngine = Config_getBool(SEARCHENGINE); + static bool serverBasedSearch = Config_getBool(SERVER_BASED_SEARCH); + static bool mathJax = Config_getBool(USE_MATHJAX); + static QCString mathJaxFormat = Config_getEnum(MATHJAX_FORMAT); + static bool disableIndex = Config_getBool(DISABLE_INDEX); static bool hasProjectName = !projectName.isEmpty(); - static bool hasProjectNumber = !Config_getString("PROJECT_NUMBER").isEmpty(); - static bool hasProjectBrief = !Config_getString("PROJECT_BRIEF").isEmpty(); - static bool hasProjectLogo = !Config_getString("PROJECT_LOGO").isEmpty(); + static bool hasProjectNumber = !Config_getString(PROJECT_NUMBER).isEmpty(); + static bool hasProjectBrief = !Config_getString(PROJECT_BRIEF).isEmpty(); + static bool hasProjectLogo = !Config_getString(PROJECT_LOGO).isEmpty(); static bool titleArea = (hasProjectName || hasProjectBrief || hasProjectLogo || (disableIndex && searchEngine)); - cssFile = Config_getString("HTML_STYLESHEET"); + cssFile = Config_getString(HTML_STYLESHEET); if (cssFile.isEmpty()) { cssFile = "doxygen.css"; @@ -261,7 +261,7 @@ static QCString substituteHtmlKeywords(const QCString &s, } extraCssText = ""; - extraCssFile = Config_getList("HTML_EXTRA_STYLESHEET"); + extraCssFile = Config_getList(HTML_EXTRA_STYLESHEET); for (uint i=0; i<extraCssFile.count(); ++i) { QCString fileName(extraCssFile.at(i)); @@ -277,7 +277,7 @@ static QCString substituteHtmlKeywords(const QCString &s, if (timeStamp) { - generatedBy = theTranslator->trGeneratedAt(dateToString(TRUE), convertToHtml(Config_getString("PROJECT_NAME"))); + generatedBy = theTranslator->trGeneratedAt(dateToString(TRUE), convertToHtml(Config_getString(PROJECT_NAME))); } else { @@ -332,7 +332,7 @@ static QCString substituteHtmlKeywords(const QCString &s, if (mathJax) { - QCString path = Config_getString("MATHJAX_RELPATH"); + QCString path = Config_getString(MATHJAX_RELPATH); if (path.isEmpty() || path.left(2)=="..") // relative path { path.prepend(relPath); @@ -340,7 +340,7 @@ static QCString substituteHtmlKeywords(const QCString &s, mathJaxJs = "<script type=\"text/x-mathjax-config\">\n" " MathJax.Hub.Config({\n" " extensions: [\"tex2jax.js\""; - QStrList &mathJaxExtensions = Config_getList("MATHJAX_EXTENSIONS"); + QStrList &mathJaxExtensions = Config_getList(MATHJAX_EXTENSIONS); const char *s = mathJaxExtensions.first(); while (s) { @@ -365,9 +365,9 @@ static QCString substituteHtmlKeywords(const QCString &s, // first substitute generic keywords QCString result = substituteKeywords(s,title, - convertToHtml(Config_getString("PROJECT_NAME")), - convertToHtml(Config_getString("PROJECT_NUMBER")), - convertToHtml(Config_getString("PROJECT_BRIEF"))); + convertToHtml(Config_getString(PROJECT_NAME)), + convertToHtml(Config_getString(PROJECT_NUMBER)), + convertToHtml(Config_getString(PROJECT_BRIEF))); // additional HTML only keywords result = substitute(result,"$navpath",navPath); @@ -422,7 +422,7 @@ void HtmlCodeGenerator::setRelativePath(const QCString &path) void HtmlCodeGenerator::codify(const char *str) { - static int tabSize = Config_getInt("TAB_SIZE"); + static int tabSize = Config_getInt(TAB_SIZE); if (str && m_streamSet) { const char *p=str; @@ -671,7 +671,7 @@ void HtmlCodeGenerator::writeCodeAnchor(const char *anchor) HtmlGenerator::HtmlGenerator() : OutputGenerator() { - dir=Config_getString("HTML_OUTPUT"); + dir=Config_getString(HTML_OUTPUT); m_emptySection=FALSE; } @@ -682,7 +682,7 @@ HtmlGenerator::~HtmlGenerator() void HtmlGenerator::init() { - QCString dname=Config_getString("HTML_OUTPUT"); + QCString dname=Config_getString(HTML_OUTPUT); QDir d(dname); if (!d.exists() && !d.mkdir(dname)) { @@ -690,9 +690,9 @@ void HtmlGenerator::init() exit(1); } //writeLogo(dname); - if (!Config_getString("HTML_HEADER").isEmpty()) + if (!Config_getString(HTML_HEADER).isEmpty()) { - g_header=fileToString(Config_getString("HTML_HEADER")); + g_header=fileToString(Config_getString(HTML_HEADER)); //printf("g_header='%s'\n",g_header.data()); } else @@ -700,9 +700,9 @@ void HtmlGenerator::init() g_header = ResourceMgr::instance().getAsString("header.html"); } - if (!Config_getString("HTML_FOOTER").isEmpty()) + if (!Config_getString(HTML_FOOTER).isEmpty()) { - g_footer=fileToString(Config_getString("HTML_FOOTER")); + g_footer=fileToString(Config_getString(HTML_FOOTER)); //printf("g_footer='%s'\n",g_footer.data()); } else @@ -710,11 +710,11 @@ void HtmlGenerator::init() g_footer = ResourceMgr::instance().getAsString("footer.html"); } - if (Config_getBool("USE_MATHJAX")) + if (Config_getBool(USE_MATHJAX)) { - if (!Config_getString("MATHJAX_CODEFILE").isEmpty()) + if (!Config_getString(MATHJAX_CODEFILE).isEmpty()) { - g_mathjax_code=fileToString(Config_getString("MATHJAX_CODEFILE")); + g_mathjax_code=fileToString(Config_getString(MATHJAX_CODEFILE)); //printf("g_mathjax_code='%s'\n",g_mathjax_code.data()); } } @@ -723,7 +723,7 @@ void HtmlGenerator::init() ResourceMgr &mgr = ResourceMgr::instance(); mgr.copyResource("tabs.css",dname); mgr.copyResource("jquery.js",dname); - if (Config_getBool("INTERACTIVE_SVG")) + if (Config_getBool(INTERACTIVE_SVG)) { mgr.copyResource("svgpan.js",dname); } @@ -734,7 +734,7 @@ void HtmlGenerator::init() { FTextStream t(&f); t << mgr.getAsString("dynsections.js"); - if (Config_getBool("SOURCE_BROWSER") && Config_getBool("SOURCE_TOOLTIPS")) + if (Config_getBool(SOURCE_BROWSER) && Config_getBool(SOURCE_TOOLTIPS)) { t << endl << "$(document).ready(function() {\n" @@ -752,7 +752,7 @@ void HtmlGenerator::init() void HtmlGenerator::writeTabData() { Doxygen::indexList->addStyleSheetFile("tabs.css"); - QCString dname=Config_getString("HTML_OUTPUT"); + QCString dname=Config_getString(HTML_OUTPUT); ResourceMgr &mgr = ResourceMgr::instance(); //writeColoredImgData(dname,colored_tab_data); mgr.copyResource("tab_a.lum",dname); @@ -780,7 +780,7 @@ void HtmlGenerator::writeTabData() void HtmlGenerator::writeSearchData(const char *dir) { - static bool serverBasedSearch = Config_getBool("SERVER_BASED_SEARCH"); + static bool serverBasedSearch = Config_getBool(SERVER_BASED_SEARCH); //writeImgData(dir,serverBasedSearch ? search_server_data : search_client_data); ResourceMgr &mgr = ResourceMgr::instance(); @@ -803,14 +803,14 @@ void HtmlGenerator::writeSearchData(const char *dir) Doxygen::indexList->addImageFile("search/mag_sel.png"); } - QCString searchDirName = Config_getString("HTML_OUTPUT")+"/search"; + QCString searchDirName = Config_getString(HTML_OUTPUT)+"/search"; QFile f(searchDirName+"/search.css"); if (f.open(IO_WriteOnly)) { FTextStream t(&f); QCString searchCss = replaceColorMarkers(mgr.getAsString("search.css")); searchCss = substitute(searchCss,"$doxygenversion",versionString); - if (Config_getBool("DISABLE_INDEX")) + if (Config_getBool(DISABLE_INDEX)) { // move up the search box if there are no tabs searchCss = substitute(searchCss,"margin-top: 8px;","margin-top: 0px;"); @@ -862,8 +862,8 @@ void HtmlGenerator::startFile(const char *name,const char *, t << "<!-- " << theTranslator->trGeneratedBy() << " Doxygen " << versionString << " -->" << endl; - //static bool generateTreeView = Config_getBool("GENERATE_TREEVIEW"); - static bool searchEngine = Config_getBool("SEARCHENGINE"); + //static bool generateTreeView = Config_getBool(GENERATE_TREEVIEW); + static bool searchEngine = Config_getBool(SEARCHENGINE); if (searchEngine /*&& !generateTreeView*/) { t << "<script type=\"text/javascript\">\n"; @@ -877,8 +877,8 @@ void HtmlGenerator::startFile(const char *name,const char *, void HtmlGenerator::writeSearchInfo(FTextStream &t,const QCString &relPath) { - static bool searchEngine = Config_getBool("SEARCHENGINE"); - static bool serverBasedSearch = Config_getBool("SERVER_BASED_SEARCH"); + static bool searchEngine = Config_getBool(SEARCHENGINE); + static bool serverBasedSearch = Config_getBool(SERVER_BASED_SEARCH); if (searchEngine && !serverBasedSearch) { (void)relPath; @@ -907,13 +907,13 @@ void HtmlGenerator::writeSearchInfo() QCString HtmlGenerator::writeLogoAsString(const char *path) { - static bool timeStamp = Config_getBool("HTML_TIMESTAMP"); + static bool timeStamp = Config_getBool(HTML_TIMESTAMP); QCString result; if (timeStamp) { result += theTranslator->trGeneratedAt( dateToString(TRUE), - Config_getString("PROJECT_NAME") + Config_getString(PROJECT_NAME) ); } else @@ -965,7 +965,7 @@ void HtmlGenerator::writeStyleInfo(int part) //printf("writeStyleInfo(%d)\n",part); if (part==0) { - if (Config_getString("HTML_STYLESHEET").isEmpty()) // write default style sheet + if (Config_getString(HTML_STYLESHEET).isEmpty()) // write default style sheet { //printf("write doxygen.css\n"); startPlainFile("doxygen.css"); @@ -980,11 +980,11 @@ void HtmlGenerator::writeStyleInfo(int part) } else // write user defined style sheet { - QCString cssname=Config_getString("HTML_STYLESHEET"); + QCString cssname=Config_getString(HTML_STYLESHEET); QFileInfo cssfi(cssname); if (!cssfi.exists() || !cssfi.isFile() || !cssfi.isReadable()) { - err("style sheet %s does not exist or is not readable!", Config_getString("HTML_STYLESHEET").data()); + err("style sheet %s does not exist or is not readable!", Config_getString(HTML_STYLESHEET).data()); } else { @@ -997,7 +997,7 @@ void HtmlGenerator::writeStyleInfo(int part) } Doxygen::indexList->addStyleSheetFile(cssfi.fileName().utf8()); } - static QStrList extraCssFile = Config_getList("HTML_EXTRA_STYLESHEET"); + static QStrList extraCssFile = Config_getList(HTML_EXTRA_STYLESHEET); for (uint i=0; i<extraCssFile.count(); ++i) { QCString fileName(extraCssFile.at(i)); @@ -1137,7 +1137,7 @@ void HtmlGenerator::endTextLink() void HtmlGenerator::startHtmlLink(const char *url) { - static bool generateTreeView = Config_getBool("GENERATE_TREEVIEW"); + static bool generateTreeView = Config_getBool(GENERATE_TREEVIEW); t << "<a "; if (generateTreeView) t << "target=\"top\" "; t << "href=\""; @@ -1258,7 +1258,7 @@ static void startSectionHeader(FTextStream &t, const QCString &relPath,int sectionCount) { //t << "<!-- startSectionHeader -->"; - static bool dynamicSections = Config_getBool("HTML_DYNAMIC_SECTIONS"); + static bool dynamicSections = Config_getBool(HTML_DYNAMIC_SECTIONS); if (dynamicSections) { t << "<div id=\"dynsection-" << sectionCount << "\" " @@ -1283,7 +1283,7 @@ static void endSectionHeader(FTextStream &t) static void startSectionSummary(FTextStream &t,int sectionCount) { //t << "<!-- startSectionSummary -->"; - static bool dynamicSections = Config_getBool("HTML_DYNAMIC_SECTIONS"); + static bool dynamicSections = Config_getBool(HTML_DYNAMIC_SECTIONS); if (dynamicSections) { t << "<div id=\"dynsection-" << sectionCount << "-summary\" " @@ -1295,7 +1295,7 @@ static void startSectionSummary(FTextStream &t,int sectionCount) static void endSectionSummary(FTextStream &t) { //t << "<!-- endSectionSummary -->"; - static bool dynamicSections = Config_getBool("HTML_DYNAMIC_SECTIONS"); + static bool dynamicSections = Config_getBool(HTML_DYNAMIC_SECTIONS); if (dynamicSections) { t << "</div>" << endl; @@ -1305,7 +1305,7 @@ static void endSectionSummary(FTextStream &t) static void startSectionContent(FTextStream &t,int sectionCount) { //t << "<!-- startSectionContent -->"; - static bool dynamicSections = Config_getBool("HTML_DYNAMIC_SECTIONS"); + static bool dynamicSections = Config_getBool(HTML_DYNAMIC_SECTIONS); if (dynamicSections) { t << "<div id=\"dynsection-" << sectionCount << "-content\" " @@ -1685,8 +1685,8 @@ void HtmlGenerator::startDotGraph() void HtmlGenerator::endDotGraph(const DotClassGraph &g) { - bool generateLegend = Config_getBool("GENERATE_LEGEND"); - bool umlLook = Config_getBool("UML_LOOK"); + bool generateLegend = Config_getBool(GENERATE_LEGEND); + bool umlLook = Config_getBool(UML_LOOK); endSectionHeader(t); startSectionSummary(t,m_sectionCount); endSectionSummary(t); @@ -1936,8 +1936,8 @@ static void endQuickIndexItem(FTextStream &t,const char *l) static bool quickLinkVisible(LayoutNavEntry::Kind kind) { - static bool showFiles = Config_getBool("SHOW_FILES"); - static bool showNamespaces = Config_getBool("SHOW_NAMESPACES"); + static bool showFiles = Config_getBool(SHOW_FILES); + static bool showNamespaces = Config_getBool(SHOW_NAMESPACES); switch (kind) { case LayoutNavEntry::MainPage: return TRUE; @@ -2032,8 +2032,8 @@ static void renderQuickLinksAsTabs(FTextStream &t,const QCString &relPath, } if (hlEntry->parent()==LayoutDocManager::instance().rootNavEntry()) // first row is special as it contains the search box { - static bool searchEngine = Config_getBool("SEARCHENGINE"); - static bool serverBasedSearch = Config_getBool("SERVER_BASED_SEARCH"); + static bool searchEngine = Config_getBool(SEARCHENGINE); + static bool serverBasedSearch = Config_getBool(SERVER_BASED_SEARCH); if (searchEngine) { t << " <li>\n"; @@ -2137,7 +2137,7 @@ void HtmlGenerator::endQuickIndices() QCString HtmlGenerator::writeSplitBarAsString(const char *name,const char *relpath) { - static bool generateTreeView = Config_getBool("GENERATE_TREEVIEW"); + static bool generateTreeView = Config_getBool(GENERATE_TREEVIEW); QCString result; // write split bar if (generateTreeView) @@ -2192,10 +2192,10 @@ void HtmlGenerator::writeQuickLinks(bool compact,HighlightedItem hli,const char // PHP based search script void HtmlGenerator::writeSearchPage() { - static bool generateTreeView = Config_getBool("GENERATE_TREEVIEW"); - static bool disableIndex = Config_getBool("DISABLE_INDEX"); - static QCString projectName = Config_getString("PROJECT_NAME"); - static QCString htmlOutput = Config_getString("HTML_OUTPUT"); + static bool generateTreeView = Config_getBool(GENERATE_TREEVIEW); + static bool disableIndex = Config_getBool(DISABLE_INDEX); + static QCString projectName = Config_getString(PROJECT_NAME); + static QCString htmlOutput = Config_getString(HTML_OUTPUT); // OPENSEARCH_PROVIDER { QCString configFileName = htmlOutput+"/search_config.php"; @@ -2241,7 +2241,7 @@ void HtmlGenerator::writeSearchPage() t << "var searchBox = new SearchBox(\"searchBox\", \"" << "search\",false,'" << theTranslator->trSearch() << "');\n"; t << "</script>\n"; - if (!Config_getBool("DISABLE_INDEX")) + if (!Config_getBool(DISABLE_INDEX)) { writeDefaultQuickLinks(t,TRUE,HLI_Search,0,""); } @@ -2280,8 +2280,8 @@ void HtmlGenerator::writeSearchPage() void HtmlGenerator::writeExternalSearchPage() { - static bool generateTreeView = Config_getBool("GENERATE_TREEVIEW"); - QCString fileName = Config_getString("HTML_OUTPUT")+"/search"+Doxygen::htmlFileExtension; + static bool generateTreeView = Config_getBool(GENERATE_TREEVIEW); + QCString fileName = Config_getString(HTML_OUTPUT)+"/search"+Doxygen::htmlFileExtension; QFile f(fileName); if (f.open(IO_WriteOnly)) { @@ -2294,7 +2294,7 @@ void HtmlGenerator::writeExternalSearchPage() t << "var searchBox = new SearchBox(\"searchBox\", \"" << "search\",false,'" << theTranslator->trSearch() << "');\n"; t << "</script>\n"; - if (!Config_getBool("DISABLE_INDEX")) + if (!Config_getBool(DISABLE_INDEX)) { writeDefaultQuickLinks(t,TRUE,HLI_Search,0,""); t << " <input type=\"text\" id=\"MSearchField\" name=\"query\" value=\"\" size=\"20\" accesskey=\"S\" onfocus=\"searchBox.OnSearchFieldFocus(true)\" onblur=\"searchBox.OnSearchFieldFocus(false)\"/>\n"; @@ -2328,7 +2328,7 @@ void HtmlGenerator::writeExternalSearchPage() writePageFooter(t,"Search","",""); } - QCString scriptName = Config_getString("HTML_OUTPUT")+"/search/search.js"; + QCString scriptName = Config_getString(HTML_OUTPUT)+"/search/search.js"; QFile sf(scriptName); if (sf.open(IO_WriteOnly)) { @@ -2337,11 +2337,11 @@ void HtmlGenerator::writeExternalSearchPage() << "\"" << theTranslator->trSearchResults(0) << "\"," << "\"" << theTranslator->trSearchResults(1) << "\"," << "\"" << theTranslator->trSearchResults(2) << "\"];" << endl; - t << "var serverUrl=\"" << Config_getString("SEARCHENGINE_URL") << "\";" << endl; + t << "var serverUrl=\"" << Config_getString(SEARCHENGINE_URL) << "\";" << endl; t << "var tagMap = {" << endl; bool first=TRUE; // add search mappings - QStrList &extraSearchMappings = Config_getList("EXTRA_SEARCH_MAPPINGS"); + QStrList &extraSearchMappings = Config_getList(EXTRA_SEARCH_MAPPINGS); char *ml=extraSearchMappings.first(); while (ml) { diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp index a283338..d365744 100644 --- a/src/htmlhelp.cpp +++ b/src/htmlhelp.cpp @@ -302,7 +302,7 @@ static QDict<QCString> s_languageDict; */ void HtmlHelp::initialize() { - const char *str = Config_getString("CHM_INDEX_ENCODING"); + const char *str = Config_getString(CHM_INDEX_ENCODING); if (!str) str = "CP1250"; // use safe and likely default m_fromUtf8 = portable_iconv_open(str,"UTF-8"); if (m_fromUtf8==(void *)(-1)) @@ -312,7 +312,7 @@ void HtmlHelp::initialize() } /* open the contents file */ - QCString fName = Config_getString("HTML_OUTPUT") + "/index.hhc"; + QCString fName = Config_getString(HTML_OUTPUT) + "/index.hhc"; cf = new QFile(fName); if (!cf->open(IO_WriteOnly)) { @@ -329,7 +329,7 @@ void HtmlHelp::initialize() "<UL>\n"; /* open the contents file */ - fName = Config_getString("HTML_OUTPUT") + "/index.hhk"; + fName = Config_getString(HTML_OUTPUT) + "/index.hhk"; kf = new QFile(fName); if (!kf->open(IO_WriteOnly)) { @@ -465,7 +465,7 @@ static QCString getLanguageString() void HtmlHelp::createProjectFile() { /* Write the project file */ - QCString fName = Config_getString("HTML_OUTPUT") + "/index.hhp"; + QCString fName = Config_getString(HTML_OUTPUT) + "/index.hhp"; QFile f(fName); if (f.open(IO_WriteOnly)) { @@ -473,9 +473,9 @@ void HtmlHelp::createProjectFile() QCString indexName="index"+Doxygen::htmlFileExtension; t << "[OPTIONS]\n"; - if (!Config_getString("CHM_FILE").isEmpty()) + if (!Config_getString(CHM_FILE).isEmpty()) { - t << "Compiled file=" << Config_getString("CHM_FILE") << "\n"; + t << "Compiled file=" << Config_getString(CHM_FILE) << "\n"; } t << "Compatibility=1.1\n" "Full-text search=Yes\n" @@ -484,9 +484,9 @@ void HtmlHelp::createProjectFile() "Default topic=" << indexName << "\n" "Index file=index.hhk\n" "Language=" << getLanguageString() << endl; - if (Config_getBool("BINARY_TOC")) t << "Binary TOC=YES\n"; - if (Config_getBool("GENERATE_CHI")) t << "Create CHI file=YES\n"; - t << "Title=" << recode(Config_getString("PROJECT_NAME")) << endl << endl; + if (Config_getBool(BINARY_TOC)) t << "Binary TOC=YES\n"; + if (Config_getBool(GENERATE_CHI)) t << "Create CHI file=YES\n"; + t << "Title=" << recode(Config_getString(PROJECT_NAME)) << endl << endl; t << "[WINDOWS]" << endl; @@ -500,15 +500,15 @@ void HtmlHelp::createProjectFile() // are shown. They can only be shown in case of a binary toc. // dee http://www.mif2go.com/xhtml/htmlhelp_0016_943addingtabsandtoolbarbuttonstohtmlhelp.htm#Rz108x95873 // Value has been taken from htmlhelp.h file of the HTML Help Workshop - if (Config_getBool("BINARY_TOC")) + if (Config_getBool(BINARY_TOC)) { - t << "main=\"" << recode(Config_getString("PROJECT_NAME")) << "\",\"index.hhc\"," + t << "main=\"" << recode(Config_getString(PROJECT_NAME)) << "\",\"index.hhc\"," "\"index.hhk\",\"" << indexName << "\",\"" << indexName << "\",,,,,0x23520,,0x70387e,,,,,,,,0" << endl << endl; } else { - t << "main=\"" << recode(Config_getString("PROJECT_NAME")) << "\",\"index.hhc\"," + t << "main=\"" << recode(Config_getString(PROJECT_NAME)) << "\",\"index.hhc\"," "\"index.hhk\",\"" << indexName << "\",\"" << indexName << "\",,,,,0x23520,,0x10387e,,,,,,,,0" << endl << endl; } @@ -637,7 +637,7 @@ void HtmlHelp::addContentsItem(bool isDir, // Tried this and I didn't see any problems, when not using // the resetting of file and anchor the TOC works better // (prev / next button) - //if(Config_getBool("BINARY_TOC") && isDir) + //if(Config_getBool(BINARY_TOC) && isDir) //{ //file = 0; //anchor = 0; @@ -681,7 +681,7 @@ void HtmlHelp::addIndexItem(Definition *context,MemberDef *md, { if (md) { - static bool separateMemberPages = Config_getBool("SEPARATE_MEMBER_PAGES"); + static bool separateMemberPages = Config_getBool(SEPARATE_MEMBER_PAGES); if (context==0) // global member { if (md->getGroupDef()) diff --git a/src/image.cpp b/src/image.cpp index adec5b3..afc67ef 100644 --- a/src/image.cpp +++ b/src/image.cpp @@ -209,9 +209,9 @@ static Color palette3[] = Image::Image(int w,int h) { - static int hue = Config_getInt("HTML_COLORSTYLE_HUE"); - static int sat = Config_getInt("HTML_COLORSTYLE_SAT"); - static int gamma = Config_getInt("HTML_COLORSTYLE_GAMMA"); + static int hue = Config_getInt(HTML_COLORSTYLE_HUE); + static int sat = Config_getInt(HTML_COLORSTYLE_SAT); + static int gamma = Config_getInt(HTML_COLORSTYLE_GAMMA); double red1,green1,blue1; double red2,green2,blue2; @@ -399,7 +399,7 @@ bool Image::save(const char *fileName,int mode) return FALSE; } #endif - static bool useTransparency = Config_getBool("FORMULA_TRANSPARENT"); + static bool useTransparency = Config_getBool(FORMULA_TRANSPARENT); uchar* buffer; size_t bufferSize; LodePNG_Encoder encoder; diff --git a/src/index.cpp b/src/index.cpp index 15303c7..dbc0878 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -245,7 +245,7 @@ void startFile(OutputList &ol,const char *name,const char *manName, const char *title,HighlightedItem hli,bool additionalIndices, const char *altSidebarName) { - static bool disableIndex = Config_getBool("DISABLE_INDEX"); + static bool disableIndex = Config_getBool(DISABLE_INDEX); ol.startFile(name,manName,title); ol.startQuickIndices(); if (!disableIndex) @@ -263,7 +263,7 @@ void startFile(OutputList &ol,const char *name,const char *manName, void endFile(OutputList &ol,bool skipNavIndex,bool skipEndContents, const QCString &navPath) { - static bool generateTreeView = Config_getBool("GENERATE_TREEVIEW"); + static bool generateTreeView = Config_getBool(GENERATE_TREEVIEW); ol.pushGeneratorState(); ol.disableAllBut(OutputGenerator::Html); if (!skipNavIndex) @@ -281,7 +281,7 @@ void endFile(OutputList &ol,bool skipNavIndex,bool skipEndContents, void endFileWithNavPath(Definition *d,OutputList &ol) { - static bool generateTreeView = Config_getBool("GENERATE_TREEVIEW"); + static bool generateTreeView = Config_getBool(GENERATE_TREEVIEW); QCString navPath; if (generateTreeView) { @@ -338,8 +338,8 @@ void addMembersToIndex(T *def,LayoutDocManager::LayoutPart part, MemberList *enumList = md->enumFieldList(); bool isDir = enumList!=0 && md->isEnumerate(); bool isAnonymous = md->name().find('@')!=-1; - static bool hideUndocMembers = Config_getBool("HIDE_UNDOC_MEMBERS"); - static bool extractStatic = Config_getBool("EXTRACT_STATIC"); + static bool hideUndocMembers = Config_getBool(HIDE_UNDOC_MEMBERS); + static bool extractStatic = Config_getBool(EXTRACT_STATIC); if (!isAnonymous && (!hideUndocMembers || md->hasDocumentation()) && (!md->isStatic() || extractStatic) @@ -401,7 +401,7 @@ void addMembersToIndex(T *def,LayoutDocManager::LayoutPart part, { if (cd->isLinkable() && (cd->partOfGroups()==0 || def->definitionType()==Definition::TypeGroup)) { - static bool inlineSimpleStructs = Config_getBool("INLINE_SIMPLE_STRUCTS"); + static bool inlineSimpleStructs = Config_getBool(INLINE_SIMPLE_STRUCTS); bool isNestedClass = def->definitionType()==Definition::TypeClass; addMembersToIndex(cd,LayoutDocManager::Class,cd->displayName(FALSE),cd->anchor(), addToIndex && (isNestedClass || (cd->isSimple() && inlineSimpleStructs)), @@ -585,7 +585,7 @@ static void writeDirTreeNode(OutputList &ol, DirDef *dd, int level, FTVHelp* ftv return; } - static bool tocExpand = TRUE; //Config_getBool("TOC_EXPAND"); + static bool tocExpand = TRUE; //Config_getBool(TOC_EXPAND); bool isDir = dd->subDirs().count()>0 || // there are subdirs (tocExpand && // or toc expand and dd->getFiles() && dd->getFiles()->count()>0 // there are files @@ -635,7 +635,7 @@ static void writeDirTreeNode(OutputList &ol, DirDef *dd, int level, FTVHelp* ftv FileDef *fd; for (;(fd=it.current());++it) { - //static bool allExternals = Config_getBool("ALLEXTERNALS"); + //static bool allExternals = Config_getBool(ALLEXTERNALS); //if ((allExternals && fd->isLinkable()) || fd->isLinkableInProject()) //{ // fileCount++; @@ -693,7 +693,7 @@ static void writeDirTreeNode(OutputList &ol, DirDef *dd, int level, FTVHelp* ftv FileDef *fd; for (;(fd=it.current());++it) { - //static bool allExternals = Config_getBool("ALLEXTERNALS"); + //static bool allExternals = Config_getBool(ALLEXTERNALS); //if ((allExternals && fd->isLinkable()) || fd->isLinkableInProject()) bool doc,src; doc = fileVisibleInIndex(fd,src); @@ -729,7 +729,7 @@ static void writeDirHierarchy(OutputList &ol, FTVHelp* ftv,bool addToIndex) ol.pushGeneratorState(); ol.disable(OutputGenerator::Html); } - static bool fullPathNames = Config_getBool("FULL_PATH_NAMES"); + static bool fullPathNames = Config_getBool(FULL_PATH_NAMES); startIndexHierarchy(ol,0); if (fullPathNames) { @@ -753,7 +753,7 @@ static void writeDirHierarchy(OutputList &ol, FTVHelp* ftv,bool addToIndex) FileDef *fd; for (;(fd=fni.current());++fni) { - static bool fullPathNames = Config_getBool("FULL_PATH_NAMES"); + static bool fullPathNames = Config_getBool(FULL_PATH_NAMES); if (!fullPathNames || fd->getDirDef()==0) // top level file { bool doc,src; @@ -970,7 +970,7 @@ static void writeHierarchicalIndex(OutputList &ol) ol.startContents(); ol.startTextBlock(); - if (Config_getBool("HAVE_DOT") && Config_getBool("GRAPHICAL_HIERARCHY")) + if (Config_getBool(HAVE_DOT) && Config_getBool(GRAPHICAL_HIERARCHY)) { ol.disable(OutputGenerator::Latex); ol.disable(OutputGenerator::RTF); @@ -1094,7 +1094,7 @@ static void writeSingleFileIndex(OutputList &ol,FileDef *fd) if (nameOk && (doc || src) && !fd->isReference()) { QCString path; - if (Config_getBool("FULL_PATH_NAMES")) + if (Config_getBool(FULL_PATH_NAMES)) { path=stripFromPath(fd->getPath().copy()); } @@ -1178,9 +1178,9 @@ static void writeFileIndex(OutputList &ol) startFile(ol,"files",0,title,HLI_Files); startTitle(ol,0); - //if (!Config_getString("PROJECT_NAME").isEmpty()) + //if (!Config_getString(PROJECT_NAME).isEmpty()) //{ - // title.prepend(Config_getString("PROJECT_NAME")+" "); + // title.prepend(Config_getString(PROJECT_NAME)+" "); //} ol.parseText(title); endTitle(ol,0,0); @@ -1193,7 +1193,7 @@ static void writeFileIndex(OutputList &ol) Doxygen::indexList->incContentsDepth(); } - ol.parseText(lne ? lne->intro() : theTranslator->trFileListDescription(Config_getBool("EXTRACT_ALL"))); + ol.parseText(lne ? lne->intro() : theTranslator->trFileListDescription(Config_getBool(EXTRACT_ALL))); ol.endTextBlock(); // --------------- @@ -1208,7 +1208,7 @@ static void writeFileIndex(OutputList &ol) OutputNameList outputNameList; outputNameList.setAutoDelete(TRUE); - if (Config_getBool("FULL_PATH_NAMES")) + if (Config_getBool(FULL_PATH_NAMES)) { // re-sort input files in (dir,file) output order instead of (file,dir) input order FileNameListIterator fnli(*Doxygen::inputNameList); @@ -1240,7 +1240,7 @@ static void writeFileIndex(OutputList &ol) } ol.startIndexList(); - if (Config_getBool("FULL_PATH_NAMES")) + if (Config_getBool(FULL_PATH_NAMES)) { outputNameList.sort(); QListIterator<FileList> fnli(outputNameList); @@ -1459,7 +1459,7 @@ static void writeNamespaceIndex(OutputList &ol) endTitle(ol,0,0); ol.startContents(); ol.startTextBlock(); - ol.parseText(lne ? lne->intro() : theTranslator->trNamespaceListDescription(Config_getBool("EXTRACT_ALL"))); + ol.parseText(lne ? lne->intro() : theTranslator->trNamespaceListDescription(Config_getBool(EXTRACT_ALL))); ol.endTextBlock(); bool first=TRUE; @@ -1801,7 +1801,7 @@ static void writeAlphabeticalClassList(OutputList &ol) // the number of columns in the table - const int columns = Config_getInt("COLS_IN_ALPHA_INDEX"); + const int columns = Config_getInt(COLS_IN_ALPHA_INDEX); int i,j; int totalItems = headerItems*2 + annotatedClasses; // number of items in the table (headers span 2 items) @@ -2263,7 +2263,7 @@ void initClassMemberIndices() void addClassMemberNameToIndex(MemberDef *md) { - static bool hideFriendCompounds = Config_getBool("HIDE_FRIEND_COMPOUNDS"); + static bool hideFriendCompounds = Config_getBool(HIDE_FRIEND_COMPOUNDS); ClassDef *cd=0; @@ -2496,8 +2496,8 @@ struct CmhlInfo static const CmhlInfo *getCmhlInfo(int hl) { - static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); - static bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); + static bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); + static bool vhdlOpt = Config_getBool(OPTIMIZE_OUTPUT_VHDL); static CmhlInfo cmhlInfo[] = { CmhlInfo("functions", theTranslator->trAll()), @@ -2520,7 +2520,7 @@ static void writeClassMemberIndexFiltered(OutputList &ol, ClassMemberHighlight h { if (documentedClassMembers[hl]==0) return; - static bool disableIndex = Config_getBool("DISABLE_INDEX"); + static bool disableIndex = Config_getBool(DISABLE_INDEX); bool multiPageIndex=FALSE; if (documentedClassMembers[hl]>MAX_ITEMS_BEFORE_MULTIPAGE_INDEX) @@ -2610,7 +2610,7 @@ static void writeClassMemberIndexFiltered(OutputList &ol, ClassMemberHighlight h if (hl==CMHL_All) { ol.startTextBlock(); - ol.parseText(lne ? lne->intro() : theTranslator->trCompoundMembersDescription(Config_getBool("EXTRACT_ALL"))); + ol.parseText(lne ? lne->intro() : theTranslator->trCompoundMembersDescription(Config_getBool(EXTRACT_ALL))); ol.endTextBlock(); } else @@ -2671,8 +2671,8 @@ struct FmhlInfo static const FmhlInfo *getFmhlInfo(int hl) { - static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); - static bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); + static bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); + static bool vhdlOpt = Config_getBool(OPTIMIZE_OUTPUT_VHDL); static FmhlInfo fmhlInfo[] = { FmhlInfo("globals", theTranslator->trAll()), @@ -2693,7 +2693,7 @@ static void writeFileMemberIndexFiltered(OutputList &ol, FileMemberHighlight hl) { if (documentedFileMembers[hl]==0) return; - static bool disableIndex = Config_getBool("DISABLE_INDEX"); + static bool disableIndex = Config_getBool(DISABLE_INDEX); bool multiPageIndex=FALSE; if (documentedFileMembers[hl]>MAX_ITEMS_BEFORE_MULTIPAGE_INDEX) @@ -2780,7 +2780,7 @@ static void writeFileMemberIndexFiltered(OutputList &ol, FileMemberHighlight hl) if (hl==FMHL_All) { ol.startTextBlock(); - ol.parseText(lne ? lne->intro() : theTranslator->trFileMembersDescription(Config_getBool("EXTRACT_ALL"))); + ol.parseText(lne ? lne->intro() : theTranslator->trFileMembersDescription(Config_getBool(EXTRACT_ALL))); ol.endTextBlock(); } else @@ -2836,8 +2836,8 @@ struct NmhlInfo static const NmhlInfo *getNmhlInfo(int hl) { - static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); - static bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); + static bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); + static bool vhdlOpt = Config_getBool(OPTIMIZE_OUTPUT_VHDL); static NmhlInfo nmhlInfo[] = { NmhlInfo("namespacemembers", theTranslator->trAll()), @@ -2860,7 +2860,7 @@ static void writeNamespaceMemberIndexFiltered(OutputList &ol, { if (documentedNamespaceMembers[hl]==0) return; - static bool disableIndex = Config_getBool("DISABLE_INDEX"); + static bool disableIndex = Config_getBool(DISABLE_INDEX); bool multiPageIndex=FALSE; @@ -2949,7 +2949,7 @@ static void writeNamespaceMemberIndexFiltered(OutputList &ol, if (hl==NMHL_All) { ol.startTextBlock(); - ol.parseText(lne ? lne->intro() : theTranslator->trNamespaceMemberDescription(Config_getBool("EXTRACT_ALL"))); + ol.parseText(lne ? lne->intro() : theTranslator->trNamespaceMemberDescription(Config_getBool(EXTRACT_ALL))); ol.endTextBlock(); } else @@ -2978,7 +2978,7 @@ static void writeNamespaceMemberIndex(OutputList &ol) Doxygen::indexList->addContentsItem(FALSE,lne ? lne->title() : theTranslator->trNamespaceMembers(),0,"namespacemembers",0); Doxygen::indexList->incContentsDepth(); } - //bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); + //bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); writeNamespaceMemberIndexFiltered(ol,NMHL_All); writeNamespaceMemberIndexFiltered(ol,NMHL_Functions); writeNamespaceMemberIndexFiltered(ol,NMHL_Variables); @@ -3084,7 +3084,7 @@ static void countRelatedPages(int &docPages,int &indexPages) static bool mainPageHasOwnTitle() { - static QCString projectName = Config_getString("PROJECT_NAME"); + static QCString projectName = Config_getString(PROJECT_NAME); QCString title; if (Doxygen::mainPage) { @@ -3244,14 +3244,14 @@ static int countDirs() void writeGraphInfo(OutputList &ol) { - if (!Config_getBool("HAVE_DOT") || !Config_getBool("GENERATE_HTML")) return; + if (!Config_getBool(HAVE_DOT) || !Config_getBool(GENERATE_HTML)) return; ol.pushGeneratorState(); ol.disableAllBut(OutputGenerator::Html); - generateGraphLegend(Config_getString("HTML_OUTPUT")); + generateGraphLegend(Config_getString(HTML_OUTPUT)); - bool &stripCommentsStateRef = Config_getBool("STRIP_CODE_COMMENTS"); + bool &stripCommentsStateRef = Config_getBool(STRIP_CODE_COMMENTS); bool oldStripCommentsState = stripCommentsStateRef; - bool &createSubdirs = Config_getBool("CREATE_SUBDIRS"); + bool &createSubdirs = Config_getBool(CREATE_SUBDIRS); bool oldCreateSubdirs = createSubdirs; // temporarily disable the stripping of comments for our own code example! stripCommentsStateRef = FALSE; @@ -3291,8 +3291,8 @@ void writeGraphInfo(OutputList &ol) */ static void writeGroupTreeNode(OutputList &ol, GroupDef *gd, int level, FTVHelp* ftv, bool addToIndex) { - //bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); - //bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); + //bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); + //bool vhdlOpt = Config_getBool(OPTIMIZE_OUTPUT_VHDL); if (level>20) { warn(gd->getDefFileName(),gd->getDefLine(), @@ -3306,7 +3306,7 @@ static void writeGroupTreeNode(OutputList &ol, GroupDef *gd, int level, FTVHelp* */ if (/*!gd->visited &&*/ (!gd->isASubGroup() || level>0) && gd->isVisible() && - (!gd->isReference() || Config_getBool("EXTERNAL_GROUPS")) // hide external groups by default + (!gd->isReference() || Config_getBool(EXTERNAL_GROUPS)) // hide external groups by default ) { //printf("gd->name()=%s #members=%d\n",gd->name().data(),gd->countMembers()); @@ -3314,7 +3314,7 @@ static void writeGroupTreeNode(OutputList &ol, GroupDef *gd, int level, FTVHelp* bool hasSubGroups = gd->getSubGroups()->count()>0; bool hasSubPages = gd->getPages()->count()>0; int numSubItems = 0; - if (1 /*Config_getBool("TOC_EXPAND")*/) + if (1 /*Config_getBool(TOC_EXPAND)*/) { QListIterator<MemberList> mli(gd->getMemberLists()); MemberList *ml; @@ -3560,7 +3560,7 @@ static void writeGroupHierarchy(OutputList &ol, FTVHelp* ftv,bool addToIndex) #if 0 static void writeGroupTree(GroupDef *gd,FTVHelp *ftv,int level,bool addToIndex) { - static bool externalGroups = Config_getBool("EXTERNAL_GROUPS"); + static bool externalGroups = Config_getBool(EXTERNAL_GROUPS); /* Some groups should appear twice under different parent-groups. * That is why we should not check if it was visited */ @@ -3689,7 +3689,7 @@ static void writeDirIndex(OutputList &ol) ol.endTextBlock(); FTVHelp* ftv = 0; - bool treeView=Config_getBool("USE_INLINE_TREES"); + bool treeView=Config_getBool(USE_INLINE_TREES); if (treeView) { ftv = new FTVHelp(FALSE); @@ -3760,9 +3760,9 @@ static void writeUserGroupStubPage(OutputList &ol,LayoutNavEntry *lne) static void writeIndex(OutputList &ol) { - static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); - static bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); - static QCString projectName = Config_getString("PROJECT_NAME"); + static bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); + static bool vhdlOpt = Config_getBool(OPTIMIZE_OUTPUT_VHDL); + static QCString projectName = Config_getString(PROJECT_NAME); // save old generator state ol.pushGeneratorState(); @@ -3810,7 +3810,7 @@ static void writeIndex(OutputList &ol) } ol.startQuickIndices(); - if (!Config_getBool("DISABLE_INDEX")) + if (!Config_getBool(DISABLE_INDEX)) { ol.writeQuickLinks(TRUE,HLI_Main,0); } @@ -3847,7 +3847,7 @@ static void writeIndex(OutputList &ol) } ol.startContents(); - if (Config_getBool("DISABLE_INDEX") && Doxygen::mainPage==0) + if (Config_getBool(DISABLE_INDEX) && Doxygen::mainPage==0) { ol.writeQuickLinks(FALSE,HLI_Main,0); } @@ -3880,7 +3880,7 @@ static void writeIndex(OutputList &ol) ol.startFile("refman",0,0); ol.startIndexSection(isTitlePageStart); - if (!Config_getString("LATEX_HEADER").isEmpty()) + if (!Config_getString(LATEX_HEADER).isEmpty()) { ol.disable(OutputGenerator::Latex); } @@ -3894,10 +3894,10 @@ static void writeIndex(OutputList &ol) ol.parseText(projPrefix); } - if (!Config_getString("PROJECT_NUMBER").isEmpty()) + if (!Config_getString(PROJECT_NUMBER).isEmpty()) { ol.startProjectNumber(); - ol.generateDoc(defFileName,defLine,Doxygen::mainPage,0,Config_getString("PROJECT_NUMBER"),FALSE,FALSE); + ol.generateDoc(defFileName,defLine,Doxygen::mainPage,0,Config_getString(PROJECT_NUMBER),FALSE,FALSE); ol.endProjectNumber(); } ol.endIndexSection(isTitlePageStart); @@ -3968,7 +3968,7 @@ static void writeIndex(OutputList &ol) } } - if (!Config_getBool("LATEX_HIDE_INDICES")) + if (!Config_getBool(LATEX_HIDE_INDICES)) { //if (indexedPages>0) //{ @@ -4106,7 +4106,7 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry break; case LayoutNavEntry::Namespaces: { - static bool showNamespaces = Config_getBool("SHOW_NAMESPACES"); + static bool showNamespaces = Config_getBool(SHOW_NAMESPACES); if (showNamespaces) { if (documentedNamespaces>0 && addToIndex) @@ -4125,7 +4125,7 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry break; case LayoutNavEntry::NamespaceList: { - static bool showNamespaces = Config_getBool("SHOW_NAMESPACES"); + static bool showNamespaces = Config_getBool(SHOW_NAMESPACES); if (showNamespaces) { msg("Generating namespace index...\n"); @@ -4161,7 +4161,7 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry case LayoutNavEntry::ClassHierarchy: msg("Generating hierarchical class index...\n"); writeHierarchicalIndex(ol); - if (Config_getBool("HAVE_DOT") && Config_getBool("GRAPHICAL_HIERARCHY")) + if (Config_getBool(HAVE_DOT) && Config_getBool(GRAPHICAL_HIERARCHY)) { msg("Generating graphical class hierarchy...\n"); writeGraphicalClassHierarchy(ol); @@ -4173,7 +4173,7 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry break; case LayoutNavEntry::Files: { - static bool showFiles = Config_getBool("SHOW_FILES"); + static bool showFiles = Config_getBool(SHOW_FILES); if (showFiles) { if (documentedHtmlFiles>0 && addToIndex) @@ -4192,7 +4192,7 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry break; case LayoutNavEntry::FileList: { - static bool showFiles = Config_getBool("SHOW_FILES"); + static bool showFiles = Config_getBool(SHOW_FILES); if (showFiles) { msg("Generating file index...\n"); diff --git a/src/latexdocvisitor.cpp b/src/latexdocvisitor.cpp index e8bb119..184511f 100644 --- a/src/latexdocvisitor.cpp +++ b/src/latexdocvisitor.cpp @@ -64,7 +64,7 @@ static const char *secLabels[maxLevels] = static const char *getSectionName(int level) { - static bool compactLatex = Config_getBool("COMPACT_LATEX"); + static bool compactLatex = Config_getBool(COMPACT_LATEX); int l = level; if (compactLatex) l++; if (Doxygen::insideMainPage) l--; @@ -236,7 +236,7 @@ void LatexDocVisitor::visit(DocSymbol *s) void LatexDocVisitor::visit(DocURL *u) { if (m_hide) return; - if (Config_getBool("PDF_HYPERLINKS")) + if (Config_getBool(PDF_HYPERLINKS)) { m_t << "\\href{"; if (u->isEmail()) m_t << "mailto:"; @@ -343,7 +343,7 @@ void LatexDocVisitor::visit(DocVerbatim *s) QCString fileName(4096); fileName.sprintf("%s%d%s", - (Config_getString("LATEX_OUTPUT")+"/inline_dotgraph_").data(), + (Config_getString(LATEX_OUTPUT)+"/inline_dotgraph_").data(), dotindex++, ".dot" ); @@ -361,7 +361,7 @@ void LatexDocVisitor::visit(DocVerbatim *s) visitCaption(this, s->children()); endDotFile(s->hasCaption()); - if (Config_getBool("DOT_CLEANUP")) file.remove(); + if (Config_getBool(DOT_CLEANUP)) file.remove(); } } break; @@ -371,7 +371,7 @@ void LatexDocVisitor::visit(DocVerbatim *s) QCString baseName(4096); baseName.sprintf("%s%d", - (Config_getString("LATEX_OUTPUT")+"/inline_mscgraph_").data(), + (Config_getString(LATEX_OUTPUT)+"/inline_mscgraph_").data(), mscindex++ ); QFile file(baseName+".msc"); @@ -389,13 +389,13 @@ void LatexDocVisitor::visit(DocVerbatim *s) writeMscFile(baseName, s); - if (Config_getBool("DOT_CLEANUP")) file.remove(); + if (Config_getBool(DOT_CLEANUP)) file.remove(); } } break; case DocVerbatim::PlantUML: { - QCString latexOutput = Config_getString("LATEX_OUTPUT"); + QCString latexOutput = Config_getString(LATEX_OUTPUT); QCString baseName = writePlantUMLSource(latexOutput,s->exampleFile(),s->text()); writePlantUMLFile(baseName, s); @@ -408,7 +408,7 @@ void LatexDocVisitor::visit(DocAnchor *anc) { if (m_hide) return; m_t << "\\label{" << stripPath(anc->file()) << "_" << anc->anchor() << "}%" << endl; - if (!anc->file().isEmpty() && Config_getBool("PDF_HYPERLINKS")) + if (!anc->file().isEmpty() && Config_getBool(PDF_HYPERLINKS)) { m_t << "\\hypertarget{" << stripPath(anc->file()) << "_" << anc->anchor() << "}{}%" << endl; @@ -786,7 +786,7 @@ void LatexDocVisitor::visitPost(DocSimpleListItem *) void LatexDocVisitor::visitPre(DocSection *s) { if (m_hide) return; - if (Config_getBool("PDF_HYPERLINKS")) + if (Config_getBool(PDF_HYPERLINKS)) { m_t << "\\hypertarget{" << stripPath(s->file()) << "_" << s->anchor() << "}{}"; } @@ -933,7 +933,7 @@ void LatexDocVisitor::visitPre(DocHtmlTable *t) if (t->hasCaption()) { DocHtmlCaption *c = t->caption(); - static bool pdfHyperLinks = Config_getBool("PDF_HYPERLINKS"); + static bool pdfHyperLinks = Config_getBool(PDF_HYPERLINKS); if (!c->file().isEmpty() && pdfHyperLinks) { m_t << "\\hypertarget{" << stripPath(c->file()) << "_" << c->anchor() @@ -1195,7 +1195,7 @@ void LatexDocVisitor::visitPost(DocInternal *) void LatexDocVisitor::visitPre(DocHRef *href) { if (m_hide) return; - if (Config_getBool("PDF_HYPERLINKS")) + if (Config_getBool(PDF_HYPERLINKS)) { m_t << "\\href{"; m_t << href->url(); @@ -1333,7 +1333,7 @@ void LatexDocVisitor::visitPre(DocSecRefItem *ref) { if (m_hide) return; m_t << "\\item \\contentsline{section}{"; - static bool pdfHyperlinks = Config_getBool("PDF_HYPERLINKS"); + static bool pdfHyperlinks = Config_getBool(PDF_HYPERLINKS); if (pdfHyperlinks) { m_t << "\\hyperlink{" << ref->file() << "_" << ref->anchor() << "}{" ; @@ -1343,7 +1343,7 @@ void LatexDocVisitor::visitPre(DocSecRefItem *ref) void LatexDocVisitor::visitPost(DocSecRefItem *ref) { if (m_hide) return; - static bool pdfHyperlinks = Config_getBool("PDF_HYPERLINKS"); + static bool pdfHyperlinks = Config_getBool(PDF_HYPERLINKS); if (pdfHyperlinks) { m_t << "}"; @@ -1541,7 +1541,7 @@ void LatexDocVisitor::visitPre(DocXRefItem *x) m_t << "}" << endl; bool anonymousEnum = x->file()=="@"; m_t << "\\item["; - if (Config_getBool("PDF_HYPERLINKS") && !anonymousEnum) + if (Config_getBool(PDF_HYPERLINKS) && !anonymousEnum) { m_t << "\\hyperlink{" << stripPath(x->file()) << "_" << x->anchor() << "}{"; } @@ -1629,7 +1629,7 @@ void LatexDocVisitor::filter(const char *str) void LatexDocVisitor::startLink(const QCString &ref,const QCString &file,const QCString &anchor,bool refToTable) { - static bool pdfHyperLinks = Config_getBool("PDF_HYPERLINKS"); + static bool pdfHyperLinks = Config_getBool(PDF_HYPERLINKS); if (ref.isEmpty() && pdfHyperLinks) // internal PDF link { if (refToTable) @@ -1662,7 +1662,7 @@ void LatexDocVisitor::startLink(const QCString &ref,const QCString &file,const Q void LatexDocVisitor::endLink(const QCString &ref,const QCString &file,const QCString &anchor) { m_t << "}"; - static bool pdfHyperLinks = Config_getBool("PDF_HYPERLINKS"); + static bool pdfHyperLinks = Config_getBool(PDF_HYPERLINKS); if (ref.isEmpty() && !pdfHyperLinks) { m_t << "{"; @@ -1703,7 +1703,7 @@ void LatexDocVisitor::startDotFile(const QCString &fileName, baseName=baseName.left(i); } baseName.prepend("dot_"); - QCString outDir = Config_getString("LATEX_OUTPUT"); + QCString outDir = Config_getString(LATEX_OUTPUT); QCString name = fileName; writeDotGraphFromFile(name,outDir,baseName,GOF_EPS); visitPreStart(m_t,hasCaption, baseName, width, height); @@ -1733,7 +1733,7 @@ void LatexDocVisitor::startMscFile(const QCString &fileName, } baseName.prepend("msc_"); - QCString outDir = Config_getString("LATEX_OUTPUT"); + QCString outDir = Config_getString(LATEX_OUTPUT); writeMscGraphFromFile(fileName,outDir,baseName,MSC_EPS); visitPreStart(m_t,hasCaption, baseName, width, height); } @@ -1753,7 +1753,7 @@ void LatexDocVisitor::writeMscFile(const QCString &baseName, DocVerbatim *s) { shortName=shortName.right(shortName.length()-i-1); } - QCString outDir = Config_getString("LATEX_OUTPUT"); + QCString outDir = Config_getString(LATEX_OUTPUT); writeMscGraphFromFile(baseName+".msc",outDir,shortName,MSC_EPS); visitPreStart(m_t, s->hasCaption(), shortName, s->width(),s->height()); visitCaption(this, s->children()); @@ -1779,7 +1779,7 @@ void LatexDocVisitor::startDiaFile(const QCString &fileName, } baseName.prepend("dia_"); - QCString outDir = Config_getString("LATEX_OUTPUT"); + QCString outDir = Config_getString(LATEX_OUTPUT); writeDiaGraphFromFile(fileName,outDir,baseName,DIA_EPS); visitPreStart(m_t,hasCaption, baseName, width, height); } @@ -1799,7 +1799,7 @@ void LatexDocVisitor::writeDiaFile(const QCString &baseName, DocVerbatim *s) { shortName=shortName.right(shortName.length()-i-1); } - QCString outDir = Config_getString("LATEX_OUTPUT"); + QCString outDir = Config_getString(LATEX_OUTPUT); writeDiaGraphFromFile(baseName+".dia",outDir,shortName,DIA_EPS); visitPreStart(m_t, s->hasCaption(), shortName, s->width(), s->height()); visitCaption(this, s->children()); @@ -1814,7 +1814,7 @@ void LatexDocVisitor::writePlantUMLFile(const QCString &baseName, DocVerbatim *s { shortName=shortName.right(shortName.length()-i-1); } - QCString outDir = Config_getString("LATEX_OUTPUT"); + QCString outDir = Config_getString(LATEX_OUTPUT); generatePlantUMLOutput(baseName,outDir,PUML_EPS); visitPreStart(m_t, s->hasCaption(), shortName, s->width(), s->height()); visitCaption(this, s->children()); diff --git a/src/latexgen.cpp b/src/latexgen.cpp index 9889980..28ea2cc 100644 --- a/src/latexgen.cpp +++ b/src/latexgen.cpp @@ -43,13 +43,13 @@ LatexCodeGenerator::LatexCodeGenerator(FTextStream &t,const QCString &relPath,const QCString &sourceFileName) : m_relPath(relPath), m_sourceFileName(sourceFileName), m_col(0) { - m_prettyCode=Config_getBool("LATEX_SOURCE_CODE"); + m_prettyCode=Config_getBool(LATEX_SOURCE_CODE); setTextStream(t); } LatexCodeGenerator::LatexCodeGenerator() : m_col(0), m_streamSet(FALSE) { - m_prettyCode=Config_getBool("LATEX_SOURCE_CODE"); + m_prettyCode=Config_getBool(LATEX_SOURCE_CODE); } void LatexCodeGenerator::setTextStream(FTextStream &t) @@ -76,7 +76,7 @@ void LatexCodeGenerator::codify(const char *str) char c; //char cs[5]; int spacesToNextTabStop; - static int tabSize = Config_getInt("TAB_SIZE"); + static int tabSize = Config_getInt(TAB_SIZE); const int maxLineLen = 108; QCString result(4*maxLineLen+1); // worst case for 1 line of 4-byte chars int i; @@ -161,8 +161,8 @@ void LatexCodeGenerator::writeCodeLink(const char *ref,const char *f, const char *anchor,const char *name, const char *) { - static bool pdfHyperlinks = Config_getBool("PDF_HYPERLINKS"); - static bool usePDFLatex = Config_getBool("USE_PDFLATEX"); + static bool pdfHyperlinks = Config_getBool(PDF_HYPERLINKS); + static bool usePDFLatex = Config_getBool(USE_PDFLATEX); int l = qstrlen(name); if (m_col+l>80) { @@ -188,8 +188,8 @@ void LatexCodeGenerator::writeCodeLink(const char *ref,const char *f, void LatexCodeGenerator::writeLineNumber(const char *ref,const char *fileName,const char *anchor,int l) { - static bool usePDFLatex = Config_getBool("USE_PDFLATEX"); - static bool pdfHyperlinks = Config_getBool("PDF_HYPERLINKS"); + static bool usePDFLatex = Config_getBool(USE_PDFLATEX); + static bool pdfHyperlinks = Config_getBool(PDF_HYPERLINKS); if (m_prettyCode) { QCString lineNumber; @@ -245,14 +245,14 @@ void LatexCodeGenerator::endFontClass() LatexGenerator::LatexGenerator() : OutputGenerator() { - dir=Config_getString("LATEX_OUTPUT"); + dir=Config_getString(LATEX_OUTPUT); //printf("LatexGenerator::LatexGenerator() insideTabbing=FALSE\n"); insideTabbing=FALSE; firstDescItem=TRUE; disableLinks=FALSE; m_indent=0; templateMemberItem = FALSE; - m_prettyCode=Config_getBool("LATEX_SOURCE_CODE"); + m_prettyCode=Config_getBool(LATEX_SOURCE_CODE); } LatexGenerator::~LatexGenerator() @@ -262,7 +262,7 @@ LatexGenerator::~LatexGenerator() static void writeLatexMakefile() { bool generateBib = !Doxygen::citeDict->isEmpty(); - QCString dir=Config_getString("LATEX_OUTPUT"); + QCString dir=Config_getString(LATEX_OUTPUT); QCString fileName=dir+"/Makefile"; QFile file(fileName); if (!file.open(IO_WriteOnly)) @@ -271,11 +271,11 @@ static void writeLatexMakefile() exit(1); } // inserted by KONNO Akihisa <konno@researchers.jp> 2002-03-05 - QCString latex_command = Config_getString("LATEX_CMD_NAME"); - QCString mkidx_command = Config_getString("MAKEINDEX_CMD_NAME"); + QCString latex_command = Config_getString(LATEX_CMD_NAME); + QCString mkidx_command = Config_getString(MAKEINDEX_CMD_NAME); // end insertion by KONNO Akihisa <konno@researchers.jp> 2002-03-05 FTextStream t(&file); - if (!Config_getBool("USE_PDFLATEX")) // use plain old latex + if (!Config_getBool(USE_PDFLATEX)) // use plain old latex { t << "all: refman.dvi" << endl << endl @@ -354,10 +354,10 @@ static void writeLatexMakefile() static void writeMakeBat() { #if defined(_MSC_VER) - QCString dir=Config_getString("LATEX_OUTPUT"); + QCString dir=Config_getString(LATEX_OUTPUT); QCString fileName=dir+"/make.bat"; - QCString latex_command = Config_getString("LATEX_CMD_NAME"); - QCString mkidx_command = Config_getString("MAKEINDEX_CMD_NAME"); + QCString latex_command = Config_getString(LATEX_CMD_NAME); + QCString mkidx_command = Config_getString(MAKEINDEX_CMD_NAME); QFile file(fileName); bool generateBib = !Doxygen::citeDict->isEmpty(); if (!file.open(IO_WriteOnly)) @@ -369,7 +369,7 @@ static void writeMakeBat() t << "set Dir_Old=%cd%\n"; t << "cd /D %~dp0\n\n"; t << "del /s /f *.ps *.dvi *.aux *.toc *.idx *.ind *.ilg *.log *.out *.brf *.blg *.bbl refman.pdf\n\n"; - if (!Config_getBool("USE_PDFLATEX")) // use plain old latex + if (!Config_getBool(USE_PDFLATEX)) // use plain old latex { t << latex_command << " refman.tex\n"; t << "echo ----\n"; @@ -437,7 +437,7 @@ static void writeMakeBat() void LatexGenerator::init() { - QCString dir=Config_getString("LATEX_OUTPUT"); + QCString dir=Config_getString(LATEX_OUTPUT); QDir d(dir); if (!d.exists() && !d.mkdir(dir)) { @@ -456,12 +456,12 @@ static void writeDefaultHeaderPart1(FTextStream &t) // part 1 // Handle batch mode - if (Config_getBool("LATEX_BATCHMODE")) + if (Config_getBool(LATEX_BATCHMODE)) t << "\\batchmode\n"; // Set document class depending on configuration QCString documentClass; - if (Config_getBool("COMPACT_LATEX")) + if (Config_getBool(COMPACT_LATEX)) documentClass = "article"; else documentClass = "book"; @@ -474,7 +474,7 @@ static void writeDefaultHeaderPart1(FTextStream &t) "\\usepackage{calc}\n" "\\usepackage{doxygen}\n" "\\usepackage[export]{adjustbox} % also loads graphicx\n"; - QStrList extraLatexStyle = Config_getList("LATEX_EXTRA_STYLESHEET"); + QStrList extraLatexStyle = Config_getList(LATEX_EXTRA_STYLESHEET); for (uint i=0; i<extraLatexStyle.count(); ++i) { QCString fileName(extraLatexStyle.at(i)); @@ -535,7 +535,7 @@ static void writeDefaultHeaderPart1(FTextStream &t) "\n"; // Define page & text layout - QCString paperName=Config_getEnum("PAPER_TYPE"); + QCString paperName=Config_getEnum(PAPER_TYPE); // "a4wide" package is obsolete (see bug 563698) t << "% Page & text layout\n" "\\usepackage{geometry}\n" @@ -572,11 +572,11 @@ static void writeDefaultHeaderPart1(FTextStream &t) // Headers & footers QGString genString; QCString generatedBy; - static bool timeStamp = Config_getBool("LATEX_TIMESTAMP"); + static bool timeStamp = Config_getBool(LATEX_TIMESTAMP); FTextStream tg(&genString); if (timeStamp) { - generatedBy = theTranslator->trGeneratedAt(dateToString(TRUE), Config_getString("PROJECT_NAME")); + generatedBy = theTranslator->trGeneratedAt(dateToString(TRUE), Config_getString(PROJECT_NAME)); } else { @@ -599,7 +599,7 @@ static void writeDefaultHeaderPart1(FTextStream &t) "\\fancyfoot[CO]{\\fancyplain{}{}}\n" "\\fancyfoot[RO]{\\fancyplain{}{}}\n" "\\renewcommand{\\footrulewidth}{0.4pt}\n"; - if (!Config_getBool("COMPACT_LATEX")) + if (!Config_getBool(COMPACT_LATEX)) { t << "\\renewcommand{\\chaptermark}[1]{%\n" " \\markboth{#1}{}%\n" @@ -620,7 +620,7 @@ static void writeDefaultHeaderPart1(FTextStream &t) "\n"; // User-specified packages - QStrList &extraPackages = Config_getList("EXTRA_PACKAGES"); + QStrList &extraPackages = Config_getList(EXTRA_PACKAGES); if (!extraPackages.isEmpty()) { t << "% Packages requested by user\n"; const char *pkgName=extraPackages.first(); @@ -636,7 +636,7 @@ static void writeDefaultHeaderPart1(FTextStream &t) } // Hyperlinks - bool pdfHyperlinks = Config_getBool("PDF_HYPERLINKS"); + bool pdfHyperlinks = Config_getBool(PDF_HYPERLINKS); if (pdfHyperlinks) { t << "% Hyperlinks (required, but should be loaded last)\n" @@ -676,7 +676,7 @@ static void writeDefaultHeaderPart1(FTextStream &t) // Front matter t << "% Titlepage & ToC\n"; - bool usePDFLatex = Config_getBool("USE_PDFLATEX"); + bool usePDFLatex = Config_getBool(USE_PDFLATEX); if (pdfHyperlinks && usePDFLatex) { // To avoid duplicate page anchors due to reuse of same numbers for @@ -708,12 +708,12 @@ static void writeDefaultHeaderPart3(FTextStream &t) // part 3 // Finalize project number t << " Doxygen " << versionString << "}\\\\\n"; - if (Config_getBool("LATEX_TIMESTAMP")) + if (Config_getBool(LATEX_TIMESTAMP)) t << "\\vspace*{0.5cm}\n" "{\\small " << dateToString(TRUE) << "}\\\\\n"; t << "\\end{center}\n" "\\end{titlepage}\n"; - bool compactLatex = Config_getBool("COMPACT_LATEX"); + bool compactLatex = Config_getBool(COMPACT_LATEX); if (!compactLatex) t << "\\clearemptydoublepage\n"; t << "\\pagenumbering{roman}\n"; @@ -723,8 +723,8 @@ static void writeDefaultHeaderPart3(FTextStream &t) if (!compactLatex) t << "\\clearemptydoublepage\n"; t << "\\pagenumbering{arabic}\n"; - bool pdfHyperlinks = Config_getBool("PDF_HYPERLINKS"); - bool usePDFLatex = Config_getBool("USE_PDFLATEX"); + bool pdfHyperlinks = Config_getBool(PDF_HYPERLINKS); + bool usePDFLatex = Config_getBool(USE_PDFLATEX); if (pdfHyperlinks && usePDFLatex) { // re-enable anchors again @@ -750,7 +750,7 @@ static void writeDefaultFooter(FTextStream &t) // Index t << "% Index\n"; QCString unit; - if (Config_getBool("COMPACT_LATEX")) + if (Config_getBool(COMPACT_LATEX)) { unit = "section"; } @@ -796,7 +796,7 @@ void LatexGenerator::writeStyleSheetFile(QFile &f) void LatexGenerator::startFile(const char *name,const char *,const char *) { #if 0 - setEncoding(Config_getString("LATEX_OUTPUT_ENCODING")); + setEncoding(Config_getString(LATEX_OUTPUT_ENCODING)); #endif QCString fileName=name; relPath = relativePathToRoot(fileName); @@ -825,8 +825,8 @@ void LatexGenerator::startProjectNumber() void LatexGenerator::startIndexSection(IndexSections is) { - bool &compactLatex = Config_getBool("COMPACT_LATEX"); - QCString &latexHeader = Config_getString("LATEX_HEADER"); + bool &compactLatex = Config_getBool(COMPACT_LATEX); + QCString &latexHeader = Config_getString(LATEX_HEADER); switch (is) { case isTitlePageStart: @@ -839,9 +839,9 @@ void LatexGenerator::startIndexSection(IndexSections is) { QCString header = fileToString(latexHeader); t << substituteKeywords(header,"", - convertToLaTeX(Config_getString("PROJECT_NAME")), - convertToLaTeX(Config_getString("PROJECT_NUMBER")), - convertToLaTeX(Config_getString("PROJECT_BRIEF"))); + convertToLaTeX(Config_getString(PROJECT_NAME)), + convertToLaTeX(Config_getString(PROJECT_NUMBER)), + convertToLaTeX(Config_getString(PROJECT_BRIEF))); } } break; @@ -1000,10 +1000,10 @@ void LatexGenerator::startIndexSection(IndexSections is) void LatexGenerator::endIndexSection(IndexSections is) { - //static bool compactLatex = Config_getBool("COMPACT_LATEX"); - static bool sourceBrowser = Config_getBool("SOURCE_BROWSER"); - static QCString latexHeader = Config_getString("LATEX_HEADER"); - static QCString latexFooter = Config_getString("LATEX_FOOTER"); + //static bool compactLatex = Config_getBool(COMPACT_LATEX); + static bool sourceBrowser = Config_getBool(SOURCE_BROWSER); + static QCString latexHeader = Config_getString(LATEX_HEADER); + static QCString latexFooter = Config_getString(LATEX_FOOTER); switch (is) { case isTitlePageStart: @@ -1016,10 +1016,10 @@ void LatexGenerator::endIndexSection(IndexSections is) break; case isMainPage: { - //QCString indexName=Config_getBool("GENERATE_TREEVIEW")?"main":"index"; + //QCString indexName=Config_getBool(GENERATE_TREEVIEW)?"main":"index"; QCString indexName="index"; t << "}\n\\label{index}"; - if (Config_getBool("PDF_HYPERLINKS")) t << "\\hypertarget{index}{}"; + if (Config_getBool(PDF_HYPERLINKS)) t << "\\hypertarget{index}{}"; t << "\\input{" << indexName << "}\n"; } break; @@ -1237,9 +1237,9 @@ void LatexGenerator::endIndexSection(IndexSections is) { QCString footer = fileToString(latexFooter); t << substituteKeywords(footer,"", - convertToLaTeX(Config_getString("PROJECT_NAME")), - convertToLaTeX(Config_getString("PROJECT_NUMBER")), - convertToLaTeX(Config_getString("PROJECT_BRIEF"))); + convertToLaTeX(Config_getString(PROJECT_NAME)), + convertToLaTeX(Config_getString(PROJECT_NUMBER)), + convertToLaTeX(Config_getString(PROJECT_BRIEF))); } break; } @@ -1247,7 +1247,7 @@ void LatexGenerator::endIndexSection(IndexSections is) void LatexGenerator::writePageLink(const char *name, bool /*first*/) { - //bool &compactLatex = Config_getBool("COMPACT_LATEX"); + //bool &compactLatex = Config_getBool(COMPACT_LATEX); // next is remove for bug615957 //if (compactLatex || first) t << "\\input" ; else t << "\\include"; t << "\\input" ; @@ -1312,7 +1312,7 @@ void LatexGenerator::endIndexItem(const char *ref,const char *fn) void LatexGenerator::startHtmlLink(const char *url) { - if (Config_getBool("PDF_HYPERLINKS")) + if (Config_getBool(PDF_HYPERLINKS)) { t << "\\href{"; t << url; @@ -1328,7 +1328,7 @@ void LatexGenerator::endHtmlLink() //void LatexGenerator::writeMailLink(const char *url) //{ -// if (Config_getBool("PDF_HYPERLINKS")) +// if (Config_getBool(PDF_HYPERLINKS)) // { // t << "\\href{mailto:"; // t << url; @@ -1384,7 +1384,7 @@ void LatexGenerator::endIndexValue(const char *name,bool /*hasBrief*/) void LatexGenerator::startTextLink(const char *f,const char *anchor) { - if (!disableLinks && Config_getBool("PDF_HYPERLINKS")) + if (!disableLinks && Config_getBool(PDF_HYPERLINKS)) { t << "\\hyperlink{"; if (f) t << stripPath(f); @@ -1405,7 +1405,7 @@ void LatexGenerator::endTextLink() void LatexGenerator::writeObjectLink(const char *ref, const char *f, const char *anchor, const char *text) { - static bool pdfHyperlinks = Config_getBool("PDF_HYPERLINKS"); + static bool pdfHyperlinks = Config_getBool(PDF_HYPERLINKS); if (!disableLinks && !ref && pdfHyperlinks) { t << "\\hyperlink{"; @@ -1440,13 +1440,13 @@ void LatexGenerator::endPageRef(const char *clname, const char *anchor) void LatexGenerator::startTitleHead(const char *fileName) { - static bool pdfHyperlinks = Config_getBool("PDF_HYPERLINKS"); - static bool usePDFLatex = Config_getBool("USE_PDFLATEX"); + static bool pdfHyperlinks = Config_getBool(PDF_HYPERLINKS); + static bool usePDFLatex = Config_getBool(USE_PDFLATEX); if (usePDFLatex && pdfHyperlinks && fileName) { t << "\\hypertarget{" << stripPath(fileName) << "}{}"; } - if (Config_getBool("COMPACT_LATEX")) + if (Config_getBool(COMPACT_LATEX)) { t << "\\subsection{"; } @@ -1471,7 +1471,7 @@ void LatexGenerator::endTitleHead(const char *fileName,const char *name) void LatexGenerator::startTitle() { - if (Config_getBool("COMPACT_LATEX")) + if (Config_getBool(COMPACT_LATEX)) { t << "\\subsection{"; } @@ -1483,7 +1483,7 @@ void LatexGenerator::startTitle() void LatexGenerator::startGroupHeader(int extraIndentLevel) { - if (Config_getBool("COMPACT_LATEX")) + if (Config_getBool(COMPACT_LATEX)) { extraIndentLevel++; } @@ -1515,7 +1515,7 @@ void LatexGenerator::endGroupHeader(int) void LatexGenerator::startMemberHeader(const char *) { - if (Config_getBool("COMPACT_LATEX")) + if (Config_getBool(COMPACT_LATEX)) { t << "\\subsubsection*{"; } @@ -1569,8 +1569,8 @@ void LatexGenerator::startMemberDoc(const char *clname, t << "}" << endl; } static const char *levelLab[] = { "subsubsection","paragraph","subparagraph", "subparagraph" }; - static bool compactLatex = Config_getBool("COMPACT_LATEX"); - static bool pdfHyperlinks = Config_getBool("PDF_HYPERLINKS"); + static bool compactLatex = Config_getBool(COMPACT_LATEX); + static bool pdfHyperlinks = Config_getBool(PDF_HYPERLINKS); int level=0; if (showInline) level+=2; if (compactLatex) level++; @@ -1595,7 +1595,7 @@ void LatexGenerator::endMemberDoc(bool) { disableLinks=FALSE; t << "}"; - //if (Config_getBool("COMPACT_LATEX")) t << "\\hfill"; + //if (Config_getBool(COMPACT_LATEX)) t << "\\hfill"; } void LatexGenerator::startDoxyAnchor(const char *fName,const char *, @@ -1606,8 +1606,8 @@ void LatexGenerator::startDoxyAnchor(const char *fName,const char *, void LatexGenerator::endDoxyAnchor(const char *fName,const char *anchor) { - static bool pdfHyperlinks = Config_getBool("PDF_HYPERLINKS"); - static bool usePDFLatex = Config_getBool("USE_PDFLATEX"); + static bool pdfHyperlinks = Config_getBool(PDF_HYPERLINKS); + static bool usePDFLatex = Config_getBool(USE_PDFLATEX); if (usePDFLatex && pdfHyperlinks) { t << "\\hypertarget{"; @@ -1625,8 +1625,8 @@ void LatexGenerator::writeAnchor(const char *fName,const char *name) { //printf("LatexGenerator::writeAnchor(%s,%s)\n",fName,name); t << "\\label{" << stripPath(name) << "}" << endl; - static bool pdfHyperlinks = Config_getBool("PDF_HYPERLINKS"); - static bool usePDFLatex = Config_getBool("USE_PDFLATEX"); + static bool pdfHyperlinks = Config_getBool(PDF_HYPERLINKS); + static bool usePDFLatex = Config_getBool(USE_PDFLATEX); if (usePDFLatex && pdfHyperlinks) { if (fName) @@ -1670,14 +1670,14 @@ void LatexGenerator::addIndexItem(const char *s1,const char *s2) void LatexGenerator::startSection(const char *lab,const char *,SectionInfo::SectionType type) { - static bool pdfHyperlinks = Config_getBool("PDF_HYPERLINKS"); - static bool usePDFLatex = Config_getBool("USE_PDFLATEX"); + static bool pdfHyperlinks = Config_getBool(PDF_HYPERLINKS); + static bool usePDFLatex = Config_getBool(USE_PDFLATEX); if (usePDFLatex && pdfHyperlinks) { t << "\\hypertarget{" << stripPath(lab) << "}{}"; } t << "\\"; - if (Config_getBool("COMPACT_LATEX")) + if (Config_getBool(COMPACT_LATEX)) { switch(type) { @@ -1726,7 +1726,7 @@ void LatexGenerator::writeChar(char c) void LatexGenerator::startClassDiagram() { - //if (Config_getBool("COMPACT_LATEX")) t << "\\subsubsection"; else t << "\\subsection"; + //if (Config_getBool(COMPACT_LATEX)) t << "\\subsubsection"; else t << "\\subsection"; //t << "{"; } @@ -1857,7 +1857,7 @@ void LatexGenerator::startMemberGroupHeader(bool hasHeader) if (hasHeader) t << "\\begin{Indent}"; t << "{\\bf "; // changed back to rev 756 due to bug 660501 - //if (Config_getBool("COMPACT_LATEX")) + //if (Config_getBool(COMPACT_LATEX)) //{ // t << "\\subparagraph*{"; //} @@ -1901,7 +1901,7 @@ void LatexGenerator::startDotGraph() void LatexGenerator::endDotGraph(const DotClassGraph &g) { - g.writeGraph(t,GOF_EPS,EOF_LaTeX,Config_getString("LATEX_OUTPUT"),fileName,relPath); + g.writeGraph(t,GOF_EPS,EOF_LaTeX,Config_getString(LATEX_OUTPUT),fileName,relPath); } void LatexGenerator::startInclDepGraph() @@ -1910,7 +1910,7 @@ void LatexGenerator::startInclDepGraph() void LatexGenerator::endInclDepGraph(const DotInclDepGraph &g) { - g.writeGraph(t,GOF_EPS,EOF_LaTeX,Config_getString("LATEX_OUTPUT"),fileName,relPath); + g.writeGraph(t,GOF_EPS,EOF_LaTeX,Config_getString(LATEX_OUTPUT),fileName,relPath); } void LatexGenerator::startGroupCollaboration() @@ -1919,7 +1919,7 @@ void LatexGenerator::startGroupCollaboration() void LatexGenerator::endGroupCollaboration(const DotGroupCollaboration &g) { - g.writeGraph(t,GOF_EPS,EOF_LaTeX,Config_getString("LATEX_OUTPUT"),fileName,relPath); + g.writeGraph(t,GOF_EPS,EOF_LaTeX,Config_getString(LATEX_OUTPUT),fileName,relPath); } void LatexGenerator::startCallGraph() @@ -1928,7 +1928,7 @@ void LatexGenerator::startCallGraph() void LatexGenerator::endCallGraph(const DotCallGraph &g) { - g.writeGraph(t,GOF_EPS,EOF_LaTeX,Config_getString("LATEX_OUTPUT"),fileName,relPath); + g.writeGraph(t,GOF_EPS,EOF_LaTeX,Config_getString(LATEX_OUTPUT),fileName,relPath); } void LatexGenerator::startDirDepGraph() @@ -1937,7 +1937,7 @@ void LatexGenerator::startDirDepGraph() void LatexGenerator::endDirDepGraph(const DotDirDeps &g) { - g.writeGraph(t,GOF_EPS,EOF_LaTeX,Config_getString("LATEX_OUTPUT"),fileName,relPath); + g.writeGraph(t,GOF_EPS,EOF_LaTeX,Config_getString(LATEX_OUTPUT),fileName,relPath); } void LatexGenerator::startDescription() @@ -2110,7 +2110,7 @@ void LatexGenerator::endCodeFragment() void LatexGenerator::startInlineHeader() { - if (Config_getBool("COMPACT_LATEX")) + if (Config_getBool(COMPACT_LATEX)) { t << "\\paragraph*{"; } diff --git a/src/layout.cpp b/src/layout.cpp index 2835e77..fdc9f4c 100644 --- a/src/layout.cpp +++ b/src/layout.cpp @@ -57,10 +57,10 @@ static bool elemIsVisible(const QXmlAttributes &attrib,bool defVal=TRUE) if (visible.at(0)=='$' && visible.length()>1) { QCString id = visible.mid(1); - ConfigOption *opt = Config::instance()->get(id); - if (opt && opt->kind()==ConfigOption::O_Bool) + const ConfigValues::Info *opt = ConfigValues::instance().get(id); + if (opt && opt->type==ConfigValues::Info::Bool) { - return *((ConfigBool *)opt)->valueRef(); + return ConfigValues::instance().*((ConfigValues::InfoBool*)opt)->item; } else if (!opt) { @@ -120,7 +120,7 @@ QCString LayoutNavEntry::url() const } if (!found) { - msg("explicit link request to '%s' in layout file '%s' could not be resolved\n",qPrint(url.mid(5)),qPrint(Config_getString("LAYOUT_FILE"))); + msg("explicit link request to '%s' in layout file '%s' could not be resolved\n",qPrint(url.mid(5)),qPrint(Config_getString(LAYOUT_FILE))); } } //printf("LayoutNavEntry::url()=%s\n",url.data()); @@ -262,9 +262,9 @@ class LayoutParser : public QXmlDefaultHandler m_part = -1; // invalid m_rootNav = 0; - //bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); - //bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); - //bool javaOpt = Config_getBool("OPTIMIZE_OUTPUT_JAVA"); + //bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); + //bool vhdlOpt = Config_getBool(OPTIMIZE_OUTPUT_VHDL); + //bool javaOpt = Config_getBool(OPTIMIZE_OUTPUT_JAVA); // start & end handlers m_sHandler.insert("doxygenlayout", @@ -887,19 +887,19 @@ class LayoutParser : public QXmlDefaultHandler { // no MainPage node... add one as the first item of the root node... new LayoutNavEntry(m_rootNav,LayoutNavEntry::MainPage, TRUE, - /*Config_getBool("GENERATE_TREEVIEW") ? "main" :*/ "index", + /*Config_getBool(GENERATE_TREEVIEW) ? "main" :*/ "index", theTranslator->trMainPage(),"",TRUE); } } void startNavEntry(const QXmlAttributes &attrib) { - static bool javaOpt = Config_getBool("OPTIMIZE_OUTPUT_JAVA"); - static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); - static bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); - static bool hasGraphicalHierarchy = Config_getBool("HAVE_DOT") && - Config_getBool("GRAPHICAL_HIERARCHY"); - static bool extractAll = Config_getBool("EXTRACT_ALL"); + static bool javaOpt = Config_getBool(OPTIMIZE_OUTPUT_JAVA); + static bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); + static bool vhdlOpt = Config_getBool(OPTIMIZE_OUTPUT_VHDL); + static bool hasGraphicalHierarchy = Config_getBool(HAVE_DOT) && + Config_getBool(GRAPHICAL_HIERARCHY); + static bool extractAll = Config_getBool(EXTRACT_ALL); static struct NavEntryMap { const char *typeStr; // type attribute name in the XML file diff --git a/src/mandocvisitor.cpp b/src/mandocvisitor.cpp index 0cc3959..8acffc7 100644 --- a/src/mandocvisitor.cpp +++ b/src/mandocvisitor.cpp @@ -818,7 +818,7 @@ void ManDocVisitor::visitPost(DocSecRefList *) //void ManDocVisitor::visitPre(DocLanguage *l) //{ -// QString langId = Config_getEnum("OUTPUT_LANGUAGE"); +// QString langId = Config_getEnum(OUTPUT_LANGUAGE); // if (l->id().lower()!=langId.lower()) // { // pushEnabled(); @@ -828,7 +828,7 @@ void ManDocVisitor::visitPost(DocSecRefList *) // //void ManDocVisitor::visitPost(DocLanguage *l) //{ -// QString langId = Config_getEnum("OUTPUT_LANGUAGE"); +// QString langId = Config_getEnum(OUTPUT_LANGUAGE); // if (l->id().lower()!=langId.lower()) // { // popEnabled(); diff --git a/src/mangen.cpp b/src/mangen.cpp index a88ac26..88d2ce5 100644 --- a/src/mangen.cpp +++ b/src/mangen.cpp @@ -38,7 +38,7 @@ static QCString getExtension() * in case of . missing, just ignore it * in case number missing, just place a 3 in front of it */ - QCString ext = Config_getString("MAN_EXTENSION"); + QCString ext = Config_getString(MAN_EXTENSION); if (ext.isEmpty()) { ext = "3"; @@ -66,7 +66,7 @@ static QCString getExtension() static QCString getSubdir() { - QCString dir = Config_getString("MAN_SUBDIR"); + QCString dir = Config_getString(MAN_SUBDIR); if (dir.isEmpty()) { dir = "man" + getExtension(); @@ -76,7 +76,7 @@ static QCString getSubdir() ManGenerator::ManGenerator() : OutputGenerator() { - dir=Config_getString("MAN_OUTPUT") + "/" + getSubdir(); + dir=Config_getString(MAN_OUTPUT) + "/" + getSubdir(); firstCol=TRUE; paragraph=TRUE; col=0; @@ -107,7 +107,7 @@ ManGenerator::~ManGenerator() void ManGenerator::init() { - QCString &manOutput = Config_getString("MAN_OUTPUT"); + QCString &manOutput = Config_getString(MAN_OUTPUT); QDir d(manOutput); if (!d.exists() && !d.mkdir(manOutput)) @@ -181,12 +181,12 @@ void ManGenerator::endTitleHead(const char *,const char *name) { t << ".TH \"" << name << "\" " << getExtension() << " \"" << dateToString(FALSE) << "\" \""; - if (!Config_getString("PROJECT_NUMBER").isEmpty()) - t << "Version " << Config_getString("PROJECT_NUMBER") << "\" \""; - if (Config_getString("PROJECT_NAME").isEmpty()) + if (!Config_getString(PROJECT_NUMBER).isEmpty()) + t << "Version " << Config_getString(PROJECT_NUMBER) << "\" \""; + if (Config_getString(PROJECT_NAME).isEmpty()) t << "Doxygen"; else - t << Config_getString("PROJECT_NAME"); + t << Config_getString(PROJECT_NAME); t << "\" \\\" -*- nroff -*-" << endl; t << ".ad l" << endl; t << ".nh" << endl; @@ -335,7 +335,7 @@ void ManGenerator::codify(const char *str) { case '.': t << "\\&."; break; // see bug652277 case '\t': spacesToNextTabStop = - Config_getInt("TAB_SIZE") - (col%Config_getInt("TAB_SIZE")); + Config_getInt(TAB_SIZE) - (col%Config_getInt(TAB_SIZE)); t << Doxygen::spaces.left(spacesToNextTabStop); col+=spacesToNextTabStop; break; @@ -431,7 +431,7 @@ void ManGenerator::startDoxyAnchor(const char *,const char *manName, const char *) { // something to be done? - if( !Config_getBool("MAN_LINKS") ) + if( !Config_getBool(MAN_LINKS) ) { return; // no } diff --git a/src/markdown.cpp b/src/markdown.cpp index 6ff8344..1723d1f 100644 --- a/src/markdown.cpp +++ b/src/markdown.cpp @@ -1836,7 +1836,7 @@ static int writeCodeBlock(GrowBuf &out,const char *data,int size,int refIndent) int indent=0; while (j<end && data[j]==' ') j++,indent++; //printf("j=%d end=%d indent=%d refIndent=%d tabSize=%d data={%s}\n", - // j,end,indent,refIndent,Config_getInt("TAB_SIZE"),QCString(data+i).left(end-i-1).data()); + // j,end,indent,refIndent,Config_getInt(TAB_SIZE),QCString(data+i).left(end-i-1).data()); if (j==end-1) // empty line { emptyLines++; @@ -2240,7 +2240,7 @@ static QCString extractPageTitle(QCString &docs,QCString &id) static QCString detab(const QCString &s,int &refIndent) { - static int tabSize = Config_getInt("TAB_SIZE"); + static int tabSize = Config_getInt(TAB_SIZE); GrowBuf out; int size = s.length(); const char *data = s.data(); @@ -2366,7 +2366,7 @@ void MarkdownFileParser::parseInput(const char *fileName, QCString title=extractPageTitle(docs,id).stripWhiteSpace(); QCString titleFn = QFileInfo(fileName).baseName().utf8(); QCString fn = QFileInfo(fileName).fileName().utf8(); - static QCString mdfileAsMainPage = Config_getString("USE_MDFILE_AS_MAINPAGE"); + static QCString mdfileAsMainPage = Config_getString(USE_MDFILE_AS_MAINPAGE); if (id.isEmpty()) id = markdownFileNameToId(fileName); if (!mdfileAsMainPage.isEmpty() && (fn==mdfileAsMainPage || // name reference diff --git a/src/memberdef.cpp b/src/memberdef.cpp index af4a690..5aa8154 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -658,7 +658,7 @@ void MemberDefImpl::init(Definition *def, explExt=FALSE; tspec=FALSE; cachedAnonymousType=0; - maxInitLines=Config_getInt("MAX_INITIALIZER_LINES"); + maxInitLines=Config_getInt(MAX_INITIALIZER_LINES); userInitLines=-1; docEnumValues=FALSE; // copy function template arguments (if any) @@ -940,8 +940,8 @@ bool MemberDef::hasExamples() QCString MemberDef::getOutputFileBase() const { - static bool separateMemberPages = Config_getBool("SEPARATE_MEMBER_PAGES"); - static bool inlineSimpleClasses = Config_getBool("INLINE_SIMPLE_STRUCTS"); + static bool separateMemberPages = Config_getBool(SEPARATE_MEMBER_PAGES); + static bool inlineSimpleClasses = Config_getBool(INLINE_SIMPLE_STRUCTS); QCString baseName; //printf("Member: %s: templateMaster=%p group=%p classDef=%p nspace=%p fileDef=%p\n", @@ -1053,7 +1053,7 @@ QCString MemberDef::anchor() const void MemberDef::_computeLinkableInProject() { - static bool extractStatic = Config_getBool("EXTRACT_STATIC"); + static bool extractStatic = Config_getBool(EXTRACT_STATIC); m_isLinkableCached = 2; // linkable //printf("MemberDef::isLinkableInProject(name=%s)\n",name().data()); if (isHidden()) @@ -1184,7 +1184,7 @@ void MemberDef::writeLink(OutputList &ol,ClassDef *,NamespaceDef *, FileDef *fd,GroupDef *gd,bool onlyText) { SrcLangExt lang = getLanguage(); - static bool hideScopeNames = Config_getBool("HIDE_SCOPE_NAMES"); + static bool hideScopeNames = Config_getBool(HIDE_SCOPE_NAMES); QCString sep = getLanguageSpecificSeparator(lang,TRUE); QCString n = name(); if (!hideScopeNames) @@ -1288,11 +1288,11 @@ ClassDef *MemberDef::getClassDefOfAnonymousType() */ bool MemberDef::isBriefSectionVisible() const { - static bool extractStatic = Config_getBool("EXTRACT_STATIC"); - static bool hideUndocMembers = Config_getBool("HIDE_UNDOC_MEMBERS"); - static bool briefMemberDesc = Config_getBool("BRIEF_MEMBER_DESC"); - static bool repeatBrief = Config_getBool("REPEAT_BRIEF"); - static bool hideFriendCompounds = Config_getBool("HIDE_FRIEND_COMPOUNDS"); + static bool extractStatic = Config_getBool(EXTRACT_STATIC); + static bool hideUndocMembers = Config_getBool(HIDE_UNDOC_MEMBERS); + static bool briefMemberDesc = Config_getBool(BRIEF_MEMBER_DESC); + static bool repeatBrief = Config_getBool(REPEAT_BRIEF); + static bool hideFriendCompounds = Config_getBool(HIDE_FRIEND_COMPOUNDS); //printf("Member %s grpId=%d docs=%s file=%s args=%s\n", // name().data(), @@ -1347,7 +1347,7 @@ bool MemberDef::isBriefSectionVisible() const // hide member if it overrides a member in a superclass and has no // documentation of its own //bool visibleIfDocVirtual = !reimplements() || - // !Config_getBool("INHERIT_DOCS") || + // !Config_getBool(INHERIT_DOCS) || // hasDocs; // true if this member is a constructor or destructor @@ -1602,11 +1602,13 @@ void MemberDef::writeDeclaration(OutputList &ol, // *** write name if (!name().isEmpty() && name().at(0)!='@') // hide anonymous stuff { - //printf("Member name=`%s gd=%p md->groupDef=%p inGroup=%d isLinkable()=%d\n",name().data(),gd,getGroupDef(),inGroup,isLinkable()); + static bool extractPrivate = Config_getBool(EXTRACT_PRIVATE); + static bool extractStatic = Config_getBool(EXTRACT_STATIC); + //printf("Member name=`%s gd=%p md->groupDef=%p inGroup=%d isLinkable()=%d hasDocumentation=%d\n",name().data(),gd,getGroupDef(),inGroup,isLinkable(),hasDocumentation()); if (!(name().isEmpty() || name().at(0)=='@') && // name valid (hasDocumentation() || isReference()) && // has docs - !(m_impl->prot==Private && !Config_getBool("EXTRACT_PRIVATE") && m_impl->mtype!=MemberType_Friend) && // hidden due to protection - !(isStatic() && m_impl->classDef==0 && !Config_getBool("EXTRACT_STATIC")) // hidden due to static-ness + !(m_impl->prot==Private && !extractPrivate && m_impl->mtype!=MemberType_Friend) && // hidden due to protection + !(isStatic() && m_impl->classDef==0 && !extractStatic) // hidden due to static-ness ) { if (m_impl->annMemb) @@ -1657,7 +1659,7 @@ void MemberDef::writeDeclaration(OutputList &ol, } else // index member { - //static bool separateMemPages = Config_getBool("SEPARATE_MEMBER_PAGES"); + //static bool separateMemPages = Config_getBool(SEPARATE_MEMBER_PAGES); //QCString cfname = getOutputFileBase(); //QCString cfiname = d->getOutputFileBase(); //Doxygen::indexList->addIndexItem( @@ -1732,7 +1734,7 @@ void MemberDef::writeDeclaration(OutputList &ol, ol.endTypewriter(); } - bool extractPrivate = Config_getBool("EXTRACT_PRIVATE"); + bool extractPrivate = Config_getBool(EXTRACT_PRIVATE); if (isProperty() && (isSettable() || isGettable() || isPrivateSettable() || isPrivateGettable() || @@ -1798,7 +1800,7 @@ void MemberDef::writeDeclaration(OutputList &ol, // write brief description if (!briefDescription().isEmpty() && - Config_getBool("BRIEF_MEMBER_DESC") + Config_getBool(BRIEF_MEMBER_DESC) /* && !annMemb */ ) { @@ -1812,12 +1814,13 @@ void MemberDef::writeDeclaration(OutputList &ol, ol.writeDoc(rootNode,getOuterScope()?getOuterScope():d,this); if (detailsVisible) { - static bool separateMemberPages = Config_getBool("SEPARATE_MEMBER_PAGES"); + static bool separateMemberPages = Config_getBool(SEPARATE_MEMBER_PAGES); ol.pushGeneratorState(); ol.disableAllBut(OutputGenerator::Html); //ol.endEmphasis(); ol.docify(" "); - if (separateMemberPages || + if (inheritedFrom || + separateMemberPages || (m_impl->group!=0 && gd==0) || (m_impl->nspace!=0 && nd==0) ) // forward link to the page or group or namespace @@ -1851,12 +1854,12 @@ void MemberDef::writeDeclaration(OutputList &ol, bool MemberDef::isDetailedSectionLinkable() const { - static bool extractAll = Config_getBool("EXTRACT_ALL"); - static bool alwaysDetailedSec = Config_getBool("ALWAYS_DETAILED_SEC"); - static bool repeatBrief = Config_getBool("REPEAT_BRIEF"); - static bool briefMemberDesc = Config_getBool("BRIEF_MEMBER_DESC"); - static bool hideUndocMembers = Config_getBool("HIDE_UNDOC_MEMBERS"); - static bool extractStatic = Config_getBool("EXTRACT_STATIC"); + static bool extractAll = Config_getBool(EXTRACT_ALL); + static bool alwaysDetailedSec = Config_getBool(ALWAYS_DETAILED_SEC); + static bool repeatBrief = Config_getBool(REPEAT_BRIEF); + static bool briefMemberDesc = Config_getBool(BRIEF_MEMBER_DESC); + static bool hideUndocMembers = Config_getBool(HIDE_UNDOC_MEMBERS); + static bool extractStatic = Config_getBool(EXTRACT_STATIC); // the member has details documentation for any of the following reasons bool docFilter = @@ -1903,7 +1906,7 @@ bool MemberDef::isDetailedSectionLinkable() const // hide friend (class|struct|union) member if HIDE_FRIEND_COMPOUNDS // is true - bool friendCompoundFilter = !(Config_getBool("HIDE_FRIEND_COMPOUNDS") && + bool friendCompoundFilter = !(Config_getBool(HIDE_FRIEND_COMPOUNDS) && isFriend() && (m_impl->type=="friend class" || m_impl->type=="friend struct" || @@ -1919,9 +1922,9 @@ bool MemberDef::isDetailedSectionLinkable() const bool MemberDef::isDetailedSectionVisible(bool inGroup,bool inFile) const { - static bool separateMemPages = Config_getBool("SEPARATE_MEMBER_PAGES"); - static bool inlineSimpleStructs = Config_getBool("INLINE_SIMPLE_STRUCTS"); - static bool hideUndocMembers = Config_getBool("HIDE_UNDOC_MEMBERS"); + static bool separateMemPages = Config_getBool(SEPARATE_MEMBER_PAGES); + static bool inlineSimpleStructs = Config_getBool(INLINE_SIMPLE_STRUCTS); + static bool hideUndocMembers = Config_getBool(HIDE_UNDOC_MEMBERS); bool groupFilter = getGroupDef()==0 || inGroup || separateMemPages; bool fileFilter = getNamespaceDef()==0 || !getNamespaceDef()->isLinkable() || !inFile; bool simpleFilter = (hasBriefDescription() || !hideUndocMembers) && inlineSimpleStructs && @@ -1937,7 +1940,7 @@ bool MemberDef::isDetailedSectionVisible(bool inGroup,bool inFile) const void MemberDef::getLabels(QStrList &sl,Definition *container) const { - static bool inlineInfo = Config_getBool("INLINE_INFO"); + static bool inlineInfo = Config_getBool(INLINE_INFO); Specifier lvirt=virtualness(); if ((!isObjCMethod() || isOptional() || isRequired()) && @@ -1957,7 +1960,7 @@ void MemberDef::getLabels(QStrList &sl,Definition *container) const //ol.docify(" ["); SrcLangExt lang = getLanguage(); bool optVhdl = lang==SrcLangExt_VHDL; - bool extractPrivate = Config_getBool("EXTRACT_PRIVATE"); + bool extractPrivate = Config_getBool(EXTRACT_PRIVATE); if (optVhdl) { sl.append(VhdlDocGen::trTypeString(getMemberSpecifiers())); @@ -1968,7 +1971,7 @@ void MemberDef::getLabels(QStrList &sl,Definition *container) const else if (isRelated()) sl.append("related"); else { - if (Config_getBool("INLINE_INFO") && isInline()) sl.append("inline"); + if (Config_getBool(INLINE_INFO) && isInline()) sl.append("inline"); if (isExplicit()) sl.append("explicit"); if (isMutable()) sl.append("mutable"); if (isStatic()) sl.append("static"); @@ -2056,7 +2059,7 @@ void MemberDef::_writeCallGraph(OutputList &ol) { // write call graph if (m_impl->hasCallGraph - && (isFunction() || isSlot() || isSignal()) && Config_getBool("HAVE_DOT") + && (isFunction() || isSlot() || isSignal()) && Config_getBool(HAVE_DOT) ) { DotCallGraph callGraph(this,FALSE); @@ -2081,7 +2084,7 @@ void MemberDef::_writeCallGraph(OutputList &ol) void MemberDef::_writeCallerGraph(OutputList &ol) { if (m_impl->hasCallerGraph - && (isFunction() || isSlot() || isSignal()) && Config_getBool("HAVE_DOT") + && (isFunction() || isSlot() || isSignal()) && Config_getBool(HAVE_DOT) ) { DotCallGraph callerGraph(this, TRUE); @@ -2144,7 +2147,7 @@ void MemberDef::_writeReimplements(OutputList &ol) { ol.writeObjectLink(bcd->getReference(),bcd->getOutputFileBase(), 0,bcd->displayName()); - if (bcd->isLinkableInProject()/* && !Config_getBool("PDF_HYPERLINKS")*/ ) + if (bcd->isLinkableInProject()/* && !Config_getBool(PDF_HYPERLINKS)*/ ) { writePageRef(ol,bcd->getOutputFileBase(),bcd->anchor()); } @@ -2483,7 +2486,7 @@ void MemberDef::_writeGroupInclude(OutputList &ol,bool inGroup) { // only write out the include file if this is not part of a class or file // definition - static bool showGroupedMembInc = Config_getBool("SHOW_GROUPED_MEMB_INC"); + static bool showGroupedMembInc = Config_getBool(SHOW_GROUPED_MEMB_INC); FileDef *fd = getFileDef(); QCString nm; if (fd) nm = getFileDef()->docName(); @@ -2664,7 +2667,7 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol, ClassDef *cd=getClassDef(); NamespaceDef *nd=getNamespaceDef(); - if (!Config_getBool("HIDE_SCOPE_NAMES")) + if (!Config_getBool(HIDE_SCOPE_NAMES)) { bool first=TRUE; SrcLangExt lang = getLanguage(); @@ -2892,8 +2895,8 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol, /* write brief description */ if (!brief.isEmpty() && - (Config_getBool("REPEAT_BRIEF") || - !Config_getBool("BRIEF_MEMBER_DESC") + (Config_getBool(REPEAT_BRIEF) || + !Config_getBool(BRIEF_MEMBER_DESC) ) ) { @@ -2926,8 +2929,8 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol, inbodyDocumentation()+"\n",TRUE,FALSE); } } - else if (!brief.isEmpty() && (Config_getBool("REPEAT_BRIEF") || - !Config_getBool("BRIEF_MEMBER_DESC"))) + else if (!brief.isEmpty() && (Config_getBool(REPEAT_BRIEF) || + !Config_getBool(BRIEF_MEMBER_DESC))) { if (!inbodyDocumentation().isEmpty()) { @@ -2992,14 +2995,14 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol, ol.endIndent(); // enable LaTeX again - //if (Config_getBool("EXTRACT_ALL") && !hasDocs) ol.enable(OutputGenerator::Latex); + //if (Config_getBool(EXTRACT_ALL) && !hasDocs) ol.enable(OutputGenerator::Latex); ol.popGeneratorState(); //------------------------------------------------ - if (!Config_getBool("EXTRACT_ALL") && - Config_getBool("WARN_IF_UNDOCUMENTED") && - Config_getBool("WARN_NO_PARAMDOC") && + if (!Config_getBool(EXTRACT_ALL) && + Config_getBool(WARN_IF_UNDOCUMENTED) && + Config_getBool(WARN_NO_PARAMDOC) && !Doxygen::suppressDocWarnings) { if (!hasDocumentedParams()) @@ -3230,7 +3233,7 @@ void MemberDef::warnIfUndocumented() t="group", d=gd; else t="file", d=fd; - static bool extractAll = Config_getBool("EXTRACT_ALL"); + static bool extractAll = Config_getBool(EXTRACT_ALL); //printf("%s:warnIfUndoc: hasUserDocs=%d isFriendClass=%d protection=%d isRef=%d isDel=%d\n", // name().data(), @@ -3480,10 +3483,10 @@ void MemberDef::setInitializer(const char *initializer) void MemberDef::addListReference(Definition *) { - static bool optimizeOutputForC = Config_getBool("OPTIMIZE_OUTPUT_FOR_C"); - //static bool hideScopeNames = Config_getBool("HIDE_SCOPE_NAMES"); - //static bool optimizeOutputJava = Config_getBool("OPTIMIZE_OUTPUT_JAVA"); - //static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); + static bool optimizeOutputForC = Config_getBool(OPTIMIZE_OUTPUT_FOR_C); + //static bool hideScopeNames = Config_getBool(HIDE_SCOPE_NAMES); + //static bool optimizeOutputJava = Config_getBool(OPTIMIZE_OUTPUT_JAVA); + //static bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); SrcLangExt lang = getLanguage(); visited=TRUE; if (!isLinkableInProject()) return; @@ -3799,7 +3802,7 @@ void MemberDef::writeEnumDeclaration(OutputList &typeDecl, typeDecl.writeChar(' '); } - uint enumValuesPerLine = (uint)Config_getInt("ENUM_VALUES_PER_LINE"); + uint enumValuesPerLine = (uint)Config_getInt(ENUM_VALUES_PER_LINE); if (numVisibleEnumValues>0 && enumValuesPerLine>0) { typeDecl.docify("{ "); @@ -3936,9 +3939,9 @@ void MemberDef::enableCallerGraph(bool e) bool MemberDef::protectionVisible() const { return m_impl->prot==Public || - (m_impl->prot==Private && Config_getBool("EXTRACT_PRIVATE")) || - (m_impl->prot==Protected && Config_getBool("EXTRACT_PROTECTED")) || - (m_impl->prot==Package && Config_getBool("EXTRACT_PACKAGE")); + (m_impl->prot==Private && Config_getBool(EXTRACT_PRIVATE)) || + (m_impl->prot==Protected && Config_getBool(EXTRACT_PROTECTED)) || + (m_impl->prot==Package && Config_getBool(EXTRACT_PACKAGE)); } #endif @@ -5101,7 +5104,7 @@ const ArgumentList *MemberDef::typeConstraints() const bool MemberDef::isFriendToHide() const { - static bool hideFriendCompounds = Config_getBool("HIDE_FRIEND_COMPOUNDS"); + static bool hideFriendCompounds = Config_getBool(HIDE_FRIEND_COMPOUNDS); bool isFriendToHide = hideFriendCompounds && (m_impl->type=="friend class" || m_impl->type=="friend struct" || diff --git a/src/memberlist.cpp b/src/memberlist.cpp index f58ade4..1b81108 100644 --- a/src/memberlist.cpp +++ b/src/memberlist.cpp @@ -76,7 +76,7 @@ MemberList::~MemberList() int MemberList::compareValues(const MemberDef *c1, const MemberDef *c2) const { - static bool sortConstructorsFirst = Config_getBool("SORT_MEMBERS_CTORS_1ST"); + static bool sortConstructorsFirst = Config_getBool(SORT_MEMBERS_CTORS_1ST); if (sortConstructorsFirst) { int ord1 = c1->isConstructor() ? 2 : (c1->isDestructor() ? 1 : 0); int ord2 = c2->isConstructor() ? 2 : (c2->isDestructor() ? 1 : 0); @@ -169,7 +169,7 @@ void MemberList::countDecMembers(bool countEnumValues,GroupDef *gd) break; case MemberType_Typedef: m_typeCnt++,m_numDecMembers++; break; //case MemberType_Prototype: m_protoCnt++,m_numDecMembers++; break; - case MemberType_Define: if (Config_getBool("EXTRACT_ALL") || + case MemberType_Define: if (Config_getBool(EXTRACT_ALL) || md->argsString() || !md->initializer().isEmpty() || md->hasDocumentation() @@ -324,7 +324,7 @@ void MemberList::writePlainDeclarations(OutputList &ol, ) { //printf("----- writePlainDeclaration() ----\n"); - static bool hideUndocMembers = Config_getBool("HIDE_UNDOC_MEMBERS"); + static bool hideUndocMembers = Config_getBool(HIDE_UNDOC_MEMBERS); countDecMembers(); if (numDecMembers()==0) { @@ -410,7 +410,7 @@ void MemberList::writePlainDeclarations(OutputList &ol, { ol.endDoxyAnchor(md->getOutputFileBase(),md->anchor()); } - if (!md->briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC")) + if (!md->briefDescription().isEmpty() && Config_getBool(BRIEF_MEMBER_DESC)) { DocRoot *rootNode = validatingParseDoc( md->briefFile(),md->briefLine(), @@ -524,7 +524,7 @@ void MemberList::writeDeclarations(OutputList &ol, (void)showEnumValues; // unused //printf("----- writeDeclaration() this=%p ---- inheritedFrom=%p\n",this,inheritedFrom); - static bool optimizeVhdl = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); + static bool optimizeVhdl = Config_getBool(OPTIMIZE_OUTPUT_VHDL); QCString inheritId; countDecMembers(/*showEnumValues*/FALSE,gd); // count members shown in this section @@ -715,7 +715,7 @@ void MemberList::writeSimpleDocumentation(OutputList &ol, void MemberList::writeDocumentationPage(OutputList &ol, const char *scopeName, Definition *container) { - static bool generateTreeView = Config_getBool("GENERATE_TREEVIEW"); + static bool generateTreeView = Config_getBool(GENERATE_TREEVIEW); MemberListIterator mli(*this); MemberDef *md; for ( ; (md=mli.current()) ; ++mli) diff --git a/src/message.cpp b/src/message.cpp index c61de68..2f3a06f 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -37,9 +37,9 @@ static FILE *warnFile = stderr; void initWarningFormat() { -// int filePos = Config_getString("WARN_FORMAT").find("$file"); -// int linePos = Config_getString("WARN_FORMAT").find("$line"); -// int textPos = Config_getString("WARN_FORMAT").find("$text"); +// int filePos = Config_getString(WARN_FORMAT).find("$file"); +// int linePos = Config_getString(WARN_FORMAT).find("$line"); +// int textPos = Config_getString(WARN_FORMAT).find("$text"); // // // sort items on position (there are 6 cases) // warnFormatOrder = 1; @@ -73,7 +73,7 @@ void initWarningFormat() // substitute( // substitute( // substitute( -// Config_getString("WARN_FORMAT"), +// Config_getString(WARN_FORMAT), // "$file","%s" // ), // "$text","%s" @@ -86,18 +86,18 @@ void initWarningFormat() // replace(QRegExp("\\$line"),"%d")+ // '\n'; - outputFormat = Config_getString("WARN_FORMAT"); + outputFormat = Config_getString(WARN_FORMAT); - if (!Config_getString("WARN_LOGFILE").isEmpty()) + if (!Config_getString(WARN_LOGFILE).isEmpty()) { - warnFile = portable_fopen(Config_getString("WARN_LOGFILE"),"w"); + warnFile = portable_fopen(Config_getString(WARN_LOGFILE),"w"); } if (!warnFile) // point it to something valid, because warn() relies on it { warnFile = stderr; } - if (Config_getBool("WARN_AS_ERROR")) + if (Config_getBool(WARN_AS_ERROR)) { warning_str = error_str; } @@ -106,7 +106,7 @@ void initWarningFormat() void msg(const char *fmt, ...) { - if (!Config_getBool("QUIET")) + if (!Config_getBool(QUIET)) { if (Debug::isFlagSet(Debug::Time)) { @@ -135,7 +135,7 @@ static void format_warn(const char *file,int line,const char *text) } } // substitute markers by actual values - bool warnAsError = Config_getBool("WARN_AS_ERROR"); + bool warnAsError = Config_getBool(WARN_AS_ERROR); QCString msgText = substitute( substitute( @@ -164,9 +164,9 @@ static void format_warn(const char *file,int line,const char *text) } } -static void do_warn(const char *tag, const char *file, int line, const char *prefix, const char *fmt, va_list args) +static void do_warn(bool enabled, const char *file, int line, const char *prefix, const char *fmt, va_list args) { - if (tag && !Config_getBool(tag)) return; // warning type disabled + if (!enabled) return; // warning type disabled const int bufSize = 40960; char text[bufSize]; int l=0; @@ -184,18 +184,18 @@ void warn(const char *file,int line,const char *fmt, ...) { va_list args; va_start(args, fmt); - do_warn("WARNINGS", file, line, warning_str, fmt, args); + do_warn(Config_getBool(WARNINGS), file, line, warning_str, fmt, args); va_end(args); } void va_warn(const char *file,int line,const char *fmt,va_list args) { - do_warn("WARNINGS", file, line, warning_str, fmt, args); + do_warn(Config_getBool(WARNINGS), file, line, warning_str, fmt, args); } void warn_simple(const char *file,int line,const char *text) { - if (!Config_getBool("WARNINGS")) return; // warning type disabled + if (!Config_getBool(WARNINGS)) return; // warning type disabled format_warn(file,line,QCString(warning_str) + text); } @@ -203,7 +203,7 @@ void warn_undoc(const char *file,int line,const char *fmt, ...) { va_list args; va_start(args, fmt); - do_warn("WARN_IF_UNDOCUMENTED", file, line, warning_str, fmt, args); + do_warn(Config_getBool(WARN_IF_UNDOCUMENTED), file, line, warning_str, fmt, args); va_end(args); } @@ -211,7 +211,7 @@ void warn_doc_error(const char *file,int line,const char *fmt, ...) { va_list args; va_start(args, fmt); - do_warn("WARN_IF_DOC_ERROR", file, line, warning_str, fmt, args); + do_warn(Config_getBool(WARN_IF_DOC_ERROR), file, line, warning_str, fmt, args); va_end(args); } @@ -235,7 +235,7 @@ extern void err_full(const char *file,int line,const char *fmt, ...) { va_list args; va_start(args, fmt); - do_warn(NULL, file, line, error_str, fmt, args); + do_warn(TRUE, file, line, error_str, fmt, args); va_end(args); } diff --git a/src/msc.cpp b/src/msc.cpp index 7f3c641..b093403 100644 --- a/src/msc.cpp +++ b/src/msc.cpp @@ -101,7 +101,7 @@ void writeMscGraphFromFile(const char *inFile,const char *outDir, // go to the html output directory (i.e. path) QDir::setCurrent(outDir); //printf("Going to dir %s\n",QDir::currentDirPath().data()); - QCString mscExe = Config_getString("MSCGEN_PATH")+"mscgen"+portable_commandExtension(); + QCString mscExe = Config_getString(MSCGEN_PATH)+"mscgen"+portable_commandExtension(); QCString mscArgs; QCString extension; switch (format) @@ -136,7 +136,7 @@ void writeMscGraphFromFile(const char *inFile,const char *outDir, goto error; } portable_sysTimerStop(); - if ( (format==MSC_EPS) && (Config_getBool("USE_PDFLATEX")) ) + if ( (format==MSC_EPS) && (Config_getBool(USE_PDFLATEX)) ) { QCString epstopdfArgs(maxCmdLine); epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"", @@ -166,7 +166,7 @@ QCString getMscImageMapFromFile(const QCString& inFile, const QCString& outDir, QDir::setCurrent(outDir); //printf("Going to dir %s\n",QDir::currentDirPath().data()); - QCString mscExe = Config_getString("MSCGEN_PATH")+"mscgen"+portable_commandExtension(); + QCString mscExe = Config_getString(MSCGEN_PATH)+"mscgen"+portable_commandExtension(); QCString mscArgs = "-T ismap -i \""; mscArgs+=inFile; mscArgs+="\" -o \""; diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp index 948c86a..ce50302 100644 --- a/src/namespacedef.cpp +++ b/src/namespacedef.cpp @@ -58,7 +58,7 @@ NamespaceDef::NamespaceDef(const char *df,int dl,int dc, memberGroupSDict = new MemberGroupSDict; memberGroupSDict->setAutoDelete(TRUE); visited=FALSE; - m_subGrouping=Config_getBool("SUBGROUPING"); + m_subGrouping=Config_getBool(SUBGROUPING); if (type && !strcmp("module", type)) { m_type = MODULE; @@ -129,7 +129,7 @@ void NamespaceDef::insertUsedFile(FileDef *fd) if (fd==0) return; if (files.find(fd)==-1) { - if (Config_getBool("SORT_MEMBER_DOCS")) + if (Config_getBool(SORT_MEMBER_DOCS)) files.inSort(fd); else files.append(fd); @@ -153,7 +153,7 @@ void NamespaceDef::insertClass(ClassDef *cd) { if (classSDict->find(cd->name())==0) { - if (Config_getBool("SORT_BRIEF_DOCS")) + if (Config_getBool(SORT_BRIEF_DOCS)) classSDict->inSort(cd->name(),cd); else classSDict->append(cd->name(),cd); @@ -164,7 +164,7 @@ void NamespaceDef::insertNamespace(NamespaceDef *nd) { if (namespaceSDict->find(nd->name())==0) { - if (Config_getBool("SORT_MEMBER_DOCS")) + if (Config_getBool(SORT_MEMBER_DOCS)) namespaceSDict->inSort(nd->name(),nd); else namespaceSDict->append(nd->name(),nd); @@ -217,7 +217,7 @@ void NamespaceDef::insertMember(MemberDef *md) //printf("%s::m_allMembersDict->append(%s)\n",name().data(),md->localName().data()); m_allMembersDict->append(md->localName(),md); //::addNamespaceMemberNameToIndex(md); - //static bool sortBriefDocs=Config_getBool("SORT_BRIEF_DOCS"); + //static bool sortBriefDocs=Config_getBool(SORT_BRIEF_DOCS); switch(md->memberType()) { case MemberType_Variable: @@ -259,7 +259,7 @@ void NamespaceDef::computeAnchors() bool NamespaceDef::hasDetailedDescription() const { - static bool repeatBrief = Config_getBool("REPEAT_BRIEF"); + static bool repeatBrief = Config_getBool(REPEAT_BRIEF); return ((!briefDescription().isEmpty() && repeatBrief) || !documentation().isEmpty()); } @@ -361,11 +361,11 @@ void NamespaceDef::writeDetailedDescription(OutputList &ol,const QCString &title ol.endGroupHeader(); ol.startTextBlock(); - if (!briefDescription().isEmpty() && Config_getBool("REPEAT_BRIEF")) + if (!briefDescription().isEmpty() && Config_getBool(REPEAT_BRIEF)) { ol.generateDoc(briefFile(),briefLine(),this,0,briefDescription(),FALSE,FALSE); } - if (!briefDescription().isEmpty() && Config_getBool("REPEAT_BRIEF") && + if (!briefDescription().isEmpty() && Config_getBool(REPEAT_BRIEF) && !documentation().isEmpty()) { ol.pushGeneratorState(); @@ -434,7 +434,7 @@ void NamespaceDef::endMemberDeclarations(OutputList &ol) void NamespaceDef::startMemberDocumentation(OutputList &ol) { - if (Config_getBool("SEPARATE_MEMBER_PAGES")) + if (Config_getBool(SEPARATE_MEMBER_PAGES)) { ol.disable(OutputGenerator::Html); Doxygen::suppressDocWarnings = TRUE; @@ -443,7 +443,7 @@ void NamespaceDef::startMemberDocumentation(OutputList &ol) void NamespaceDef::endMemberDocumentation(OutputList &ol) { - if (Config_getBool("SEPARATE_MEMBER_PAGES")) + if (Config_getBool(SEPARATE_MEMBER_PAGES)) { ol.enable(OutputGenerator::Html); Doxygen::suppressDocWarnings = FALSE; @@ -493,7 +493,7 @@ void NamespaceDef::writeAuthorSection(OutputList &ol) ol.startGroupHeader(); ol.parseText(theTranslator->trAuthor(TRUE,TRUE)); ol.endGroupHeader(); - ol.parseText(theTranslator->trGeneratedAutomatically(Config_getString("PROJECT_NAME"))); + ol.parseText(theTranslator->trGeneratedAutomatically(Config_getString(PROJECT_NAME))); ol.popGeneratorState(); } @@ -551,9 +551,9 @@ void NamespaceDef::addNamespaceAttributes(OutputList &ol) void NamespaceDef::writeDocumentation(OutputList &ol) { - static bool generateTreeView = Config_getBool("GENERATE_TREEVIEW"); - //static bool outputJava = Config_getBool("OPTIMIZE_OUTPUT_JAVA"); - //static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); + static bool generateTreeView = Config_getBool(GENERATE_TREEVIEW); + //static bool outputJava = Config_getBool(OPTIMIZE_OUTPUT_JAVA); + //static bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); QCString pageTitle = title(); startFile(ol,getOutputFileBase(),name(),pageTitle,HLI_NamespaceVisible,!generateTreeView); @@ -690,7 +690,7 @@ void NamespaceDef::writeDocumentation(OutputList &ol) endFileWithNavPath(this,ol); - if (Config_getBool("SEPARATE_MEMBER_PAGES")) + if (Config_getBool(SEPARATE_MEMBER_PAGES)) { MemberList *allMemberList = getMemberList(MemberListType_allMembersList); if (allMemberList) allMemberList->sort(); @@ -717,7 +717,7 @@ void NamespaceDef::writeMemberPages(OutputList &ol) void NamespaceDef::writeQuickMemberLinks(OutputList &ol,MemberDef *currentMd) const { - static bool createSubDirs=Config_getBool("CREATE_SUBDIRS"); + static bool createSubDirs=Config_getBool(CREATE_SUBDIRS); ol.writeString(" <div class=\"navtab\">\n"); ol.writeString(" <table>\n"); @@ -828,7 +828,7 @@ Definition *NamespaceDef::findInnerCompound(const char *n) void NamespaceDef::addListReferences() { - //bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); + //bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); { QList<ListItemInfo> *xrefItems = xrefListItems(); addRefItem(xrefItems, @@ -943,7 +943,7 @@ void NamespaceSDict::writeDeclaration(OutputList &ol,const char *title, if (count()==0) return; // no namespaces in the list - if (Config_getBool("OPTIMIZE_OUTPUT_VHDL")) return; + if (Config_getBool(OPTIMIZE_OUTPUT_VHDL)) return; SDict<NamespaceDef>::Iterator ni(*this); @@ -977,8 +977,8 @@ void NamespaceSDict::writeDeclaration(OutputList &ol,const char *title, // write list of namespaces ol.startMemberHeader("namespaces"); - //bool javaOpt = Config_getBool("OPTIMIZE_OUTPUT_JAVA"); - //bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); + //bool javaOpt = Config_getBool(OPTIMIZE_OUTPUT_JAVA); + //bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); ol.parseText(title); ol.endMemberHeader(); ol.startMemberList(); @@ -1006,7 +1006,7 @@ void NamespaceSDict::writeDeclaration(OutputList &ol,const char *title, } ol.writeObjectLink(nd->getReference(),nd->getOutputFileBase(),0,name); ol.endMemberItem(); - if (!nd->briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC")) + if (!nd->briefDescription().isEmpty() && Config_getBool(BRIEF_MEMBER_DESC)) { ol.startMemberDescription(nd->getOutputFileBase()); ol.generateDoc(nd->briefFile(),nd->briefLine(),nd,0,nd->briefDescription(),FALSE,FALSE,0,TRUE); @@ -1038,8 +1038,8 @@ MemberList *NamespaceDef::createMemberList(MemberListType lt) void NamespaceDef::addMemberToList(MemberListType lt,MemberDef *md) { - static bool sortBriefDocs = Config_getBool("SORT_BRIEF_DOCS"); - static bool sortMemberDocs = Config_getBool("SORT_MEMBER_DOCS"); + static bool sortBriefDocs = Config_getBool(SORT_BRIEF_DOCS); + static bool sortMemberDocs = Config_getBool(SORT_MEMBER_DOCS); MemberList *ml = createMemberList(lt); ml->setNeedsSorting( ((ml->listType()&MemberListType_declarationLists) && sortBriefDocs) || @@ -1107,7 +1107,7 @@ bool NamespaceDef::isLinkableInProject() const { int i = name().findRev("::"); if (i==-1) i=0; else i+=2; - static bool extractAnonNs = Config_getBool("EXTRACT_ANON_NSPACES"); + static bool extractAnonNs = Config_getBool(EXTRACT_ANON_NSPACES); if (extractAnonNs && // extract anonymous ns name().mid(i,20)=="anonymous_namespace{" // correct prefix ) // not disabled by config diff --git a/src/pagedef.cpp b/src/pagedef.cpp index 20ace23..5274ad6 100644 --- a/src/pagedef.cpp +++ b/src/pagedef.cpp @@ -34,7 +34,7 @@ PageDef::PageDef(const char *f,int l,const char *n, m_subPageDict = new PageSDict(7); m_pageScope = 0; m_nestingLevel = 0; - static bool shortNames = Config_getBool("SHORT_NAMES"); + static bool shortNames = Config_getBool(SHORT_NAMES); m_fileName = shortNames ? convertNameToFile(n) : QCString(n); m_showToc = FALSE; } @@ -118,7 +118,7 @@ void PageDef::writeTagFile(FTextStream &tagFile) void PageDef::writeDocumentation(OutputList &ol) { - static bool generateTreeView = Config_getBool("GENERATE_TREEVIEW"); + static bool generateTreeView = Config_getBool(GENERATE_TREEVIEW); //outputList->disable(OutputGenerator::Man); QCString pageName,manPageName; @@ -154,7 +154,7 @@ void PageDef::writeDocumentation(OutputList &ol) if (!generateTreeView) { - if (getOuterScope()!=Doxygen::globalScope && !Config_getBool("DISABLE_INDEX")) + if (getOuterScope()!=Doxygen::globalScope && !Config_getBool(DISABLE_INDEX)) { getOuterScope()->writeNavigationPath(ol); } @@ -204,7 +204,7 @@ void PageDef::writeDocumentation(OutputList &ol) writePageDocumentation(ol); - if (generateTreeView && getOuterScope()!=Doxygen::globalScope && !Config_getBool("DISABLE_INDEX")) + if (generateTreeView && getOuterScope()!=Doxygen::globalScope && !Config_getBool(DISABLE_INDEX)) { ol.endContents(); endFileWithNavPath(getOuterScope(),ol); @@ -281,7 +281,7 @@ void PageDef::writePageDocumentation(OutputList &ol) bool PageDef::visibleInIndex() const { - static bool externalPages = Config_getBool("EXTERNAL_PAGES"); + static bool externalPages = Config_getBool(EXTERNAL_PAGES); return // not part of a group !getGroupDef() && // not an externally defined page diff --git a/src/perlmodgen.cpp b/src/perlmodgen.cpp index 6f9eb64..38ebbb2 100644 --- a/src/perlmodgen.cpp +++ b/src/perlmodgen.cpp @@ -2208,7 +2208,7 @@ bool PerlModGenerator::createOutputFile(QFile &f, const char *s) bool PerlModGenerator::createOutputDir(QDir &perlModDir) { - QCString outputDirectory = Config_getString("OUTPUT_DIRECTORY"); + QCString outputDirectory = Config_getString(OUTPUT_DIRECTORY); if (outputDirectory.isEmpty()) { outputDirectory=QDir::currentDirPath().utf8(); @@ -2445,8 +2445,8 @@ bool PerlModGenerator::generateDoxyRules() if (!createOutputFile(doxyRules, pathDoxyRules)) return false; - bool perlmodLatex = Config_getBool("PERLMOD_LATEX"); - QCString prefix = Config_getString("PERLMOD_MAKEVAR_PREFIX"); + bool perlmodLatex = Config_getBool(PERLMOD_LATEX); + QCString prefix = Config_getString(PERLMOD_MAKEVAR_PREFIX); FTextStream doxyRulesStream(&doxyRules); doxyRulesStream << @@ -2542,8 +2542,8 @@ bool PerlModGenerator::generateMakefile() if (!createOutputFile(makefile, pathMakefile)) return false; - bool perlmodLatex = Config_getBool("PERLMOD_LATEX"); - QCString prefix = Config_getString("PERLMOD_MAKEVAR_PREFIX"); + bool perlmodLatex = Config_getBool(PERLMOD_LATEX); + QCString prefix = Config_getString(PERLMOD_MAKEVAR_PREFIX); FTextStream makefileStream(&makefile); makefileStream << @@ -2923,7 +2923,7 @@ void PerlModGenerator::generate() if (!createOutputDir(perlModDir)) return; - bool perlmodLatex = Config_getBool("PERLMOD_LATEX"); + bool perlmodLatex = Config_getBool(PERLMOD_LATEX); QCString perlModAbsPath = perlModDir.absPath().utf8(); pathDoxyDocsPM = perlModAbsPath + "/DoxyDocs.pm"; @@ -2959,7 +2959,7 @@ void PerlModGenerator::generate() void generatePerlMod() { - PerlModGenerator pmg(Config_getBool("PERLMOD_PRETTY")); + PerlModGenerator pmg(Config_getBool(PERLMOD_PRETTY)); pmg.generate(); } diff --git a/src/plantuml.cpp b/src/plantuml.cpp index 7d28688..288cbc0 100644 --- a/src/plantuml.cpp +++ b/src/plantuml.cpp @@ -53,12 +53,12 @@ QCString writePlantUMLSource(const QCString &outDir,const QCString &fileName,con void generatePlantUMLOutput(const char *baseName,const char *outDir,PlantUMLOutputFormat format) { - static QCString plantumlJarPath = Config_getString("PLANTUML_JAR_PATH"); + static QCString plantumlJarPath = Config_getString(PLANTUML_JAR_PATH); QCString pumlExe = "java"; QCString pumlArgs = ""; - QStrList &pumlIncludePathList = Config_getList("PLANTUML_INCLUDE_PATH"); + QStrList &pumlIncludePathList = Config_getList(PLANTUML_INCLUDE_PATH); char *s=pumlIncludePathList.first(); if (s) { @@ -106,12 +106,12 @@ void generatePlantUMLOutput(const char *baseName,const char *outDir,PlantUMLOutp err("Problems running PlantUML. Verify that the command 'java -jar \"%splantuml.jar\" -h' works from the command line. Exit code: %d\n", plantumlJarPath.data(),exitCode); } - else if (Config_getBool("DOT_CLEANUP")) + else if (Config_getBool(DOT_CLEANUP)) { QFile(QCString(baseName)+".pu").remove(); } portable_sysTimerStop(); - if ( (format==PUML_EPS) && (Config_getBool("USE_PDFLATEX")) ) + if ( (format==PUML_EPS) && (Config_getBool(USE_PDFLATEX)) ) { QCString epstopdfArgs(maxCmdLine); epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"",baseName,baseName); @@ -454,7 +454,7 @@ static FileState *checkAndOpenFile(const QCString &fileName,bool &alreadyInclude QFileInfo fi(fileName); if (fi.exists() && fi.isFile()) { - static QStrList &exclPatterns = Config_getList("EXCLUDE_PATTERNS"); + static QStrList &exclPatterns = Config_getList(EXCLUDE_PATTERNS); if (patternMatch(fi,&exclPatterns)) return 0; QCString absName = fi.absFilePath().utf8(); @@ -1461,7 +1461,7 @@ static inline void outputArray(const char *a,int len) static void readIncludeFile(const QCString &inc) { - static bool searchIncludes = Config_getBool("SEARCH_INCLUDES"); + static bool searchIncludes = Config_getBool(SEARCH_INCLUDES); uint i=0; // find the start of the include file name @@ -1507,7 +1507,7 @@ static void readIncludeFile(const QCString &inc) } else if (searchIncludes) // search in INCLUDE_PATH as well { - QStrList &includePath = Config_getList("INCLUDE_PATH"); + QStrList &includePath = Config_getList(INCLUDE_PATH); char *s=includePath.first(); while (s) { @@ -1789,7 +1789,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) } <Start>^{B}*[_A-Z][_A-Z0-9]+{B}*"("[^\(\)\n]*"("[^\)\n]*")"[^\)\n]*")"{B}*\n | // function list macro with one (...) argument, e.g. for K_GLOBAL_STATIC_WITH_ARGS <Start>^{B}*[_A-Z][_A-Z0-9]+{B}*"("[^\)\n]*")"{B}*\n { // function like macro - static bool skipFuncMacros = Config_getBool("SKIP_FUNCTION_MACROS"); + static bool skipFuncMacros = Config_getBool(SKIP_FUNCTION_MACROS); QCString name(yytext); name=name.left(name.find('(')).stripWhiteSpace(); @@ -2454,7 +2454,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) outputArray(yytext,(int)yyleng); } <SkipCComment>^({B}*"*"+)?{B}{0,3}"~~~"[~]* { - static bool markdownSupport = Config_getBool("MARKDOWN_SUPPORT"); + static bool markdownSupport = Config_getBool(MARKDOWN_SUPPORT); if (!markdownSupport) { REJECT; @@ -2467,7 +2467,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'")) } } <SkipCComment>^({B}*"*"+)?{B}{0,3}"```"[`]* { - static bool markdownSupport = Config_getBool("MARKDOWN_SUPPORT"); + static bool markdownSupport = Config_getBool(MARKDOWN_SUPPORT); if (!markdownSupport) { REJECT; @@ -2999,8 +2999,8 @@ void preprocessFile(const char *fileName,BufStr &input,BufStr &output) //printf("##########################\n%s\n####################\n", // input.data()); - g_macroExpansion = Config_getBool("MACRO_EXPANSION"); - g_expandOnlyPredef = Config_getBool("EXPAND_ONLY_PREDEF"); + g_macroExpansion = Config_getBool(MACRO_EXPANSION); + g_expandOnlyPredef = Config_getBool(EXPAND_ONLY_PREDEF); g_skip=FALSE; g_curlyCount=0; g_nospaces=FALSE; @@ -3024,7 +3024,7 @@ void preprocessFile(const char *fileName,BufStr &input,BufStr &output) { // add predefined macros char *defStr; - QStrList &predefList = Config_getList("PREDEFINED"); + QStrList &predefList = Config_getList(PREDEFINED); QStrListIterator sli(predefList); for (sli.toFirst();(defStr=sli.current());++sli) { diff --git a/src/pycode.l b/src/pycode.l index b8ca5ed..44adb3f 100644 --- a/src/pycode.l +++ b/src/pycode.l @@ -438,7 +438,7 @@ static void writeMultiLineCodeLink(CodeOutputInterface &ol, Definition *d, const char *text) { - static bool sourceTooltips = Config_getBool("SOURCE_TOOLTIPS"); + static bool sourceTooltips = Config_getBool(SOURCE_TOOLTIPS); TooltipManager::instance()->addTooltip(d); QCString ref = d->getReference(); QCString file = d->getOutputFileBase(); @@ -1388,7 +1388,7 @@ TARGET ({IDENTIFIER}|"("{TARGET_LIST}")"|"["{TARGET_LIST}"]"|{ATTRIBUT } <DocBlock>{NEWLINE} { // comment block ends at the end of this line // remove special comment (default config) - if (Config_getBool("STRIP_CODE_COMMENTS")) + if (Config_getBool(STRIP_CODE_COMMENTS)) { g_yyLineNr+=((QCString)g_docBlock).contains('\n'); g_endComment=TRUE; @@ -1457,7 +1457,7 @@ TARGET ({IDENTIFIER}|"("{TARGET_LIST}")"|"["{TARGET_LIST}"]"|{ATTRIBUT <*><<EOF>> { if (YY_START == DocBlock) { - if (!Config_getBool("STRIP_CODE_COMMENTS")) + if (!Config_getBool(STRIP_CODE_COMMENTS)) { startFontClass("comment"); codifyLines(g_docBlock); diff --git a/src/pyscanner.l b/src/pyscanner.l index 9ec69be..ac453b1 100644 --- a/src/pyscanner.l +++ b/src/pyscanner.l @@ -181,7 +181,7 @@ static void newFunction() static inline int computeIndent(const char *s) { int col=0; - static int tabSize=Config_getInt("TAB_SIZE"); + static int tabSize=Config_getInt(TAB_SIZE); const char *p=s; char c; while ((c=*p++)) diff --git a/src/qhp.cpp b/src/qhp.cpp index 757f547..e7c8d10 100644 --- a/src/qhp.cpp +++ b/src/qhp.cpp @@ -81,8 +81,8 @@ void Qhp::initialize() <filterAttribute>1.0</filterAttribute> .. */ - QCString nameSpace = Config_getString("QHP_NAMESPACE"); - QCString virtualFolder = Config_getString("QHP_VIRTUAL_FOLDER"); + QCString nameSpace = Config_getString(QHP_NAMESPACE); + QCString virtualFolder = Config_getString(QHP_VIRTUAL_FOLDER); m_doc.declaration("1.0", "UTF-8"); @@ -94,14 +94,14 @@ void Qhp::initialize() m_doc.openCloseContent("virtualFolder", virtualFolder); // Add custom filter - QCString filterName = Config_getString("QHP_CUST_FILTER_NAME"); + QCString filterName = Config_getString(QHP_CUST_FILTER_NAME); if (!filterName.isEmpty()) { const char * tagAttributes[] = { "name", filterName, 0 }; m_doc.open("customFilter", tagAttributes); - QStringList customFilterAttributes = QStringList::split(QChar(' '), Config_getString("QHP_CUST_FILTER_ATTRS")); + QStringList customFilterAttributes = QStringList::split(QChar(' '), Config_getString(QHP_CUST_FILTER_ATTRS)); for (int i = 0; i < (int)customFilterAttributes.count(); i++) { m_doc.openCloseContent("filterAttribute", customFilterAttributes[i].utf8()); @@ -113,7 +113,7 @@ void Qhp::initialize() // Add section attributes QStringList sectionFilterAttributes = QStringList::split(QChar(' '), - Config_getString("QHP_SECT_FILTER_ATTRS")); + Config_getString(QHP_SECT_FILTER_ATTRS)); if (!sectionFilterAttributes.contains(QString("doxygen"))) { sectionFilterAttributes << "doxygen"; @@ -164,7 +164,7 @@ void Qhp::finalize() m_doc.close("filterSection"); m_doc.close("QtHelpProject"); - QCString fileName = Config_getString("HTML_OUTPUT") + "/" + getQhpFileName(); + QCString fileName = Config_getString(HTML_OUTPUT) + "/" + getQhpFileName(); QFile file(fileName); if (!file.open(IO_WriteOnly)) { @@ -225,7 +225,7 @@ void Qhp::addIndexItem(Definition *context,MemberDef *md, if (md) // member { - static bool separateMemberPages = Config_getBool("SEPARATE_MEMBER_PAGES"); + static bool separateMemberPages = Config_getBool(SEPARATE_MEMBER_PAGES); if (context==0) // global member { if (md->getGroupDef()) @@ -284,8 +284,8 @@ QCString Qhp::getQhpFileName() QCString Qhp::getFullProjectName() { - QCString projectName = Config_getString("PROJECT_NAME"); - QCString versionText = Config_getString("PROJECT_NUMBER"); + QCString projectName = Config_getString(PROJECT_NAME); + QCString versionText = Config_getString(PROJECT_NUMBER); if (projectName.isEmpty()) projectName="Root"; return projectName + (versionText.isEmpty() ? QCString("") diff --git a/src/resourcemgr.cpp b/src/resourcemgr.cpp index 80bd2ad..6bc1da4 100644 --- a/src/resourcemgr.cpp +++ b/src/resourcemgr.cpp @@ -137,7 +137,7 @@ bool ResourceMgr::copyResourceAs(const char *name,const char *targetDir,const ch buf = replaceColorMarkers(buf); if (qstrcmp(name,"navtree.css")==0) { - t << substitute(buf,"$width",QCString().setNum(Config_getInt("TREEVIEW_WIDTH"))+"px"); + t << substitute(buf,"$width",QCString().setNum(Config_getInt(TREEVIEW_WIDTH))+"px"); } else { diff --git a/src/rtfdocvisitor.cpp b/src/rtfdocvisitor.cpp index cb3b34c..07a1046 100644 --- a/src/rtfdocvisitor.cpp +++ b/src/rtfdocvisitor.cpp @@ -140,7 +140,7 @@ void RTFDocVisitor::visit(DocURL *u) { if (m_hide) return; DBG_RTF("{\\comment RTFDocVisitor::visit(DocURL)}\n"); - if (Config_getBool("RTF_HYPERLINKS")) + if (Config_getBool(RTF_HYPERLINKS)) { m_t << "{\\field " "{\\*\\fldinst " @@ -284,7 +284,7 @@ void RTFDocVisitor::visit(DocVerbatim *s) QCString fileName(4096); fileName.sprintf("%s%d%s", - (Config_getString("RTF_OUTPUT")+"/inline_dotgraph_").data(), + (Config_getString(RTF_OUTPUT)+"/inline_dotgraph_").data(), dotindex++, ".dot" ); @@ -300,7 +300,7 @@ void RTFDocVisitor::visit(DocVerbatim *s) visitCaption(this, s->children()); includePicturePostRTF(true, s->hasCaption()); - if (Config_getBool("DOT_CLEANUP")) file.remove(); + if (Config_getBool(DOT_CLEANUP)) file.remove(); } break; case DocVerbatim::Msc: @@ -309,7 +309,7 @@ void RTFDocVisitor::visit(DocVerbatim *s) QCString baseName(4096); baseName.sprintf("%s%d%s", - (Config_getString("RTF_OUTPUT")+"/inline_mscgraph_").data(), + (Config_getString(RTF_OUTPUT)+"/inline_mscgraph_").data(), mscindex++, ".msc" ); @@ -328,12 +328,12 @@ void RTFDocVisitor::visit(DocVerbatim *s) visitCaption(this, s->children()); includePicturePostRTF(true, s->hasCaption()); - if (Config_getBool("DOT_CLEANUP")) file.remove(); + if (Config_getBool(DOT_CLEANUP)) file.remove(); } break; case DocVerbatim::PlantUML: { - static QCString rtfOutput = Config_getString("RTF_OUTPUT"); + static QCString rtfOutput = Config_getString(RTF_OUTPUT); QCString baseName = writePlantUMLSource(rtfOutput,s->exampleFile(),s->text()); writePlantUMLFile(baseName, s->hasCaption()); @@ -969,7 +969,7 @@ void RTFDocVisitor::visitPre(DocHRef *href) { if (m_hide) return; DBG_RTF("{\\comment RTFDocVisitor::visitPre(DocHRef)}\n"); - if (Config_getBool("RTF_HYPERLINKS")) + if (Config_getBool(RTF_HYPERLINKS)) { m_t << "{\\field " "{\\*\\fldinst " @@ -991,7 +991,7 @@ void RTFDocVisitor::visitPost(DocHRef *) { if (m_hide) return; DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocHRef)}\n"); - if (Config_getBool("RTF_HYPERLINKS")) + if (Config_getBool(RTF_HYPERLINKS)) { m_t << "}" "}" @@ -1198,7 +1198,7 @@ void RTFDocVisitor::visitPost(DocSecRefList *) //void RTFDocVisitor::visitPre(DocLanguage *l) //{ // DBG_RTF("{\\comment RTFDocVisitor::visitPre(DocLanguage)}\n"); -// QCString langId = Config_getEnum("OUTPUT_LANGUAGE"); +// QCString langId = Config_getEnum(OUTPUT_LANGUAGE); // if (l->id().lower()!=langId.lower()) // { // pushEnabled(); @@ -1209,7 +1209,7 @@ void RTFDocVisitor::visitPost(DocSecRefList *) //void RTFDocVisitor::visitPost(DocLanguage *l) //{ // DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocLanguage)}\n"); -// QCString langId = Config_getEnum("OUTPUT_LANGUAGE"); +// QCString langId = Config_getEnum(OUTPUT_LANGUAGE); // if (l->id().lower()!=langId.lower()) // { // popEnabled(); @@ -1452,7 +1452,7 @@ void RTFDocVisitor::visitPre(DocXRefItem *x) m_t << "{"; // start param list //m_t << "{\\b "; // start bold m_t << "{" << rtf_Style["Heading5"]->reference << endl; - if (Config_getBool("RTF_HYPERLINKS") && !anonymousEnum) + if (Config_getBool(RTF_HYPERLINKS) && !anonymousEnum) { QCString refName; if (!x->file().isEmpty()) @@ -1638,7 +1638,7 @@ void RTFDocVisitor::filter(const char *str,bool verbatim) void RTFDocVisitor::startLink(const QCString &ref,const QCString &file,const QCString &anchor) { - if (ref.isEmpty() && Config_getBool("RTF_HYPERLINKS")) + if (ref.isEmpty() && Config_getBool(RTF_HYPERLINKS)) { QCString refName; if (!file.isEmpty()) @@ -1668,7 +1668,7 @@ void RTFDocVisitor::startLink(const QCString &ref,const QCString &file,const QCS void RTFDocVisitor::endLink(const QCString &ref) { - if (ref.isEmpty() && Config_getBool("RTF_HYPERLINKS")) + if (ref.isEmpty() && Config_getBool(RTF_HYPERLINKS)) { m_t << "}}}"; } @@ -1704,7 +1704,7 @@ void RTFDocVisitor::writeDotFile(const QCString &filename, const bool hasCaption { baseName=baseName.right(baseName.length()-i-1); } - QCString outDir = Config_getString("RTF_OUTPUT"); + QCString outDir = Config_getString(RTF_OUTPUT); writeDotGraphFromFile(filename,outDir,baseName,GOF_BITMAP); QCString imgExt = getDotImageExtension(); includePicturePreRTF(baseName + "." + imgExt, true, hasCaption); @@ -1722,7 +1722,7 @@ void RTFDocVisitor::writeMscFile(const QCString &fileName, const bool hasCaption { baseName=baseName.right(baseName.length()-i-1); } - QCString outDir = Config_getString("RTF_OUTPUT"); + QCString outDir = Config_getString(RTF_OUTPUT); writeMscGraphFromFile(fileName,outDir,baseName,MSC_BITMAP); includePicturePreRTF(baseName + ".png", true, hasCaption); } @@ -1735,7 +1735,7 @@ void RTFDocVisitor::writeDiaFile(DocDiaFile *df) { baseName=baseName.right(baseName.length()-i-1); } - QCString outDir = Config_getString("RTF_OUTPUT"); + QCString outDir = Config_getString(RTF_OUTPUT); writeDiaGraphFromFile(df->file(),outDir,baseName,DIA_BITMAP); includePicturePreRTF(baseName + ".png", true, df->hasCaption()); } @@ -1748,7 +1748,7 @@ void RTFDocVisitor::writePlantUMLFile(const QCString &fileName, const bool hasCa { baseName=baseName.right(baseName.length()-i-1); } - QCString outDir = Config_getString("RTF_OUTPUT"); + QCString outDir = Config_getString(RTF_OUTPUT); generatePlantUMLOutput(fileName,outDir,PUML_BITMAP); includePicturePreRTF(baseName + ".png", true, hasCaption); } diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp index 749f57b..f5b997e 100644 --- a/src/rtfgen.cpp +++ b/src/rtfgen.cpp @@ -59,14 +59,14 @@ static QCString dateToRTFDateString() RTFGenerator::RTFGenerator() : OutputGenerator() { - dir=Config_getString("RTF_OUTPUT"); + dir=Config_getString(RTF_OUTPUT); col=0; //insideTabbing=FALSE; m_listLevel = 0; m_bstartedBody = FALSE; m_omitParagraph = FALSE; m_numCols = 0; - m_prettyCode=Config_getBool("RTF_SOURCE_CODE"); + m_prettyCode=Config_getBool(RTF_SOURCE_CODE); } RTFGenerator::~RTFGenerator() @@ -165,7 +165,7 @@ void RTFGenerator::writeExtensionsFile(QFile &file) void RTFGenerator::init() { - QCString dir=Config_getString("RTF_OUTPUT"); + QCString dir=Config_getString(RTF_OUTPUT); QDir d(dir); if (!d.exists() && !d.mkdir(dir)) { @@ -186,14 +186,14 @@ void RTFGenerator::init() } // overwrite some (or all) definitions from file - QCString &rtfStyleSheetFile = Config_getString("RTF_STYLESHEET_FILE"); + QCString &rtfStyleSheetFile = Config_getString(RTF_STYLESHEET_FILE); if (!rtfStyleSheetFile.isEmpty()) { loadStylesheet(rtfStyleSheetFile, rtf_Style); } // If user has defined an extension file, load its contents. - QCString &rtfExtensionsFile = Config_getString("RTF_EXTENSIONS_FILE"); + QCString &rtfExtensionsFile = Config_getString(RTF_EXTENSIONS_FILE); if (!rtfExtensionsFile.isEmpty()) { loadExtensions(rtfExtensionsFile); @@ -296,7 +296,7 @@ void RTFGenerator::beginRTFChapter() t << rtf_Style_Reset; // if we are compact, no extra page breaks... - if (Config_getBool("COMPACT_RTF")) + if (Config_getBool(COMPACT_RTF)) { // t <<"\\sect\\sectd\\sbknone\n"; t <<"\\sect\\sbknone\n"; @@ -316,7 +316,7 @@ void RTFGenerator::beginRTFSection() t << rtf_Style_Reset; // if we are compact, no extra page breaks... - if (Config_getBool("COMPACT_RTF")) + if (Config_getBool(COMPACT_RTF)) { // t <<"\\sect\\sectd\\sbknone\n"; t <<"\\sect\\sbknone\n"; @@ -538,10 +538,10 @@ void RTFGenerator::startIndexSection(IndexSections is) void RTFGenerator::endIndexSection(IndexSections is) { - bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN"); - bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); - static bool sourceBrowser = Config_getBool("SOURCE_BROWSER"); - static QCString projectName = Config_getString("PROJECT_NAME"); + bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN); + bool vhdlOpt = Config_getBool(OPTIMIZE_OUTPUT_VHDL); + static bool sourceBrowser = Config_getBool(SOURCE_BROWSER); + static QCString projectName = Config_getString(PROJECT_NAME); switch (is) { @@ -609,7 +609,7 @@ void RTFGenerator::endIndexSection(IndexSections is) else t << "{\\field\\fldedit {\\*\\fldinst AUTHOR \\\\*MERGEFORMAT}{\\fldrslt AUTHOR}}\\par" << endl; - t << theTranslator->trVersion() << " " << Config_getString("PROJECT_NUMBER") << "\\par"; + t << theTranslator->trVersion() << " " << Config_getString(PROJECT_NUMBER) << "\\par"; t << "{\\field\\fldedit {\\*\\fldinst CREATEDATE \\\\*MERGEFORMAT}" "{\\fldrslt "<< dateToString(FALSE) << " }}\\par"<<endl; t << "\\page\\page"; @@ -637,7 +637,7 @@ void RTFGenerator::endIndexSection(IndexSections is) t << "{\\tc \\v " << substitute(Doxygen::mainPage->title(),"%","") << "}"<< endl; } t << "{\\field\\fldedit{\\*\\fldinst INCLUDETEXT \""; - //if (Config_getBool("GENERATE_TREEVIEW")) t << "main"; else t << "index"; + //if (Config_getBool(GENERATE_TREEVIEW)) t << "main"; else t << "index"; t << "index"; t << ".rtf\" \\\\*MERGEFORMAT}{\\fldrslt includedstuff}}\n"; break; @@ -1075,7 +1075,7 @@ void RTFGenerator::endIndexItem(const char *ref,const char *fn) void RTFGenerator::startHtmlLink(const char *url) { - if (Config_getBool("RTF_HYPERLINKS")) + if (Config_getBool(RTF_HYPERLINKS)) { t << "{\\field {\\*\\fldinst { HYPERLINK \""; t << url; @@ -1090,7 +1090,7 @@ void RTFGenerator::startHtmlLink(const char *url) void RTFGenerator::endHtmlLink() { - if (Config_getBool("RTF_HYPERLINKS")) + if (Config_getBool(RTF_HYPERLINKS)) { t << "}}}" << endl; } @@ -1113,7 +1113,7 @@ void RTFGenerator::writeStartAnnoItem(const char *,const char *f, DBG_RTF(t << "{\\comment (writeStartAnnoItem)}" << endl) t << "{\\b "; if (path) docify(path); - if (f && Config_getBool("RTF_HYPERLINKS")) + if (f && Config_getBool(RTF_HYPERLINKS)) { t << "{\\field {\\*\\fldinst { HYPERLINK \\\\l \""; t << rtfFormatBmkStr(f); @@ -1292,7 +1292,7 @@ void RTFGenerator::endSubsubsection() // void RTFGenerator::startTextLink(const char *f,const char *anchor) { - if (Config_getBool("RTF_HYPERLINKS")) + if (Config_getBool(RTF_HYPERLINKS)) { QCString ref; if (f) @@ -1314,7 +1314,7 @@ void RTFGenerator::startTextLink(const char *f,const char *anchor) void RTFGenerator::endTextLink() { - if (Config_getBool("RTF_HYPERLINKS")) + if (Config_getBool(RTF_HYPERLINKS)) { t << "}}}" << endl; } @@ -1323,7 +1323,7 @@ void RTFGenerator::endTextLink() void RTFGenerator::writeObjectLink(const char *ref, const char *f, const char *anchor, const char *text) { - if (!ref && Config_getBool("RTF_HYPERLINKS")) + if (!ref && Config_getBool(RTF_HYPERLINKS)) { QCString refName; if (f) @@ -1380,7 +1380,7 @@ void RTFGenerator::writeCodeLink(const char *ref,const char *f, const char *anchor,const char *name, const char *) { - if (!ref && Config_getBool("RTF_HYPERLINKS")) + if (!ref && Config_getBool(RTF_HYPERLINKS)) { QCString refName; if (f) @@ -1435,7 +1435,7 @@ void RTFGenerator::endTitleHead(const char *fileName,const char *name) // writeAnchor(0,name); //} // - //if (Config_getBool("RTF_HYPERLINKS") && fileName) + //if (Config_getBool(RTF_HYPERLINKS) && fileName) //{ writeAnchor(fileName,0); //} @@ -1445,7 +1445,7 @@ void RTFGenerator::endTitleHead(const char *fileName,const char *name) void RTFGenerator::startTitle() { DBG_RTF(t <<"{\\comment startTitle}" << endl) - if (Config_getBool("COMPACT_RTF")) + if (Config_getBool(COMPACT_RTF)) beginRTFSection(); else beginRTFChapter(); @@ -1803,7 +1803,7 @@ void RTFGenerator::codify(const char *str) switch(c) { - case '\t': spacesToNextTabStop = Config_getInt("TAB_SIZE") - (col%Config_getInt("TAB_SIZE")); + case '\t': spacesToNextTabStop = Config_getInt(TAB_SIZE) - (col%Config_getInt(TAB_SIZE)); t << Doxygen::spaces.left(spacesToNextTabStop); col+=spacesToNextTabStop; break; @@ -1965,7 +1965,7 @@ void RTFGenerator::endMemberList() // { // baseName=baseName.right(baseName.length()-i-1); // } -// QCString outDir = Config_getString("RTF_OUTPUT"); +// QCString outDir = Config_getString(RTF_OUTPUT); // writeDotGraphFromFile(name,outDir,baseName,BITMAP); // newParagraph(); // t << "{" << endl; @@ -2445,7 +2445,7 @@ void RTFGenerator::endDotGraph(const DotClassGraph &g) newParagraph(); QCString fn = - g.writeGraph(t,GOF_BITMAP,EOF_Rtf,Config_getString("RTF_OUTPUT"),fileName,relPath,TRUE,FALSE); + g.writeGraph(t,GOF_BITMAP,EOF_Rtf,Config_getString(RTF_OUTPUT),fileName,relPath,TRUE,FALSE); // display the file t << "{" << endl; @@ -2468,7 +2468,7 @@ void RTFGenerator::endInclDepGraph(const DotInclDepGraph &g) { newParagraph(); - QCString fn = g.writeGraph(t,GOF_BITMAP,EOF_Rtf,Config_getString("RTF_OUTPUT"), + QCString fn = g.writeGraph(t,GOF_BITMAP,EOF_Rtf,Config_getString(RTF_OUTPUT), fileName,relPath,FALSE); // display the file @@ -2499,7 +2499,7 @@ void RTFGenerator::endCallGraph(const DotCallGraph &g) { newParagraph(); - QCString fn = g.writeGraph(t,GOF_BITMAP,EOF_Rtf,Config_getString("RTF_OUTPUT"), + QCString fn = g.writeGraph(t,GOF_BITMAP,EOF_Rtf,Config_getString(RTF_OUTPUT), fileName,relPath,FALSE); // display the file @@ -2522,7 +2522,7 @@ void RTFGenerator::endDirDepGraph(const DotDirDeps &g) { newParagraph(); - QCString fn = g.writeGraph(t,GOF_BITMAP,EOF_Rtf,Config_getString("RTF_OUTPUT"), + QCString fn = g.writeGraph(t,GOF_BITMAP,EOF_Rtf,Config_getString(RTF_OUTPUT), fileName,relPath,FALSE); // display the file diff --git a/src/scanner.l b/src/scanner.l index fc6dc84..ea7d7ef 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -215,7 +215,7 @@ static void initParser() autoGroupStack.setAutoDelete(TRUE); insideFormula = FALSE; insideCode=FALSE; - insideCli=Config_getBool("CPP_CLI_SUPPORT"); + insideCli=Config_getBool(CPP_CLI_SUPPORT); previous = 0; firstTypedefEntry = 0; tempEntry = 0; @@ -284,7 +284,7 @@ static void initEntry() static void lineCount() { - static int tabSize = Config_getInt("TAB_SIZE"); + static int tabSize = Config_getInt(TAB_SIZE); const char *p; for (p = yytext ; *p ; ++p ) { @@ -307,7 +307,7 @@ static void lineCount() static inline int computeIndent(const char *s,int startIndent) { int col=startIndent; - static int tabSize=Config_getInt("TAB_SIZE"); + static int tabSize=Config_getInt(TAB_SIZE); const char *p=s; char c; while ((c=*p++)) @@ -2029,8 +2029,8 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) <UsingAlias>";"{BN}*("/**"|"//!"|"/*!"|"///")"<" { docBlockContext = UsingAliasEnd; docBlockInBody = FALSE; - docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool("JAVADOC_AUTOBRIEF") ) || - ( yytext[yyleng-2]=='!' && Config_getBool("QT_AUTOBRIEF") ); + docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) || + ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) ); QCString indent; indent.fill(' ',computeIndent(yytext,g_column)); docBlock=indent; @@ -2671,8 +2671,8 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) } docBlockContext = YY_START; docBlockInBody = FALSE; - docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool("JAVADOC_AUTOBRIEF") ) || - ( yytext[yyleng-2]=='!' && Config_getBool("QT_AUTOBRIEF") ); + docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) || + ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) ); QCString indent; indent.fill(' ',computeIndent(yytext,g_column)); @@ -2701,8 +2701,8 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) <MemberSpec,FindFields,FindMembers,NextSemi,EnumBaseType,BitFields,ReadInitializer,OldStyleArgs>","{BN}*("/**"|"//!"|"/*!"|"///")"<" { docBlockContext = YY_START; docBlockInBody = FALSE; - docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool("JAVADOC_AUTOBRIEF") ) || - ( yytext[yyleng-2]=='!' && Config_getBool("QT_AUTOBRIEF") ); + docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) || + ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) ); QCString indent; indent.fill(' ',computeIndent(yytext,g_column)); @@ -2734,8 +2734,8 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) } docBlockContext = YY_START; docBlockInBody = FALSE; - docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool("JAVADOC_AUTOBRIEF") ) || - ( yytext[yyleng-2]=='!' && Config_getBool("QT_AUTOBRIEF") ); + docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) || + ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) ); QCString indent; indent.fill(' ',computeIndent(yytext,g_column)); docBlock=indent; @@ -2793,8 +2793,8 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) docBlockContext = YY_START; docBlockInBody = FALSE; docBlock.resize(0); - docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool("JAVADOC_AUTOBRIEF") ) || - ( yytext[yyleng-2]=='!' && Config_getBool("QT_AUTOBRIEF") ); + docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) || + ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) ); docBlockTerm = 0; startCommentBlock(FALSE); BEGIN(DocBlock); @@ -3396,7 +3396,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) idlProp.resize(0); current->mtype = mtype; - if (Config_getBool("IDL_PROPERTY_SUPPORT") && + if (Config_getBool(IDL_PROPERTY_SUPPORT) && current->mtype == Property) { // we are inside the properties section of a dispinterface odlProp = true; @@ -3436,14 +3436,14 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) } } <IDLAttribute>"propput" { - if (Config_getBool("IDL_PROPERTY_SUPPORT")) + if (Config_getBool(IDL_PROPERTY_SUPPORT)) { current->mtype = Property; } current->spec |= Entry::Settable; } <IDLAttribute>"propget" { - if (Config_getBool("IDL_PROPERTY_SUPPORT")) + if (Config_getBool(IDL_PROPERTY_SUPPORT)) { current->mtype = Property; } @@ -3459,7 +3459,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) current->spec |= Entry::Optional; } <IDLAttribute>"readonly" { // on UNO IDL attribute or property - if (Config_getBool("IDL_PROPERTY_SUPPORT") && odlProp) + if (Config_getBool(IDL_PROPERTY_SUPPORT) && odlProp) { current->spec ^= Entry::Settable; } @@ -3967,7 +3967,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) if (!msName.isEmpty() /*&& msName!=current->name*/) // skip typedef T {} T;, removed due to bug608493 { - static bool typedefHidesStruct = Config_getBool("TYPEDEF_HIDES_STRUCT"); + static bool typedefHidesStruct = Config_getBool(TYPEDEF_HIDES_STRUCT); // case 1: typedef struct _S { ... } S_t; // -> omit typedef and use S_t as the struct name if (typedefHidesStruct && @@ -5079,8 +5079,8 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) docBlockContext = SkipCurlyEndDoc; docBlockInBody = FALSE; - docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool("JAVADOC_AUTOBRIEF") ) || - ( yytext[yyleng-2]=='!' && Config_getBool("QT_AUTOBRIEF") ); + docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) || + ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) ); docBlock.resize(0); docBlockTerm = '}'; if (yytext[yyleng-3]=='/') @@ -5098,8 +5098,8 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) <SkipCurlyEndDoc>"}"{BN}*("/*!"|"/**"|"//!"|"///")"<" { // desc is followed by another one docBlockContext = SkipCurlyEndDoc; docBlockInBody = FALSE; - docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool("JAVADOC_AUTOBRIEF") ) || - ( yytext[yyleng-2]=='!' && Config_getBool("QT_AUTOBRIEF") ); + docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) || + ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) ); docBlock.resize(0); docBlockTerm = '}'; if (yytext[yyleng-3]=='/') @@ -5733,7 +5733,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) { if (current->section==Entry::NAMESPACE_SEC) // allow reopening of anonymous namespaces { - if (Config_getBool("EXTRACT_ANON_NSPACES")) // use visible name + if (Config_getBool(EXTRACT_ANON_NSPACES)) // use visible name { current->name="anonymous_namespace{"+stripPath(current->fileName)+"}"; } @@ -6033,7 +6033,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) } docBlockContext = YY_START; docBlockInBody = YY_START==SkipCurly; - docBlockAutoBrief = Config_getBool("QT_AUTOBRIEF"); + docBlockAutoBrief = Config_getBool(QT_AUTOBRIEF); QCString indent; indent.fill(' ',computeIndent(yytext,g_column)); @@ -6060,7 +6060,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) current->docFile = yyFileName; docBlockContext = YY_START; docBlockInBody = YY_START==SkipCurly; - static bool javadocAutoBrief = Config_getBool("JAVADOC_AUTOBRIEF"); + static bool javadocAutoBrief = Config_getBool(JAVADOC_AUTOBRIEF); docBlockAutoBrief = javadocAutoBrief; QCString indent; @@ -6621,7 +6621,7 @@ static void newEntry() static void handleCommentBlock(const QCString &doc,bool brief) { - static bool hideInBodyDocs = Config_getBool("HIDE_IN_BODY_DOCS"); + static bool hideInBodyDocs = Config_getBool(HIDE_IN_BODY_DOCS); int position=0; bool needsEntry=FALSE; if (docBlockInBody && hideInBodyDocs) return; @@ -6767,7 +6767,7 @@ static void parseCompounds(Entry *rt) initEntry(); // deep copy group list from parent (see bug 727732) - static bool autoGroupNested = Config_getBool("GROUP_NESTED_COMPOUNDS"); + static bool autoGroupNested = Config_getBool(GROUP_NESTED_COMPOUNDS); if (autoGroupNested && rt->groups && ce->section!=Entry::ENUM_SEC && !(ce->spec&Entry::Enum)) { QListIterator<Grouping> gli(*rt->groups); diff --git a/src/searchindex.cpp b/src/searchindex.cpp index 9bfe7b0..500ed65 100644 --- a/src/searchindex.cpp +++ b/src/searchindex.cpp @@ -92,7 +92,7 @@ void SearchIndex::setCurrentDoc(Definition *ctx,const char *anchor,bool isSource assert(!isSourceFile || ctx->definitionType()==Definition::TypeFile); //printf("SearchIndex::setCurrentDoc(%s,%s,%s)\n",name,baseName,anchor); QCString url=isSourceFile ? ((FileDef*)ctx)->getSourceFileBase() : ctx->getOutputFileBase(); - url+=Config_getString("HTML_FILE_EXTENSION"); + url+=Config_getString(HTML_FILE_EXTENSION); QCString baseUrl = url; if (anchor) url+=QCString("#")+anchor; if (!isSourceFile) baseUrl=url; @@ -499,7 +499,7 @@ static QCString definitionToName(Definition *ctx) void SearchIndexExternal::setCurrentDoc(Definition *ctx,const char *anchor,bool isSourceFile) { - QCString extId = stripPath(Config_getString("EXTERNAL_SEARCH_ID")); + QCString extId = stripPath(Config_getString(EXTERNAL_SEARCH_ID)); QCString baseName = isSourceFile ? ((FileDef*)ctx)->getSourceFileBase() : ctx->getOutputFileBase(); QCString url = baseName + Doxygen::htmlFileExtension; if (anchor) url+=QCString("#")+anchor; @@ -587,7 +587,7 @@ static SearchIndexInfo g_searchIndexInfo[NUM_SEARCH_INDICES]; static void addMemberToSearchIndex(MemberDef *md) { - static bool hideFriendCompounds = Config_getBool("HIDE_FRIEND_COMPOUNDS"); + static bool hideFriendCompounds = Config_getBool(HIDE_FRIEND_COMPOUNDS); bool isLinkable = md->isLinkable(); ClassDef *cd=0; NamespaceDef *nd=0; @@ -904,7 +904,7 @@ void writeJavascriptSearchIndex() { int i; // write index files - QCString searchDirName = Config_getString("HTML_OUTPUT")+"/search"; + QCString searchDirName = Config_getString(HTML_OUTPUT)+"/search"; for (i=0;i<NUM_SEARCH_INDICES;i++) // for each index { @@ -1003,7 +1003,7 @@ void writeJavascriptSearchIndex() } ti << "',"; - static bool extLinksInWindow = Config_getBool("EXT_LINKS_IN_WINDOW"); + static bool extLinksInWindow = Config_getBool(EXT_LINKS_IN_WINDOW); if (!extLinksInWindow || d->getReference().isEmpty()) { ti << "1,"; @@ -1062,7 +1062,7 @@ void writeJavascriptSearchIndex() } ti << "',"; - static bool extLinksInWindow = Config_getBool("EXT_LINKS_IN_WINDOW"); + static bool extLinksInWindow = Config_getBool(EXT_LINKS_IN_WINDOW); if (!extLinksInWindow || d->getReference().isEmpty()) { ti << "1,"; @@ -1297,9 +1297,9 @@ int SearchIndexList::compareValues(const SearchDefinitionList *md1, const Search void initSearchIndexer() { - static bool searchEngine = Config_getBool("SEARCHENGINE"); - static bool serverBasedSearch = Config_getBool("SERVER_BASED_SEARCH"); - static bool externalSearch = Config_getBool("EXTERNAL_SEARCH"); + static bool searchEngine = Config_getBool(SEARCHENGINE); + static bool serverBasedSearch = Config_getBool(SERVER_BASED_SEARCH); + static bool externalSearch = Config_getBool(EXTERNAL_SEARCH); if (searchEngine && serverBasedSearch) { if (externalSearch) // external tools produce search index and engine diff --git a/src/sqlite3gen.cpp b/src/sqlite3gen.cpp index ba72b55..670249e 100644 --- a/src/sqlite3gen.cpp +++ b/src/sqlite3gen.cpp @@ -1282,7 +1282,7 @@ void generateSqlite3() // + examples // + main page - QCString outputDirectory = Config_getString("OUTPUT_DIRECTORY"); + QCString outputDirectory = Config_getString(OUTPUT_DIRECTORY); QDir sqlite3Dir(outputDirectory); sqlite3 *db; sqlite3_initialize(); diff --git a/src/tclscanner.l b/src/tclscanner.l index 5e249a6..a29db5b 100644 --- a/src/tclscanner.l +++ b/src/tclscanner.l @@ -2818,24 +2818,21 @@ static void tcl_init() { // Get values from option TCL_SUBST tcl.config_subst.clear(); - if (Config::instance()->get("TCL_SUBST")) + QStrList myStrList = Config_getList(TCL_SUBST); + const char *s=myStrList.first(); + while (s) { - QStrList myStrList = Config_getList("TCL_SUBST"); - const char *s=myStrList.first(); - while (s) + QCString myStr=s; + int i=myStr.find('='); + if (i>0) { - QCString myStr=s; - int i=myStr.find('='); - if (i>0) - { - QCString myName=myStr.left(i).stripWhiteSpace(); - QCString myValue=myStr.right(myStr.length()-i-1).stripWhiteSpace(); - if (!myName.isEmpty() && !myValue.isEmpty()) -tcl_inf("TCL_SUBST: use '%s'\n",s); - tcl.config_subst[myName] = myValue; - } - s = myStrList.next(); + QCString myName=myStr.left(i).stripWhiteSpace(); + QCString myValue=myStr.right(myStr.length()-i-1).stripWhiteSpace(); + if (!myName.isEmpty() && !myValue.isEmpty()) + tcl_inf("TCL_SUBST: use '%s'\n",s); + tcl.config_subst[myName] = myValue; } + s = myStrList.next(); } if (tcl.input_string.at(tcl.input_string.length()-1) == 0x1A) @@ -2854,7 +2851,7 @@ tcl_inf("TCL_SUBST: use '%s'\n",s); tcl.code_font=NULL; tcl.code_line=1; tcl.code_linenumbers=1; - tcl.config_autobrief = Config_getBool("JAVADOC_AUTOBRIEF"); + tcl.config_autobrief = Config_getBool(JAVADOC_AUTOBRIEF); tcl.input_position = 0; tcl.file_name = NULL; tcl.this_parser = NULL; diff --git a/src/tooltip.cpp b/src/tooltip.cpp index 957c661..3b128a9 100644 --- a/src/tooltip.cpp +++ b/src/tooltip.cpp @@ -70,7 +70,7 @@ static QCString escapeId(const char *s) void TooltipManager::addTooltip(Definition *d) { - static bool sourceTooltips = Config_getBool("SOURCE_TOOLTIPS"); + static bool sourceTooltips = Config_getBool(SOURCE_TOOLTIPS); if (!sourceTooltips) return; QCString id = d->getOutputFileBase(); int i=id.findRev('/'); diff --git a/src/translator_am.h b/src/translator_am.h index b50aec2..9e72529 100644 --- a/src/translator_am.h +++ b/src/translator_am.h @@ -65,7 +65,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 /*! header that is put before the list of member attributes. */
virtual QCString trMemberDataDocumentation()
{
- if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+ if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C))
{
return "Դաշտեր";
}
@@ -139,7 +139,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 /*! This is put above each page as a link to the list of annotated classes */
virtual QCString trCompoundList()
{
- if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+ if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C))
{
return "Տվյալների կառուցվածք";
}
@@ -156,7 +156,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 /*! This is put above each page as a link to all members of compounds. */
virtual QCString trCompoundMembers()
{
- if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+ if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C))
{
return "Տվյալների դաշտեր";
}
@@ -170,7 +170,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 /*??*/
virtual QCString trFileMembers()
{
- if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+ if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C))
{
return "Գլոբալներ";
}
@@ -210,7 +210,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 /*! This is an introduction to the annotated compound list. */
virtual QCString trCompoundListDescription()
{
- if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+ if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C))
{
return "Տվյալների կառուցվածքը` կարճ բացատրություններով.";
}
@@ -226,7 +226,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 {
QCString result="Բոլոր ";
if(!extractAll) result+="փաստագրված ";
- if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+ if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C))
result+="կառուցվածքների և միավորումների դաշտերի ";
else
result+="դասի անդամների ";
@@ -234,14 +234,14 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 result+=" հղումներով դեպի ";
if(!extractAll)
{
- if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+ if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C))
result+="կառուցվածք/միավորում փաստագրությունները բոլոր անդամների համար.";
else
result+="դասի փաստագրությունը բոլոր անդամների համար.";
}
else
{
- if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+ if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C))
result += "կառուցվածքները/միավորումները, որոնց նրանք պատկանում են.";
else
result += "դասերը, որոնց նրանք պատկանում են.";
@@ -255,7 +255,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 QCString result="Բոլոր ";
if (!extractAll) result+="փաստագրված ";
- if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+ if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C))
{
result+="ֆունկցիաների, փոփոխականների, մակրո-հայտարարությունների, "
"համարակալումների և տիպի սահմանումների (typedef)";
@@ -309,7 +309,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 */
virtual QCString trCompoundIndex()
{
- if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+ if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C))
{
return "Տվյալների կառուցվածք";
}
@@ -336,7 +336,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 */
virtual QCString trClassDocumentation()
{
- if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+ if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C))
{
return "Տվյալների կառուցվածքներ";
}
@@ -439,7 +439,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 */
virtual QCString trCompounds()
{
- if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+ if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C))
{
return "Տվյալների կառուցվածք";
}
@@ -865,7 +865,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 }
virtual QCString trPublicAttribs()
{
- if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+ if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C))
{
return "Տվյալների դաշտեր";
}
@@ -1062,7 +1062,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 /*! Used for Java classes in the summary section of Java packages */
virtual QCString trClasses()
{
- if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+ if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C))
{
return "Տվյալների կառուցվածք";
}
@@ -1137,7 +1137,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 */
virtual QCString trClass(bool first_capital, bool singular)
{
- if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
+ if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C))
{
QCString result((first_capital ? "Տվյալների կառուցվածք" : "տվյալների կառուցվածք"));
return result;
diff --git a/src/translator_ar.h b/src/translator_ar.h index 5daaa4c..24281fd 100644 --- a/src/translator_ar.h +++ b/src/translator_ar.h @@ -97,7 +97,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6 /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "توثيق الحقل"; } @@ -164,7 +164,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6 /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "هياكل البيانات"; } @@ -185,7 +185,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6 /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "حقول البيانات"; } @@ -198,7 +198,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6 /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "العوام"; } @@ -239,7 +239,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6 virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "هذه هي هياكل البيانات مع وصف مختصر:"; } @@ -255,7 +255,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6 { QCString result="هذه قائمة بكل "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="حقول البناءات والإتحادات"; } @@ -270,7 +270,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6 result+=" مع وصلات إلى "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="توثيق البناء/الإتحاد لكل حقل:"; } @@ -281,7 +281,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6 } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="البناءات/الإتحادات التي ينتمون إليها:"; } @@ -299,7 +299,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6 QCString result="Here is a list of all "; if (!extractAll) result+="documented "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="functions, variables, defines, enums, and typedefs"; } @@ -361,7 +361,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6 */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "فهرس هيكل البيانات"; } @@ -388,7 +388,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6 */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "فهرس هيكل البيانات"; } @@ -497,7 +497,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6 */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "هياكل البيانات"; } @@ -917,7 +917,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6 } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "حقول بيانات"; } @@ -1118,7 +1118,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6 /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "هياكل البيانات"; } diff --git a/src/translator_br.h b/src/translator_br.h index f9fe664..5e2d305 100644 --- a/src/translator_br.h +++ b/src/translator_br.h @@ -95,7 +95,7 @@ class TranslatorBrazilian : public Translator /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Campos"; } @@ -162,7 +162,7 @@ class TranslatorBrazilian : public Translator /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Estruturas de Dados"; } @@ -179,7 +179,7 @@ class TranslatorBrazilian : public Translator /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Campos de Dados"; } @@ -192,7 +192,7 @@ class TranslatorBrazilian : public Translator /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Globais"; } @@ -231,7 +231,7 @@ class TranslatorBrazilian : public Translator virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Aqui estão as estruturas de dados, uniões e suas respectivas descrições:"; } @@ -246,7 +246,7 @@ class TranslatorBrazilian : public Translator { QCString result="Esta é a lista de "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="todas as estruturas e campos de uniões "; if (!extractAll) @@ -265,7 +265,7 @@ class TranslatorBrazilian : public Translator result+=" com referências para "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="a documentação da estrutura/união de cada campo:"; } @@ -276,7 +276,7 @@ class TranslatorBrazilian : public Translator } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="a estrutura/união a que pertencem:"; } @@ -292,7 +292,7 @@ class TranslatorBrazilian : public Translator virtual QCString trFileMembersDescription(bool extractAll) { QCString result="Esta é a lista de "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="todas as funções, variáveis, definições, enumerações e definições de tipos "; if (!extractAll) result+="documentadas "; @@ -343,7 +343,7 @@ class TranslatorBrazilian : public Translator */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Índice das Estruturas de Dados"; } @@ -370,7 +370,7 @@ class TranslatorBrazilian : public Translator */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Estruturas"; } @@ -473,7 +473,7 @@ class TranslatorBrazilian : public Translator */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Estruturas de Dados"; } @@ -885,7 +885,7 @@ class TranslatorBrazilian : public Translator } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Campos de Dados"; } @@ -1074,7 +1074,7 @@ class TranslatorBrazilian : public Translator /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Estruturas de Dados"; } diff --git a/src/translator_ca.h b/src/translator_ca.h index d4aca52..ca9b7e9 100644 --- a/src/translator_ca.h +++ b/src/translator_ca.h @@ -104,7 +104,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0 /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Documentació dels Camps"; } @@ -171,7 +171,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0 /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Estructures de Dades"; } @@ -188,7 +188,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0 /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Camps de Dades"; } @@ -201,7 +201,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0 /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Globals"; } @@ -242,7 +242,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0 virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Aquestes són les estructures de dades acompanyades amb breus descripcions:"; } @@ -257,7 +257,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0 virtual QCString trCompoundMembersDescription(bool extractAll) { QCString result="Aquesta és la llista de tots els "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="camps d'estructures i unions"; } @@ -272,7 +272,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0 result+=" amb enllaços a "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="la documentació de l'estructura/unió per a cada camp:"; } @@ -283,7 +283,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0 } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="les estructures/unions a que pertanyen:"; } @@ -298,7 +298,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0 virtual QCString trFileMembersDescription(bool extractAll) { QCString result="Aquesta és la llista de "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="totes les funcions, variables, definicions, enumeracions, i definicions de tipus"; if (!extractAll) result+=" documentades"; @@ -352,7 +352,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0 */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Índex d'Estructures de Dades"; } @@ -379,7 +379,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0 */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Documentació de les Estructures de Dades"; } @@ -482,7 +482,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0 */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Estructures de Dades"; } @@ -894,7 +894,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0 } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Camps de Dades"; } @@ -1083,7 +1083,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0 /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Estructures de Dades"; } diff --git a/src/translator_cn.h b/src/translator_cn.h index eae4014..832d2c7 100644 --- a/src/translator_cn.h +++ b/src/translator_cn.h @@ -86,7 +86,7 @@ class TranslatorChinese : public Translator /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "结构体成员变量说明"; } @@ -154,7 +154,7 @@ class TranslatorChinese : public Translator /*! This is put above each page as a link to the list of annotated class */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "结构体"; } else { @@ -169,7 +169,7 @@ class TranslatorChinese : public Translator /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "成员变量"; } else { @@ -180,7 +180,7 @@ class TranslatorChinese : public Translator /*! This is put above each page as a link to all member of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "全局定义"; } else { return "文件成员"; @@ -211,7 +211,7 @@ class TranslatorChinese : public Translator virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "这里列出了所有结构体，并附带简要说明:"; } @@ -227,7 +227,7 @@ class TranslatorChinese : public Translator if (!extractAll) { result+="文档化的"; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="结构体和联合体的成员变量，并附带"; } else { @@ -235,7 +235,7 @@ class TranslatorChinese : public Translator } //result+=" with links to "; if (extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="结构体或联合的详细说明:"; } else { @@ -243,7 +243,7 @@ class TranslatorChinese : public Translator } } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="结构或联合所属的文件:"; } else { @@ -258,7 +258,7 @@ class TranslatorChinese : public Translator QCString result="这里列出了所有"; if (!extractAll) result +="文档化的"; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result +="函数,变量,宏,枚举和类型定义等,并附带"; } else { @@ -292,7 +292,7 @@ class TranslatorChinese : public Translator virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "结构体索引"; } @@ -309,7 +309,7 @@ class TranslatorChinese : public Translator virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "结构体说明"; } @@ -366,7 +366,7 @@ class TranslatorChinese : public Translator virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "结构体"; } @@ -776,7 +776,7 @@ class TranslatorChinese : public Translator virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "成员变量"; } @@ -978,7 +978,7 @@ class TranslatorChinese : public Translator /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "结构体"; } diff --git a/src/translator_cz.h b/src/translator_cz.h index e4a5692..056d0e4 100644 --- a/src/translator_cz.h +++ b/src/translator_cz.h @@ -128,7 +128,7 @@ class TranslatorCzech : public Translator /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Dokumentace k položkám"; } @@ -196,7 +196,7 @@ class TranslatorCzech : public Translator /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datové struktury"; } @@ -213,7 +213,7 @@ class TranslatorCzech : public Translator /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datové položky"; } @@ -226,7 +226,7 @@ class TranslatorCzech : public Translator /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Globální symboly"; } @@ -266,7 +266,7 @@ class TranslatorCzech : public Translator /*! This is an introduction to the annotated compound list. */ virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Následující seznam obsahuje identifikace datových " "struktur a jejich stručné popisy:"; @@ -290,7 +290,7 @@ class TranslatorCzech : public Translator result += "dokumentovaných "; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result += "položek struktur (struct) a unií (union) "; } @@ -303,7 +303,7 @@ class TranslatorCzech : public Translator if (extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result += "dokumentaci struktur/unií, ke kterým příslušejí:"; } @@ -314,7 +314,7 @@ class TranslatorCzech : public Translator } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="struktury/unie, ke kterým příslušejí:"; } @@ -333,7 +333,7 @@ class TranslatorCzech : public Translator QCString result="Zde naleznete seznam všech "; if (!extractAll) result+="dokumentovaných "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="funkcí, proměnných, maker, výčtů a definic typů (typedef) " "s odkazy na "; @@ -388,7 +388,7 @@ class TranslatorCzech : public Translator */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Rejstřík datových struktur"; } @@ -415,7 +415,7 @@ class TranslatorCzech : public Translator */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Dokumentace datových struktur"; } @@ -518,7 +518,7 @@ class TranslatorCzech : public Translator */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datové struktry"; } @@ -942,7 +942,7 @@ class TranslatorCzech : public Translator } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datové položky"; } diff --git a/src/translator_de.h b/src/translator_de.h index 7d3d63a..5bab24d 100644 --- a/src/translator_de.h +++ b/src/translator_de.h @@ -245,7 +245,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4 /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datenstrukturen"; } @@ -262,7 +262,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4 /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datenstruktur-Elemente"; } @@ -307,7 +307,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4 /*! This is an introduction to the annotated compound list. */ virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Hier folgt die Aufzählung aller Datenstrukturen " "mit einer Kurzbeschreibung:"; @@ -327,7 +327,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4 { result+="dokumentierten "; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="Strukturen und Varianten"; } @@ -338,7 +338,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4 result+=" mit Verweisen auf "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="die Dokumentation zu jedem Element:"; } @@ -349,7 +349,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4 } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="die zugehörigen Elemente:"; } @@ -366,7 +366,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4 { QCString result="Hier folgt die Aufzählung aller "; if (!extractAll) result+="dokumentierten "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="Funktionen, Variablen, Makros, Aufzählungen und Typdefinitionen"; } @@ -417,7 +417,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4 */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) return "Datenstruktur-Verzeichnis"; else return "Klassen-Verzeichnis"; @@ -440,7 +440,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4 */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datenstruktur-Dokumentation"; } @@ -543,7 +543,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4 */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datenstrukturen"; } @@ -977,7 +977,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4 virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datenfelder"; } @@ -1195,7 +1195,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4 /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) return "Datenstrukturen"; else return "Klassen"; diff --git a/src/translator_dk.h b/src/translator_dk.h index 9ea5b28..e98cfa8 100644 --- a/src/translator_dk.h +++ b/src/translator_dk.h @@ -151,7 +151,7 @@ class TranslatorDanish : public TranslatorAdapter_1_8_0 /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Felt-dokumentation"; } else { return "Dokumentation af feltvariable"; @@ -215,7 +215,7 @@ class TranslatorDanish : public TranslatorAdapter_1_8_0 /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datastrukturer"; } else { return "Oversigt over sammensatte typer"; @@ -229,7 +229,7 @@ class TranslatorDanish : public TranslatorAdapter_1_8_0 /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Data-felter"; } else { return "Felter i sammensatte typer"; @@ -239,7 +239,7 @@ class TranslatorDanish : public TranslatorAdapter_1_8_0 /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Globale symboler"; } else { return "Placering i filer"; // Fil-medlemmer"; //TODO @@ -278,7 +278,7 @@ class TranslatorDanish : public TranslatorAdapter_1_8_0 virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Her er datastrukturerne med korte beskrivelser:"; } else { return "Her er klasserne, datastrukturerne, " @@ -293,20 +293,20 @@ class TranslatorDanish : public TranslatorAdapter_1_8_0 if (!extractAll) { result+="dokumenterede "; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="felter i datastrukturer og unioner"; } else { result+="klassemedlemmer"; } result+=" med links til "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="datastruktur/unions-dokumentationen for hvert felt:"; } else { result+="klassedokumentationen for hvert medlem:"; } } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="de datastrukturer/unioner, de hører til:"; } else { result+="de klasser, de hører til:"; @@ -321,7 +321,7 @@ class TranslatorDanish : public TranslatorAdapter_1_8_0 QCString result="Her er en liste over alle "; if (!extractAll) result+="dokumenterede "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="funktioner, variable, #defines, enumerationer " "og typedefinitioner"; } else { @@ -368,7 +368,7 @@ class TranslatorDanish : public TranslatorAdapter_1_8_0 */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Indeks over datastrukturer"; } else { return "Indeks over sammensatte typer"; @@ -392,7 +392,7 @@ class TranslatorDanish : public TranslatorAdapter_1_8_0 */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datastruktur-documentation"; } else { return "Klasse-dokumentation"; @@ -498,7 +498,7 @@ class TranslatorDanish : public TranslatorAdapter_1_8_0 */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datastrukturer"; } else { return "Sammensatte typer"; @@ -883,7 +883,7 @@ class TranslatorDanish : public TranslatorAdapter_1_8_0 virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datafelter"; } else { return "Offentlige attributter"; @@ -1067,7 +1067,7 @@ class TranslatorDanish : public TranslatorAdapter_1_8_0 /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datastrukturer"; } else { return "Klasser"; diff --git a/src/translator_en.h b/src/translator_en.h index a72c05a..1fad97a 100644 --- a/src/translator_en.h +++ b/src/translator_en.h @@ -103,7 +103,7 @@ class TranslatorEnglish : public Translator /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Field Documentation"; } @@ -170,7 +170,7 @@ class TranslatorEnglish : public Translator /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Data Structures"; } @@ -187,7 +187,7 @@ class TranslatorEnglish : public Translator /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Data Fields"; } @@ -200,7 +200,7 @@ class TranslatorEnglish : public Translator /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Globals"; } @@ -241,7 +241,7 @@ class TranslatorEnglish : public Translator virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Here are the data structures with brief descriptions:"; } @@ -260,7 +260,7 @@ class TranslatorEnglish : public Translator { result+="documented "; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="struct and union fields"; } @@ -271,7 +271,7 @@ class TranslatorEnglish : public Translator result+=" with links to "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="the struct/union documentation for each field:"; } @@ -282,7 +282,7 @@ class TranslatorEnglish : public Translator } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="the structures/unions they belong to:"; } @@ -300,7 +300,7 @@ class TranslatorEnglish : public Translator QCString result="Here is a list of all "; if (!extractAll) result+="documented "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="functions, variables, defines, enums, and typedefs"; } @@ -351,7 +351,7 @@ class TranslatorEnglish : public Translator */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Data Structure Index"; } @@ -378,7 +378,7 @@ class TranslatorEnglish : public Translator */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Data Structure Documentation"; } @@ -481,7 +481,7 @@ class TranslatorEnglish : public Translator */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Data Structures"; } @@ -888,7 +888,7 @@ class TranslatorEnglish : public Translator } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Data Fields"; } @@ -1086,7 +1086,7 @@ class TranslatorEnglish : public Translator /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Data Structures"; } diff --git a/src/translator_eo.h b/src/translator_eo.h index 5415e81..28876d7 100644 --- a/src/translator_eo.h +++ b/src/translator_eo.h @@ -105,7 +105,7 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4 /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Kampa Dokumentado"; } @@ -172,7 +172,7 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4 /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datumstruktoroj"; } @@ -189,7 +189,7 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4 /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datumkampoj"; } @@ -202,7 +202,7 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4 /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Mallokalaĵoj"; } @@ -243,7 +243,7 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4 virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Jen datumstrukturoj kun mallongaj priskriboj:"; } @@ -262,7 +262,7 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4 { result+="dokumentitaj "; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="strukturaj kaj kunigaj kampoj"; } @@ -273,7 +273,7 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4 result+=" kun ligiloj al "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="la struktura/kuniga dokumentado por ĉiu kampo:"; } @@ -284,7 +284,7 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4 } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="la strukturoj/kunigoj al kiuj ili apartenas:"; } @@ -302,7 +302,7 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4 QCString result="Jen listo de ĉiuj "; if (!extractAll) result+="dokumentitaj "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="funkcioj, variabloj, difinoj, enumeracioj kaj tipodifinoj"; } @@ -353,7 +353,7 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4 */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datumstruktura Indekso"; } @@ -380,7 +380,7 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4 */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datumstruktura Dokumentado"; } @@ -483,7 +483,7 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4 */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datumstrukturoj"; } @@ -891,7 +891,7 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4 } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datumkampoj"; } @@ -1086,7 +1086,7 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4 /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datumstrukturoj"; } diff --git a/src/translator_es.h b/src/translator_es.h index 1b75465..5cdbb1f 100644 --- a/src/translator_es.h +++ b/src/translator_es.h @@ -97,7 +97,7 @@ class TranslatorSpanish : public Translator /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Documentación de los campos"; } @@ -164,7 +164,7 @@ class TranslatorSpanish : public Translator /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Estructura de datos"; } @@ -181,7 +181,7 @@ class TranslatorSpanish : public Translator /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Campos de datos"; } @@ -194,7 +194,7 @@ class TranslatorSpanish : public Translator /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Globales"; } @@ -234,7 +234,7 @@ class TranslatorSpanish : public Translator /*! This is an introduction to the annotated compound list. */ virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Lista de estructuras con una breve descripción:"; } @@ -249,7 +249,7 @@ class TranslatorSpanish : public Translator virtual QCString trCompoundMembersDescription(bool extractAll) { QCString result="Lista de todos los "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="campos de estructuras y uniones"; } @@ -264,7 +264,7 @@ class TranslatorSpanish : public Translator result+=" con enlaces a "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="la documentación de la estructura/unión para cada campo:"; } @@ -275,7 +275,7 @@ class TranslatorSpanish : public Translator } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="las estructuras/uniones a que pertenecen:"; } @@ -291,7 +291,7 @@ class TranslatorSpanish : public Translator virtual QCString trFileMembersDescription(bool extractAll) { QCString result="Lista de "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="todas las funciones, variables, 'defines', enumeraciones y 'typedefs'"; } @@ -343,7 +343,7 @@ class TranslatorSpanish : public Translator */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Índice de estructura de datos"; } @@ -370,7 +370,7 @@ class TranslatorSpanish : public Translator */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Documentación de las estructuras de datos"; } @@ -473,7 +473,7 @@ class TranslatorSpanish : public Translator */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Estructuras de datos"; } @@ -906,7 +906,7 @@ class TranslatorSpanish : public Translator virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Campos de datos"; } @@ -1119,7 +1119,7 @@ class TranslatorSpanish : public Translator /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Estructuras de Datos"; } diff --git a/src/translator_fa.h b/src/translator_fa.h index 7effafe..5a37330 100644 --- a/src/translator_fa.h +++ b/src/translator_fa.h @@ -120,7 +120,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5 /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Field مستندات"; } @@ -187,7 +187,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5 /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "ساختار های داده "; } @@ -204,7 +204,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5 /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "فضاهای داده ها"; } @@ -217,7 +217,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5 /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Globals"; } @@ -257,7 +257,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5 virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "ليست ساختارهای داده به همراه توضيحی کوتاه :"; } @@ -280,7 +280,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5 result+="همه ی اعضاء "; } result+=" به همراه ارتباطشان با "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="ساختارهای داده "; } @@ -289,7 +289,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5 result+="كلاس ها "; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="و مستندات ساختار داده برای هر عضو "; } @@ -348,7 +348,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5 */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "فهرست ساختار داده ها"; } @@ -375,7 +375,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5 */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "مستندات ساختار داده ها"; } @@ -484,7 +484,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5 */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "ساختارهای داده"; } @@ -889,7 +889,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5 } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "فضاهای داده ها"; } @@ -1084,7 +1084,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5 /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "ساختار های داده"; } diff --git a/src/translator_fi.h b/src/translator_fi.h index 8343cdd..2b94f48 100644 --- a/src/translator_fi.h +++ b/src/translator_fi.h @@ -160,7 +160,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0 /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Kenttien dokumentaatio"; // "Field Documentation"; } @@ -232,7 +232,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0 /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Tietueet"; // "Data Structures" } @@ -249,7 +249,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0 /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Tietueen kentät"; // "Data Fields" } @@ -262,7 +262,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0 /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Globaalit"; // "Globals" } @@ -303,7 +303,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0 virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Tässä ovat tietueet lyhyen selitteen kanssa:"; // "Here are the data structures with brief descriptions:" } @@ -322,7 +322,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0 { result+="dokumentoiduista "; // "documented " } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="tietuiden ja yhdisteiden kentistä"; // "struct and union fields" } @@ -333,7 +333,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0 result+=" linkitettyinä "; // " with links to " if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="jokaisen kentän tietueen/yhdisteen dokumentaatioon:"; // "the struct/union documentation for each field:" } @@ -344,7 +344,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0 } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+= "tietueisiin/yhdisteisiin, joihin ne kuuluvat:"; // "the structures/unions they belong to:" } @@ -362,7 +362,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0 QCString result="Tässä on lista kaikista "; // "Here is a list of all " if (!extractAll) result+="dokumentoiduista "; // "documented " - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="funktioista, muuttujista, määrittelyistä, luettelotyypeistä ja tyyppimäärittelyistä"; // "functions, variables, defines, enums, and typedefs" } @@ -413,7 +413,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0 */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Tietueluettelo"; // "Data Structure Index" } @@ -440,7 +440,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0 */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Tietueiden dokumentaatio"; // "Data Structure Documentation" } @@ -543,7 +543,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0 */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Tietueet"; // "Data Structures" } @@ -956,7 +956,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0 } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Tietueen kentät"; // "Data Fields" } @@ -1202,7 +1202,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0 /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Tietueet"; // "Data Structures" } diff --git a/src/translator_fr.h b/src/translator_fr.h index 65e77df..7f44d37 100644 --- a/src/translator_fr.h +++ b/src/translator_fr.h @@ -163,7 +163,7 @@ class TranslatorFrench : public Translator /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Documentation des champs"; } @@ -230,7 +230,7 @@ class TranslatorFrench : public Translator /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Structures de données"; } @@ -247,7 +247,7 @@ class TranslatorFrench : public Translator /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Champs de donnée"; } @@ -260,7 +260,7 @@ class TranslatorFrench : public Translator /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Variables globale"; } @@ -301,7 +301,7 @@ class TranslatorFrench : public Translator virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Liste des structures de données avec une brève description :"; } @@ -316,7 +316,7 @@ class TranslatorFrench : public Translator virtual QCString trCompoundMembersDescription(bool extractAll) { QCString result="Liste de tous les "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="champs de structure et d'union "; } @@ -331,7 +331,7 @@ class TranslatorFrench : public Translator result+="avec des liens vers "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="la documentation de structure/union de chaque champ :"; } @@ -342,7 +342,7 @@ class TranslatorFrench : public Translator } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="les structures/unions auxquelles ils appartiennent :"; } @@ -359,7 +359,7 @@ class TranslatorFrench : public Translator { QCString result="Liste "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="de toutes les fonctions, variables, macros, enumérations, et définitions de type "; } @@ -409,7 +409,7 @@ class TranslatorFrench : public Translator */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Index des structures de données"; } @@ -436,7 +436,7 @@ class TranslatorFrench : public Translator */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Documentation des structures de données"; } @@ -539,7 +539,7 @@ class TranslatorFrench : public Translator */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Structures de données"; } @@ -951,7 +951,7 @@ class TranslatorFrench : public Translator } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Champs de données"; } @@ -1146,7 +1146,7 @@ class TranslatorFrench : public Translator /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Structures de données"; } diff --git a/src/translator_gr.h b/src/translator_gr.h index 713b4bb..8b7afe1 100644 --- a/src/translator_gr.h +++ b/src/translator_gr.h @@ -92,7 +92,7 @@ class TranslatorGreek : public Translator /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Τεκμηρίωση Πεδίων"; } @@ -159,7 +159,7 @@ class TranslatorGreek : public Translator /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Δομές Δεδομένων"; } @@ -176,7 +176,7 @@ class TranslatorGreek : public Translator /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Μέλη Δομών Δεδομένων"; } @@ -189,7 +189,7 @@ class TranslatorGreek : public Translator /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Καθολικοί ορισμοί"; } @@ -228,7 +228,7 @@ class TranslatorGreek : public Translator virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Ακολουθούν οι δομές δεδομένων με σύντομες περιγραφές:"; } @@ -247,7 +247,7 @@ class TranslatorGreek : public Translator { result+="τεκμηριωμένων "; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="μελών δομών δεδομένων και ενώσεων "; } @@ -258,7 +258,7 @@ class TranslatorGreek : public Translator result+=" με συνδέσμους "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="στην τεκμηρίωση των δομών/ενώσεων για κάθε πεδίο:"; } @@ -269,7 +269,7 @@ class TranslatorGreek : public Translator } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="στις δομές/ενώσεις που ανήκουν:"; } @@ -287,7 +287,7 @@ class TranslatorGreek : public Translator QCString result="Ακολουθεί η λίστα όλων των "; if (!extractAll) result+="τεκμηριωμένων "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="συναρτήσεων, μεταβλητών, ορισμών, απαριθμήσεων, και ορισμών τύπων"; } @@ -339,7 +339,7 @@ class TranslatorGreek : public Translator */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Ευρετήριο δομών δεδομένων"; } @@ -366,7 +366,7 @@ class TranslatorGreek : public Translator */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Τεκμηρίωση Δομών Δεδομένων"; } @@ -469,7 +469,7 @@ class TranslatorGreek : public Translator */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Δομές Δεδομένων"; } @@ -877,7 +877,7 @@ class TranslatorGreek : public Translator } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Πεδία Δεδομένων"; } @@ -1075,7 +1075,7 @@ class TranslatorGreek : public Translator /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Δομές Δεδομένων"; } diff --git a/src/translator_hr.h b/src/translator_hr.h index cfefa32..1d17e2a 100644 --- a/src/translator_hr.h +++ b/src/translator_hr.h @@ -134,7 +134,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2 { return "Stablo klasa"; } QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Sve strukture"; } @@ -147,7 +147,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2 { return "Popis datoteka"; } QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) return "Svi članovi struktura"; else return "Svi članovi klasa"; @@ -181,7 +181,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2 if (!extractAll) result+="dokumentiranih "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) result+="članova klasa s linkovima na "; else result+="članova struktura s linkovima na "; @@ -192,7 +192,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2 } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) result+="dokumentaciju klase :"; else result +="dokumentaciju strukture"; @@ -226,7 +226,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2 { return "Hijerarhijsko kazalo"; } QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Kazalo struktura podataka"; } @@ -241,7 +241,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2 { return "Dokumentacija modula"; } QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Dokumentacija struktura podataka"; } diff --git a/src/translator_hu.h b/src/translator_hu.h index 4bf3f71..17f0d44 100644 --- a/src/translator_hu.h +++ b/src/translator_hu.h @@ -87,7 +87,7 @@ class TranslatorHungarian : public TranslatorAdapter_1_4_6 /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Adatmezők dokumentációja"; } @@ -151,7 +151,7 @@ class TranslatorHungarian : public TranslatorAdapter_1_4_6 /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Adatszerkezetek"; } @@ -168,7 +168,7 @@ class TranslatorHungarian : public TranslatorAdapter_1_4_6 /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Adatmezők"; } @@ -181,7 +181,7 @@ class TranslatorHungarian : public TranslatorAdapter_1_4_6 /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Globális elemek"; } @@ -222,7 +222,7 @@ class TranslatorHungarian : public TranslatorAdapter_1_4_6 virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Az összes adatszerkezet listája rövid leírásokkal:"; } @@ -241,7 +241,7 @@ class TranslatorHungarian : public TranslatorAdapter_1_4_6 { result+="dokumentált "; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="struktúra- és úniómező"; } @@ -252,7 +252,7 @@ class TranslatorHungarian : public TranslatorAdapter_1_4_6 result+=" listája, valamint hivatkozás "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="a megfelelő struktúra-/úniódokumentációra minden mezőnél:"; } @@ -263,7 +263,7 @@ class TranslatorHungarian : public TranslatorAdapter_1_4_6 } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="a struktúrákra/úniókra, amikhez tartoznak:"; } @@ -281,7 +281,7 @@ class TranslatorHungarian : public TranslatorAdapter_1_4_6 QCString result="Az összes "; if (!extractAll) result+="dokumentált "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="függvény, változó, makródefiníció, enumeráció és típusdefiníció"; } @@ -333,7 +333,7 @@ class TranslatorHungarian : public TranslatorAdapter_1_4_6 */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Adatszerkezet-mutató"; } @@ -360,7 +360,7 @@ class TranslatorHungarian : public TranslatorAdapter_1_4_6 */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Adatszerkezetek dokumentációja"; } @@ -463,7 +463,7 @@ class TranslatorHungarian : public TranslatorAdapter_1_4_6 */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Adatszerkezetek"; } @@ -872,7 +872,7 @@ class TranslatorHungarian : public TranslatorAdapter_1_4_6 } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Adatmezők"; } @@ -1064,7 +1064,7 @@ class TranslatorHungarian : public TranslatorAdapter_1_4_6 /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Adatszerkezetek"; } diff --git a/src/translator_id.h b/src/translator_id.h index c5c58fa..2039c76 100644 --- a/src/translator_id.h +++ b/src/translator_id.h @@ -87,7 +87,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0 /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Dokumentasi Variabel"; } @@ -154,7 +154,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0 /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Struktur Data"; } @@ -171,7 +171,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0 /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Variabel Data"; } @@ -184,7 +184,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0 /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Daftar Definisi Global"; } @@ -225,7 +225,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0 virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Berikut ini daftar struktur data, dengan penjelasan singkat:"; } @@ -239,7 +239,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0 virtual QCString trCompoundMembersDescription(bool extractAll) { QCString result="Berikut ini daftar seluruh "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="variabel anggota struct dan union"; } @@ -254,7 +254,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0 result+=", dengan tautan ke "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="dokumentasi struct/union untuk setiap variabel:"; } @@ -265,7 +265,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0 } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="struct/union yang memuatnya:"; } @@ -282,7 +282,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0 { QCString result="Berikut ini daftar "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="fungsi, variabel, makro definisi, enumerasi, dan tipe"; } @@ -334,7 +334,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0 */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Indeks Struktur Data"; } @@ -361,7 +361,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0 */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Dokumentasi Struktur Data"; } @@ -464,7 +464,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0 */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Struktur Data"; } @@ -873,7 +873,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0 } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Variabel Data"; } @@ -1067,7 +1067,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0 /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Struktur Data"; } diff --git a/src/translator_it.h b/src/translator_it.h index e2c51c7..8f08b5a 100644 --- a/src/translator_it.h +++ b/src/translator_it.h @@ -141,7 +141,7 @@ class TranslatorItalian : public Translator /*! header that is put before the list of member attributes. */ QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Documentazione dei campi"; } @@ -209,7 +209,7 @@ class TranslatorItalian : public Translator /*! This is put above each page as a link to the list of annotated classes */ QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Strutture dati"; } @@ -226,7 +226,7 @@ class TranslatorItalian : public Translator /*! This is put above each page as a link to all members of compounds. */ QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Campi dei dati"; } @@ -239,7 +239,7 @@ class TranslatorItalian : public Translator /*! This is put above each page as a link to all members of files. */ QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Elementi globali"; } @@ -282,7 +282,7 @@ class TranslatorItalian : public Translator QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Queste sono le strutture dati con una loro breve descrizione:"; } @@ -296,7 +296,7 @@ class TranslatorItalian : public Translator QCString trCompoundMembersDescription(bool extractAll) { QCString result="Questo è un elenco "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { if (!extractAll) result+="delle struct e delle union documentate "; else result+="di tutte le struct e le union "; @@ -307,7 +307,7 @@ class TranslatorItalian : public Translator else result+="di tutti i membri "; } result+="con collegamenti alla documentazione "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { if (extractAll) result+="della struct/union per ciascun campo:"; else result+="delle struct/union a cui appartengono:"; @@ -324,7 +324,7 @@ class TranslatorItalian : public Translator QCString trFileMembersDescription(bool extractAll) { QCString result="Questo è un elenco "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { if (!extractAll) result+="delle funzioni, delle variabili, delle define, dei tipi enumerati e delle ridefinizioni dei tipi (typedef) documentate "; else result+="di tutte le funzioni, variabili, define, tipi enumerati, e ridefinizioni dei tipi (typedef) "; @@ -375,7 +375,7 @@ class TranslatorItalian : public Translator */ QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Indice delle strutture dati"; } @@ -496,7 +496,7 @@ class TranslatorItalian : public Translator */ QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Strutture dati"; } @@ -909,7 +909,7 @@ class TranslatorItalian : public Translator } QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Campi"; } @@ -1098,7 +1098,7 @@ class TranslatorItalian : public Translator /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Strutture dati"; } diff --git a/src/translator_jp.h b/src/translator_jp.h index 4dc9cba..c4f92c2 100644 --- a/src/translator_jp.h +++ b/src/translator_jp.h @@ -103,7 +103,7 @@ class TranslatorJapanese : public Translator /*! header that is put before the list of member functions. */ virtual QCString trMemberFunctionDocumentation() { - if( Config_getBool("OPTIMIZE_OUTPUT_JAVA")) + if( Config_getBool(OPTIMIZE_OUTPUT_JAVA)) { return "メソッド詳解"; } @@ -116,7 +116,7 @@ class TranslatorJapanese : public Translator /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if( Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if( Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "フィールド詳解"; } @@ -185,7 +185,7 @@ class TranslatorJapanese : public Translator /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "データ構造"; } @@ -202,7 +202,7 @@ class TranslatorJapanese : public Translator /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "データフィールド"; } @@ -215,7 +215,7 @@ class TranslatorJapanese : public Translator /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "大域各種"; } @@ -262,7 +262,7 @@ class TranslatorJapanese : public Translator virtual QCString trCompoundListDescription() { /* 概要がついているのは見ればわかるので省略 */ - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "データ構造一覧です。"; } @@ -275,7 +275,7 @@ class TranslatorJapanese : public Translator /*! This is an introduction to the page with all class members. */ virtual QCString trCompoundMembersDescription(bool extractAll) { - const bool forC = Config_getBool("OPTIMIZE_OUTPUT_FOR_C"); + const bool forC = Config_getBool(OPTIMIZE_OUTPUT_FOR_C); QCString result; if (forC) { @@ -332,7 +332,7 @@ class TranslatorJapanese : public Translator virtual QCString trFileMembersDescription(bool /*extractAll*/) { QCString result; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="関数・変数・マクロ・列挙・型定義"; } @@ -377,7 +377,7 @@ class TranslatorJapanese : public Translator */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "データ構造索引"; } @@ -404,7 +404,7 @@ class TranslatorJapanese : public Translator */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "データ構造詳解"; } @@ -506,7 +506,7 @@ class TranslatorJapanese : public Translator */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "データ構造"; } @@ -913,7 +913,7 @@ class TranslatorJapanese : public Translator } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "フィールド"; } @@ -1102,7 +1102,7 @@ class TranslatorJapanese : public Translator /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "データ構造"; } diff --git a/src/translator_kr.h b/src/translator_kr.h index 2ef50e8..1a720e2 100644 --- a/src/translator_kr.h +++ b/src/translator_kr.h @@ -118,7 +118,7 @@ class TranslatorKorean : public Translator /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "필드 문서화"; } @@ -185,7 +185,7 @@ class TranslatorKorean : public Translator /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "데이타 구조"; } @@ -202,7 +202,7 @@ class TranslatorKorean : public Translator /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "데이타 필드"; } @@ -215,7 +215,7 @@ class TranslatorKorean : public Translator /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "전역"; } @@ -255,7 +255,7 @@ class TranslatorKorean : public Translator virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "다음은 데이타 구조들입니다. (간략한 설명만을 보여줍니다) :"; } @@ -274,7 +274,7 @@ class TranslatorKorean : public Translator { result+="문서화된 "; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="모든 구조체와 공용체의 필드들"; } @@ -286,7 +286,7 @@ class TranslatorKorean : public Translator if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="각 필드들은 해당 필드에 대한 구조체와 공용체의 " "문서화 페이지의 링크를 가지고 있습니다. :"; @@ -299,7 +299,7 @@ class TranslatorKorean : public Translator } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="각 필드들은 해당 필드가 속해 있는 구조체와 공용체에 " "대한 링크를 가지고 있습니다. :"; @@ -319,7 +319,7 @@ class TranslatorKorean : public Translator QCString result="다음은 "; if (!extractAll) result+="문서화된 "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="모든 함수, 변수, 매크로, 열거형, 타입정의들"; } @@ -372,7 +372,7 @@ class TranslatorKorean : public Translator */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "데이타 구조 색인"; } @@ -399,7 +399,7 @@ class TranslatorKorean : public Translator */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "데이타 구조 문서화"; } @@ -502,7 +502,7 @@ class TranslatorKorean : public Translator */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "데이타 구조"; } @@ -911,7 +911,7 @@ class TranslatorKorean : public Translator } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "데이타 필드"; } @@ -1100,7 +1100,7 @@ class TranslatorKorean : public Translator /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "데이타 구조"; } diff --git a/src/translator_lt.h b/src/translator_lt.h index faf4197..f47d9d4 100644 --- a/src/translator_lt.h +++ b/src/translator_lt.h @@ -94,7 +94,7 @@ class TranslatorLithuanian : public TranslatorAdapter_1_4_6 /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Lauko aprašymas"; } @@ -161,7 +161,7 @@ class TranslatorLithuanian : public TranslatorAdapter_1_4_6 /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Duomenų Struktūros"; } @@ -178,7 +178,7 @@ class TranslatorLithuanian : public TranslatorAdapter_1_4_6 /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Duomenų Laukai"; } @@ -191,7 +191,7 @@ class TranslatorLithuanian : public TranslatorAdapter_1_4_6 /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Globalūs Nariai"; } @@ -232,7 +232,7 @@ class TranslatorLithuanian : public TranslatorAdapter_1_4_6 virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Duomenų struktūros su trumpais aprašymais:"; } @@ -251,7 +251,7 @@ class TranslatorLithuanian : public TranslatorAdapter_1_4_6 { result+="dokumentuotų "; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="struktūrų ir sąjungų laukų sąrašas"; } @@ -262,7 +262,7 @@ class TranslatorLithuanian : public TranslatorAdapter_1_4_6 result+=" su ryšiais į "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="struktūrų/sąjungų kiekvieno lauko dokumentaciją:"; } @@ -273,7 +273,7 @@ class TranslatorLithuanian : public TranslatorAdapter_1_4_6 } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="struktūros/sąjungos, kurios priklauso:"; } @@ -291,7 +291,7 @@ class TranslatorLithuanian : public TranslatorAdapter_1_4_6 QCString result="Sąrašas visų "; if (!extractAll) result+="dokumentuotų "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="funkcijų, kintamųjų, apibrėžimų, išvardinimų, ir tipų apibrėžimų"; } @@ -342,7 +342,7 @@ class TranslatorLithuanian : public TranslatorAdapter_1_4_6 */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Duomenų Struktūros Indeksas"; } @@ -369,7 +369,7 @@ class TranslatorLithuanian : public TranslatorAdapter_1_4_6 */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Duomenų Struktūros Dokumentacija"; } @@ -472,7 +472,7 @@ class TranslatorLithuanian : public TranslatorAdapter_1_4_6 */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Duomenų struktųros"; } @@ -879,7 +879,7 @@ class TranslatorLithuanian : public TranslatorAdapter_1_4_6 } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Duomenų Laukai"; } @@ -1075,7 +1075,7 @@ class TranslatorLithuanian : public TranslatorAdapter_1_4_6 /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Duomenų Struktūros"; } diff --git a/src/translator_lv.h b/src/translator_lv.h index 35aab0f..2736bb0 100644 --- a/src/translator_lv.h +++ b/src/translator_lv.h @@ -109,7 +109,7 @@ class TranslatorLatvian : public TranslatorAdapter_1_8_4 /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Lauka dokumentācija"; } @@ -176,7 +176,7 @@ class TranslatorLatvian : public TranslatorAdapter_1_8_4 /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datu struktūras"; } @@ -193,7 +193,7 @@ class TranslatorLatvian : public TranslatorAdapter_1_8_4 /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datu lauki"; } @@ -206,7 +206,7 @@ class TranslatorLatvian : public TranslatorAdapter_1_8_4 /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Globālie"; } @@ -247,7 +247,7 @@ class TranslatorLatvian : public TranslatorAdapter_1_8_4 virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Šeit ir visas datu struktūras ar īsu aprakstu:"; } @@ -266,7 +266,7 @@ class TranslatorLatvian : public TranslatorAdapter_1_8_4 { result+="dokumentēto "; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="struktūru un apvienojumu lauku"; } @@ -277,7 +277,7 @@ class TranslatorLatvian : public TranslatorAdapter_1_8_4 result+=" saraksts ar saitēm uz "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="struktūru/apvienojumu dokumentāciju katram laukam:"; } @@ -288,7 +288,7 @@ class TranslatorLatvian : public TranslatorAdapter_1_8_4 } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="struktūrām/apvienojumiem, kam tie pieder:"; } @@ -306,7 +306,7 @@ class TranslatorLatvian : public TranslatorAdapter_1_8_4 QCString result="Šeit ir visu "; if (!extractAll) result+="dokumentēto "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="funkciju, mainīgo, definīciju, uzskaitījumliterāļu un typedefs"; } @@ -357,7 +357,7 @@ class TranslatorLatvian : public TranslatorAdapter_1_8_4 */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datu struktūru indess"; } @@ -384,7 +384,7 @@ class TranslatorLatvian : public TranslatorAdapter_1_8_4 */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datu struktūras dokomentācija"; } @@ -487,7 +487,7 @@ class TranslatorLatvian : public TranslatorAdapter_1_8_4 */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datu struktūras"; } @@ -894,7 +894,7 @@ class TranslatorLatvian : public TranslatorAdapter_1_8_4 } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datu lauki"; } @@ -1092,7 +1092,7 @@ class TranslatorLatvian : public TranslatorAdapter_1_8_4 /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datu struktūras"; } diff --git a/src/translator_mk.h b/src/translator_mk.h index d963dfc..3fc046e 100644 --- a/src/translator_mk.h +++ b/src/translator_mk.h @@ -95,7 +95,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0 /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - //if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + //if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Документација на членови"; } @@ -158,7 +158,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0 /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Список на Структури"; } @@ -175,7 +175,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0 /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Членови"; } @@ -188,7 +188,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0 /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Глобални Членови"; } @@ -228,7 +228,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0 virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Список на структури со кратки описи:"; } @@ -247,7 +247,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0 { result+="документирани "; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="структури и унии"; } @@ -258,7 +258,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0 result+=" со врски до "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="документацијата за секој член на структурата/унијата:"; } @@ -269,7 +269,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0 } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="структурите/униите на кои што припаѓаат:"; } @@ -287,7 +287,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0 QCString result="Список на сите "; if (!extractAll) result+="документирани "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="функции, променливи, дефиниции, набројувања и дефиниции на тип"; } @@ -338,7 +338,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0 */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Попис на Структури"; } @@ -365,7 +365,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0 */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Документација на Структури"; } @@ -468,7 +468,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0 */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Структури"; } @@ -876,7 +876,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0 } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Членови"; } @@ -1071,7 +1071,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0 /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Структури"; } diff --git a/src/translator_no.h b/src/translator_no.h index 40d3287..58b596a 100644 --- a/src/translator_no.h +++ b/src/translator_no.h @@ -105,7 +105,7 @@ class TranslatorNorwegian : public TranslatorAdapter_1_4_6 /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Feltdokumentasjon"; } @@ -172,7 +172,7 @@ class TranslatorNorwegian : public TranslatorAdapter_1_4_6 /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datastrukturer"; } @@ -193,7 +193,7 @@ class TranslatorNorwegian : public TranslatorAdapter_1_4_6 /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datafelt"; } @@ -206,7 +206,7 @@ class TranslatorNorwegian : public TranslatorAdapter_1_4_6 /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Globale"; } @@ -247,7 +247,7 @@ class TranslatorNorwegian : public TranslatorAdapter_1_4_6 virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Her er datastrukturene med korte beskrivelser:"; } @@ -266,7 +266,7 @@ class TranslatorNorwegian : public TranslatorAdapter_1_4_6 { result+="dokumenterte "; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="struct- og unionfelter"; } @@ -277,7 +277,7 @@ class TranslatorNorwegian : public TranslatorAdapter_1_4_6 result+=" med koblinger til "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="struct/union dokumentasjon for hvert felt:"; } @@ -288,7 +288,7 @@ class TranslatorNorwegian : public TranslatorAdapter_1_4_6 } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="struct'ene/unionene de hører til:"; } @@ -305,7 +305,7 @@ class TranslatorNorwegian : public TranslatorAdapter_1_4_6 QCString result="Her er en liste over alle "; if (!extractAll) result+="dokumenterte "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="funksjoner, variabler, definisjoner, enum'er, og typedef'er"; } @@ -367,7 +367,7 @@ class TranslatorNorwegian : public TranslatorAdapter_1_4_6 */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datastrukturindeks"; } @@ -394,7 +394,7 @@ class TranslatorNorwegian : public TranslatorAdapter_1_4_6 */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datastrukturdokumentasjon"; } @@ -503,7 +503,7 @@ class TranslatorNorwegian : public TranslatorAdapter_1_4_6 */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datastrukturer"; } @@ -924,7 +924,7 @@ class TranslatorNorwegian : public TranslatorAdapter_1_4_6 } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datafelt"; } @@ -1118,7 +1118,7 @@ class TranslatorNorwegian : public TranslatorAdapter_1_4_6 /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datastrukturer"; } diff --git a/src/translator_pl.h b/src/translator_pl.h index f1bec57..121bac3 100644 --- a/src/translator_pl.h +++ b/src/translator_pl.h @@ -77,7 +77,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2 /*! header that is put before the list of member attributes. */ QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Dokumentacja pól"; } @@ -144,7 +144,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2 /*! This is put above each page as a link to the list of annotated classes */ QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Struktury danych"; } @@ -165,7 +165,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2 /*! This is put above each page as a link to all members of compounds. */ QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Pola danych"; } @@ -178,7 +178,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2 /*! This is put above each page as a link to all members of files. */ QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Globalne"; } @@ -219,7 +219,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2 QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Tutaj znajdują się struktury danych wraz z ich krótkimi opisami:"; } @@ -238,7 +238,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2 { result+="udokumentowanych "; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="pól struktur i unii"; } @@ -249,7 +249,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2 result+=" wraz z odnośnikami do "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="dokumentacji struktur/unii dla każdego pola:"; } @@ -260,7 +260,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2 } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="struktur/unii, do których dane pole należy:"; } @@ -277,7 +277,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2 { QCString result="Tutaj znajduje się lista wszystkich "; if (!extractAll) result+="udokumentowanych "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="funkcji, zmiennych, makr, wyliczeń i definicji typów"; } @@ -339,7 +339,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2 */ QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Indeks struktur danych"; } @@ -366,7 +366,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2 */ QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Dokumentacja struktur danych"; } @@ -469,7 +469,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2 */ QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Struktury danych"; } @@ -888,7 +888,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2 } QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Pola danych"; } @@ -1085,7 +1085,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2 /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Struktury Danych"; } diff --git a/src/translator_pt.h b/src/translator_pt.h index 5df58d7..c58bf64 100644 --- a/src/translator_pt.h +++ b/src/translator_pt.h @@ -116,7 +116,7 @@ class TranslatorPortuguese : public Translator /*! header that is put before the list of member attributes. */ QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Documentação dos campos e atributos"; } @@ -183,7 +183,7 @@ class TranslatorPortuguese : public Translator /*! This is put above each page as a link to the list of annotated classes */ QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Estruturas de dados"; } @@ -200,7 +200,7 @@ class TranslatorPortuguese : public Translator /*! This is put above each page as a link to all members of compounds. */ QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Campos de dados"; } @@ -213,7 +213,7 @@ class TranslatorPortuguese : public Translator /*! This is put above each page as a link to all members of files. */ QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Globais"; } @@ -251,7 +251,7 @@ class TranslatorPortuguese : public Translator /*! This is an introduction to the annotated compound list. */ QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Lista das estruturas de dados com uma breve descrição:"; } @@ -265,7 +265,7 @@ class TranslatorPortuguese : public Translator QCString trCompoundMembersDescription(bool extractAll) { QCString result="Lista de todas as"; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+=" estruturas e campos de uniões"; } @@ -280,7 +280,7 @@ class TranslatorPortuguese : public Translator result+=" com referência para "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="a respectiva documentação:"; } @@ -291,7 +291,7 @@ class TranslatorPortuguese : public Translator } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="as estruturas/uniões a que pertencem:"; } @@ -307,7 +307,7 @@ class TranslatorPortuguese : public Translator QCString trFileMembersDescription(bool extractAll) { QCString result="Lista de "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="todas as funções, variáveis, definições, enumerações e definições de tipo "; if (!extractAll) result+="documentadas "; @@ -361,7 +361,7 @@ class TranslatorPortuguese : public Translator */ QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Índice das estruturas de dados"; } @@ -482,7 +482,7 @@ class TranslatorPortuguese : public Translator */ QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Estruturas de Dados"; } @@ -894,7 +894,7 @@ class TranslatorPortuguese : public Translator } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Campos de Dados"; } @@ -1082,7 +1082,7 @@ class TranslatorPortuguese : public Translator /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Estruturas de dados"; } diff --git a/src/translator_ro.h b/src/translator_ro.h index eba7d47..661578b 100644 --- a/src/translator_ro.h +++ b/src/translator_ro.h @@ -104,7 +104,7 @@ class TranslatorRomanian : public Translator /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Documentaţia Câmpurilor"; } @@ -172,7 +172,7 @@ class TranslatorRomanian : public Translator /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Structuri de Date"; } @@ -190,7 +190,7 @@ class TranslatorRomanian : public Translator /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Câmpurile de Date"; } @@ -204,7 +204,7 @@ class TranslatorRomanian : public Translator /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Globale"; } @@ -246,7 +246,7 @@ class TranslatorRomanian : public Translator /*! This is an introduction to the annotated compound list. */ virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Lista structurilor de date, cu scurte descrieri:"; } @@ -263,7 +263,7 @@ class TranslatorRomanian : public Translator { QCString result="Lista tuturor "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="câmpurilor "; if (!extractAll) result+=" documentate "; @@ -278,7 +278,7 @@ class TranslatorRomanian : public Translator result+=", cu legături către "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="documentaţia structurii/uniunii pentru fiecare câmp în parte:"; } @@ -289,7 +289,7 @@ class TranslatorRomanian : public Translator } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="structurile/uniunile de care aparţin:"; } @@ -306,7 +306,7 @@ class TranslatorRomanian : public Translator virtual QCString trFileMembersDescription(bool extractAll) { QCString result="Lista tuturor "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="funcţiilor, variabilelor, definiţiilor, enumerărilor şi definiţiilor de tip"; if (!extractAll) result+=" documentate"; @@ -362,7 +362,7 @@ class TranslatorRomanian : public Translator */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Indexul Structurilor de Date"; } @@ -390,7 +390,7 @@ class TranslatorRomanian : public Translator */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Documentaţia Structurilor de Date"; } @@ -494,7 +494,7 @@ class TranslatorRomanian : public Translator */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Structuri de Date"; } @@ -905,7 +905,7 @@ class TranslatorRomanian : public Translator } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Câmpuri de Date"; } @@ -1097,7 +1097,7 @@ class TranslatorRomanian : public Translator /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Structuri de Date"; } diff --git a/src/translator_ru.h b/src/translator_ru.h index 2162a34..dbc734c 100644 --- a/src/translator_ru.h +++ b/src/translator_ru.h @@ -68,7 +68,7 @@ class TranslatorRussian : public Translator /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Поля"; } @@ -143,7 +143,7 @@ class TranslatorRussian : public Translator /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Структуры данных"; } @@ -160,7 +160,7 @@ class TranslatorRussian : public Translator /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Поля структур"; } @@ -207,7 +207,7 @@ class TranslatorRussian : public Translator /*! This is an introduction to the annotated compound list. */ virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Структуры данных с их кратким описанием."; } @@ -222,20 +222,20 @@ class TranslatorRussian : public Translator { QCString result="Список всех "; if(!extractAll) result+="документированных "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) result+="членов структур данных со ссылками на "; else result+="членов классов со ссылками на "; if(!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) result+="документацию по структуре для каждого члена."; else result+="документацию по классу для каждого члена."; } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) result += "структуры"; else result += "классы"; @@ -250,7 +250,7 @@ class TranslatorRussian : public Translator QCString result="Список всех "; if (!extractAll) result+="документированных "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="функций, переменных, макроопределений, " "перечислений и определений типов"; @@ -303,7 +303,7 @@ class TranslatorRussian : public Translator */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Алфавитный указатель структур данных"; } @@ -330,7 +330,7 @@ class TranslatorRussian : public Translator */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Структуры данных"; } @@ -433,7 +433,7 @@ class TranslatorRussian : public Translator */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Структуры данных"; } @@ -877,7 +877,7 @@ class TranslatorRussian : public Translator } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Поля данных"; } @@ -1074,7 +1074,7 @@ class TranslatorRussian : public Translator /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Структуры данных"; } @@ -1149,7 +1149,7 @@ class TranslatorRussian : public Translator */ virtual QCString trClass(bool first_capital, bool singular) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { QCString result((first_capital ? "Структуры данных" : "структуры данных")); return result; diff --git a/src/translator_sc.h b/src/translator_sc.h index 388af8c..d2b3954 100644 --- a/src/translator_sc.h +++ b/src/translator_sc.h @@ -103,7 +103,7 @@ class TranslatorSerbianCyrillic : public TranslatorAdapter_1_6_0 /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Документација поља"; } @@ -170,7 +170,7 @@ class TranslatorSerbianCyrillic : public TranslatorAdapter_1_6_0 /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Структуре"; } @@ -187,7 +187,7 @@ class TranslatorSerbianCyrillic : public TranslatorAdapter_1_6_0 /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Поља"; } @@ -200,7 +200,7 @@ class TranslatorSerbianCyrillic : public TranslatorAdapter_1_6_0 /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Глобално"; } @@ -241,7 +241,7 @@ class TranslatorSerbianCyrillic : public TranslatorAdapter_1_6_0 virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Овде су структуре са кратким описима:"; } @@ -260,7 +260,7 @@ class TranslatorSerbianCyrillic : public TranslatorAdapter_1_6_0 { result+="документованих "; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="поља структура и унија"; } @@ -271,7 +271,7 @@ class TranslatorSerbianCyrillic : public TranslatorAdapter_1_6_0 result+=" са везама ка "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="документацији структуре/уније за свако поље:"; } @@ -282,7 +282,7 @@ class TranslatorSerbianCyrillic : public TranslatorAdapter_1_6_0 } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="структури/унији којој припадају:"; } @@ -300,7 +300,7 @@ class TranslatorSerbianCyrillic : public TranslatorAdapter_1_6_0 QCString result="Овде је списак свих "; if (!extractAll) result+="документованих "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="фрункција, променљивих, макро замена, набрајања, и дефиниција типова"; } @@ -351,7 +351,7 @@ class TranslatorSerbianCyrillic : public TranslatorAdapter_1_6_0 */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Индекс структура"; } @@ -378,7 +378,7 @@ class TranslatorSerbianCyrillic : public TranslatorAdapter_1_6_0 */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Документација структуре"; } @@ -481,7 +481,7 @@ class TranslatorSerbianCyrillic : public TranslatorAdapter_1_6_0 */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Структуре"; } @@ -906,7 +906,7 @@ class TranslatorSerbianCyrillic : public TranslatorAdapter_1_6_0 } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Поља"; } @@ -1102,7 +1102,7 @@ class TranslatorSerbianCyrillic : public TranslatorAdapter_1_6_0 /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Структуре"; } diff --git a/src/translator_si.h b/src/translator_si.h index 97a1931..792053e 100644 --- a/src/translator_si.h +++ b/src/translator_si.h @@ -755,7 +755,7 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6 /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Podatkovne strukture"; } diff --git a/src/translator_sk.h b/src/translator_sk.h index d6d94a6..3a925ec 100644 --- a/src/translator_sk.h +++ b/src/translator_sk.h @@ -72,7 +72,7 @@ class TranslatorSlovak : public Translator /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Dokumentácia k položkám"; } @@ -141,7 +141,7 @@ class TranslatorSlovak : public Translator /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Dátové štruktúry"; } @@ -158,7 +158,7 @@ class TranslatorSlovak : public Translator /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Dátové položky"; } @@ -171,7 +171,7 @@ class TranslatorSlovak : public Translator /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Globálne symboly"; } @@ -211,7 +211,7 @@ class TranslatorSlovak : public Translator /*! This is an introduction to the annotated compound list. */ virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Nasledujúci zoznam obsahuje identifikáciu dátových " "štruktúr a ich stručné popisy:"; @@ -235,7 +235,7 @@ class TranslatorSlovak : public Translator result += "dokumentovaných "; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result += "položiek štruktúr (struct) a unionov (union) "; } @@ -248,7 +248,7 @@ class TranslatorSlovak : public Translator if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result += "dokumentáciu štruktúr/unionov, ku ktorým prislúchajú:"; } @@ -259,7 +259,7 @@ class TranslatorSlovak : public Translator } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="štruktúry/uniony, ku ktorým prislúchajú:"; } @@ -278,7 +278,7 @@ class TranslatorSlovak : public Translator QCString result="Tu nájdete zoznam všetkých "; if (!extractAll) result+="dokumentovaných "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="funkcií, premenných, makier, enumerácií a definícií typov (typedef) " "s odkazmi na "; @@ -334,7 +334,7 @@ class TranslatorSlovak : public Translator */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Register dátových štruktúr"; } @@ -455,7 +455,7 @@ class TranslatorSlovak : public Translator */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Dátové štruktúry"; } @@ -877,7 +877,7 @@ class TranslatorSlovak : public Translator } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Dátové položky"; } diff --git a/src/translator_sr.h b/src/translator_sr.h index 05e8018..f5f132f 100644 --- a/src/translator_sr.h +++ b/src/translator_sr.h @@ -91,7 +91,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0 /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Dokumentacija polja"; } @@ -158,7 +158,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0 /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Spisak struktura"; } @@ -175,7 +175,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0 /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Sva polja struktura"; } @@ -188,7 +188,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0 /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - //if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + //if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) //{ // return "Članovi datoteke"; // TODO: translate me //} @@ -227,7 +227,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0 virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Spisak struktura sa kratkim opisima:"; } @@ -245,7 +245,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0 { result+="dokumentovanih "; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="članova struktura/unija"; } @@ -256,7 +256,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0 result+=" sa vezama ka "; if (extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="dokumentaciji svakog polja strukture/unije:"; } @@ -267,7 +267,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0 } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="strukturama/unijama kojima pripadaju:"; } @@ -285,7 +285,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0 QCString result="Spisak svih "; if (!extractAll) result+="dokumentovanih "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="funkcija, promenljivih, makro zamena, nabrajanja i definicija tipa"; } @@ -336,7 +336,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0 */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Spisak struktura/unija"; } @@ -363,7 +363,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0 */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Dokumentacija stuktura/unija"; } @@ -466,7 +466,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0 */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Strukture i unije"; } @@ -874,7 +874,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0 } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Polja"; } @@ -1069,7 +1069,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0 /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Strukture i unije"; } diff --git a/src/translator_sv.h b/src/translator_sv.h index d491632..1c23f5b 100644 --- a/src/translator_sv.h +++ b/src/translator_sv.h @@ -118,7 +118,7 @@ class TranslatorSwedish : public Translator virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Fält dokumentation"; } @@ -171,7 +171,7 @@ class TranslatorSwedish : public Translator virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datastrukturer"; } @@ -186,7 +186,7 @@ class TranslatorSwedish : public Translator virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Data fält"; } @@ -198,7 +198,7 @@ class TranslatorSwedish : public Translator virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Globala symboler"; } @@ -233,7 +233,7 @@ class TranslatorSwedish : public Translator virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Här följer datastrukturerna med korta beskrivningar:"; } @@ -252,7 +252,7 @@ class TranslatorSwedish : public Translator { result+="dokumenterade "; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="struktur- och unions-fält"; } @@ -263,7 +263,7 @@ class TranslatorSwedish : public Translator result+=" med länkar till "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="struktur/unions-dokumentationen för varje fält:"; } @@ -274,7 +274,7 @@ class TranslatorSwedish : public Translator } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+=" strukturerna/unionerna de tillhör:"; } @@ -291,7 +291,7 @@ class TranslatorSwedish : public Translator QCString result="Här följer en lista över alla "; if (!extractAll) result+="dokumenterade "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="funktioner, variabler, definitioner, enumerationer " "och typdefinitioner"; @@ -331,7 +331,7 @@ class TranslatorSwedish : public Translator */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) { + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Index över datastrukturer"; } else { return "Index över sammensatta typer"; @@ -349,7 +349,7 @@ class TranslatorSwedish : public Translator */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Dokumentation över datastrukturer"; } @@ -405,7 +405,7 @@ class TranslatorSwedish : public Translator */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datastrukturer"; } @@ -780,7 +780,7 @@ class TranslatorSwedish : public Translator } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datafält"; } @@ -979,7 +979,7 @@ class TranslatorSwedish : public Translator /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Datastrukturer"; } diff --git a/src/translator_tr.h b/src/translator_tr.h index 26ae08f..d18f800 100644 --- a/src/translator_tr.h +++ b/src/translator_tr.h @@ -103,7 +103,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5 /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Alan Dokümantasyonu"; } @@ -170,7 +170,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5 /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Veri Yapıları"; } @@ -187,7 +187,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5 /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Veri Alanları"; } @@ -200,7 +200,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5 /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Globaller"; } @@ -241,7 +241,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5 virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Kısa tanımlarıyla birlikte veri yapıları:"; } @@ -260,7 +260,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5 { result+="dokümante edilmiş "; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="yapı(struct) ve birleşim(union) yapılarını içerir"; } @@ -271,7 +271,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5 result+=" ve "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="her alanı yapı(struct)/birleşim(union) dokümantasyonuna bağlar:"; } @@ -282,7 +282,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5 } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="ait olduğu yapı(struct)/birleşime(union) bağlar:"; } @@ -300,7 +300,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5 QCString result="Bu liste tüm "; if (!extractAll) result+="dokümante edilmiş "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="fonksiyonları, değişkenleri, makroları, enümerasyonları ve typedef\'leri içerir"; } @@ -351,7 +351,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5 */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Veri Yapıları İndeksi"; } @@ -378,7 +378,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5 */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Veri Yapıları Dokümantasyonu"; } @@ -481,7 +481,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5 */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Veri Yapıları"; } @@ -890,7 +890,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5 } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Veri Alanları"; } @@ -1085,7 +1085,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5 /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Veri Yapıları"; } diff --git a/src/translator_tw.h b/src/translator_tw.h index 79bf6f5..26a6db6 100644 --- a/src/translator_tw.h +++ b/src/translator_tw.h @@ -104,7 +104,7 @@ class TranslatorChinesetraditional : public Translator /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "欄位說明文件"; } @@ -171,7 +171,7 @@ class TranslatorChinesetraditional : public Translator /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "資料結構"; } @@ -188,7 +188,7 @@ class TranslatorChinesetraditional : public Translator /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "資料欄位"; } @@ -201,7 +201,7 @@ class TranslatorChinesetraditional : public Translator /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "全域資料"; } @@ -241,7 +241,7 @@ class TranslatorChinesetraditional : public Translator virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "這是附帶簡略說明的資料結構:"; } @@ -260,7 +260,7 @@ class TranslatorChinesetraditional : public Translator { result+="文件化過"; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="結構及聯合型態欄位"; } @@ -271,7 +271,7 @@ class TranslatorChinesetraditional : public Translator result+=", 並且帶有連結至"; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="每個欄位的結構/聯合型態說明文件:"; } @@ -282,7 +282,7 @@ class TranslatorChinesetraditional : public Translator } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="這些結構/聯合型態所屬:"; } @@ -300,7 +300,7 @@ class TranslatorChinesetraditional : public Translator QCString result="這是全部"; if (!extractAll) result+="文件化的"; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="函式，變數，定義，列舉，及型態定義"; } @@ -352,7 +352,7 @@ class TranslatorChinesetraditional : public Translator */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "資料結構索引"; } @@ -379,7 +379,7 @@ class TranslatorChinesetraditional : public Translator */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "資料結構說明文件"; } @@ -488,7 +488,7 @@ class TranslatorChinesetraditional : public Translator */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "資料結構"; } @@ -895,7 +895,7 @@ class TranslatorChinesetraditional : public Translator } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "資料欄位"; } @@ -1091,7 +1091,7 @@ class TranslatorChinesetraditional : public Translator /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "資料結構"; } diff --git a/src/translator_ua.h b/src/translator_ua.h index 964285b..eac14aa 100644 --- a/src/translator_ua.h +++ b/src/translator_ua.h @@ -61,7 +61,7 @@ class TranslatorUkrainian : public TranslatorAdapter_1_8_4 /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Поля" ; } @@ -136,7 +136,7 @@ class TranslatorUkrainian : public TranslatorAdapter_1_8_4 /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Структури даних" ; } @@ -153,7 +153,7 @@ class TranslatorUkrainian : public TranslatorAdapter_1_8_4 /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Поля структур" ; } @@ -200,7 +200,7 @@ class TranslatorUkrainian : public TranslatorAdapter_1_8_4 /*! This is an introduction to the annotated compound list. */ virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Структури даних з коротким описом." ; } @@ -215,20 +215,20 @@ class TranslatorUkrainian : public TranslatorAdapter_1_8_4 { QCString result="Список всіх "; if(!extractAll) result+="документоаних "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) result+="елементів структур даних з посиланням на "; else result+="елементів класів даних з посиланням на "; if(extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) result+="документацію по структурі/об'єднанню кожного елементу."; else result+="документацію по класу кожного елементу."; } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) result += "відповідні структури"; else result += "відповідні класи"; @@ -243,7 +243,7 @@ class TranslatorUkrainian : public TranslatorAdapter_1_8_4 QCString result="Список всіх "; if (!extractAll) result+="документованих "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="функцій, змінних, макровизначень, " "переліків і визначень типів"; @@ -295,7 +295,7 @@ class TranslatorUkrainian : public TranslatorAdapter_1_8_4 */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Алфавітний покажчик структур даних" ; } @@ -322,7 +322,7 @@ class TranslatorUkrainian : public TranslatorAdapter_1_8_4 */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Структури даних" ; } @@ -425,7 +425,7 @@ class TranslatorUkrainian : public TranslatorAdapter_1_8_4 */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Структури даних" ; } @@ -867,7 +867,7 @@ class TranslatorUkrainian : public TranslatorAdapter_1_8_4 } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Поля даних" ; } @@ -1060,7 +1060,7 @@ class TranslatorUkrainian : public TranslatorAdapter_1_8_4 /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Структури даних" ; } @@ -1135,7 +1135,7 @@ class TranslatorUkrainian : public TranslatorAdapter_1_8_4 */ virtual QCString trClass(bool first_capital, bool singular) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { QCString result((first_capital ? "Структури даних" : "структури даних")); return result; diff --git a/src/translator_vi.h b/src/translator_vi.h index b2bbdd7..a0046b0 100644 --- a/src/translator_vi.h +++ b/src/translator_vi.h @@ -110,7 +110,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0 /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Thông tin về trường"; } @@ -177,7 +177,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0 /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Cấu trúc cơ sở dữ liệu (Data Structures)"; } @@ -194,7 +194,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0 /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Các trường dữ liệu"; } @@ -207,7 +207,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0 /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Toàn cục"; } @@ -248,7 +248,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0 virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Đây là cấu trúc cơ sở dữ liệu với mô tả tóm tắt:"; } @@ -267,7 +267,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0 { result+="(đã được mô tả) "; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="struct và union fields"; } @@ -278,7 +278,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0 result+=" cùng với các các liên kết đến "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="Thông tin về struct/union cho từng trường:"; } @@ -289,7 +289,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0 } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="các structures/unions thuộc:"; } @@ -307,7 +307,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0 QCString result="Danh sách tất cả các "; if (!extractAll) result+="(đã được mô tat) "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="functions, variables, defines, enums, và typedefs"; } @@ -358,7 +358,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0 */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Index cấu trúc cơ sở dữ liệu"; } @@ -385,7 +385,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0 */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Thông tin về cấu trúc cơ sở dữ liệu"; } @@ -488,7 +488,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0 */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Cấu trúc cơ sở dữ liệu"; } @@ -895,7 +895,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0 } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "các trường đữ liệu"; } @@ -1090,7 +1090,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0 /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Cấu trúc dữ liệu"; } diff --git a/src/translator_za.h b/src/translator_za.h index ca94e7a..dd5ddf9 100644 --- a/src/translator_za.h +++ b/src/translator_za.h @@ -91,7 +91,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0 /*! header that is put before the list of member attributes. */ virtual QCString trMemberDataDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Veld Dokumentasie"; } @@ -158,7 +158,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0 /*! This is put above each page as a link to the list of annotated classes */ virtual QCString trCompoundList() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Data Strukture"; } @@ -175,7 +175,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0 /*! This is put above each page as a link to all members of compounds. */ virtual QCString trCompoundMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Data Velde"; } @@ -188,7 +188,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0 /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Globals"; } @@ -229,7 +229,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0 virtual QCString trCompoundListDescription() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return " Data strukture met kort beskrywings:"; } @@ -248,7 +248,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0 { result+="gedokumenteerde "; } - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="struct en union velde"; } @@ -259,7 +259,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0 result+=" met skakels na "; if (!extractAll) { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="die struct/union dokumentasie vir elke veld:"; } @@ -270,7 +270,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0 } else { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="die structures/unions waaraan hulle behoort:"; } @@ -288,7 +288,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0 QCString result="'n Lys van alle "; if (!extractAll) result+="gedokumenteerde "; - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { result+="funksies, veranderlikes, defines, enums, en typedefs"; } @@ -337,7 +337,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0 */ virtual QCString trCompoundIndex() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Data Strukture Indeks"; } @@ -364,7 +364,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0 */ virtual QCString trClassDocumentation() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Data Strukture Dokumentasie"; } @@ -467,7 +467,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0 */ virtual QCString trCompounds() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Data Strukture"; } @@ -875,7 +875,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0 } virtual QCString trPublicAttribs() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Data Velde"; } @@ -1071,7 +1071,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0 /*! Used for Java classes in the summary section of Java packages */ virtual QCString trClasses() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + if (Config_getBool(OPTIMIZE_OUTPUT_FOR_C)) { return "Data Strukture"; } diff --git a/src/util.cpp b/src/util.cpp index 6f3bc40..f089858 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -250,8 +250,8 @@ void writePageRef(OutputDocInterface &od,const char *cn,const char *mn) od.disable(OutputGenerator::Html); od.disable(OutputGenerator::Man); - if (Config_getBool("PDF_HYPERLINKS")) od.disable(OutputGenerator::Latex); - if (Config_getBool("RTF_HYPERLINKS")) od.disable(OutputGenerator::RTF); + if (Config_getBool(PDF_HYPERLINKS)) od.disable(OutputGenerator::Latex); + if (Config_getBool(RTF_HYPERLINKS)) od.disable(OutputGenerator::RTF); od.startPageRef(); od.docify(theTranslator->trPageAbbreviation()); od.endPageRef(cn,mn); @@ -293,19 +293,19 @@ static QCString stripFromPath(const QCString &path,QStrList &l) } /*! strip part of \a path if it matches - * one of the paths in the Config_getList("STRIP_FROM_PATH") list + * one of the paths in the Config_getList(STRIP_FROM_PATH) list */ QCString stripFromPath(const QCString &path) { - return stripFromPath(path,Config_getList("STRIP_FROM_PATH")); + return stripFromPath(path,Config_getList(STRIP_FROM_PATH)); } /*! strip part of \a path if it matches - * one of the paths in the Config_getList("INCLUDE_PATH") list + * one of the paths in the Config_getList(INCLUDE_PATH) list */ QCString stripFromIncludePath(const QCString &path) { - return stripFromPath(path,Config_getList("STRIP_FROM_INC_PATH")); + return stripFromPath(path,Config_getList(STRIP_FROM_INC_PATH)); } /*! try to determine if \a name is a source or a header file name by looking @@ -1570,7 +1570,7 @@ ClassDef *getResolvedClass(Definition *scope, QCString *pResolvedType ) { - static bool optimizeOutputVhdl = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); + static bool optimizeOutputVhdl = Config_getBool(OPTIMIZE_OUTPUT_VHDL); g_resolvedTypedefs.clear(); if (scope==0 || (scope->definitionType()!=Definition::TypeClass && @@ -1654,8 +1654,8 @@ static const char virtualScope[] = { 'v', 'i', 'r', 't', 'u', 'a', 'l', ':' }; // Note: this function is not reentrant due to the use of static buffer! QCString removeRedundantWhiteSpace(const QCString &s) { - static bool cliSupport = Config_getBool("CPP_CLI_SUPPORT"); - static bool vhdl = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); + static bool cliSupport = Config_getBool(CPP_CLI_SUPPORT); + static bool vhdl = Config_getBool(OPTIMIZE_OUTPUT_VHDL); if (s.isEmpty() || vhdl) return s; static GrowBuf growBuf; @@ -2347,8 +2347,8 @@ QCString getFileFilter(const char* name,bool isSourceCode) // sanity check if (name==0) return ""; - QStrList& filterSrcList = Config_getList("FILTER_SOURCE_PATTERNS"); - QStrList& filterList = Config_getList("FILTER_PATTERNS"); + QStrList& filterSrcList = Config_getList(FILTER_SOURCE_PATTERNS); + QStrList& filterList = Config_getList(FILTER_PATTERNS); QCString filterName; bool found=FALSE; @@ -2362,7 +2362,7 @@ QCString getFileFilter(const char* name,bool isSourceCode) } if (!found) { // then use the generic input filter - return Config_getString("INPUT_FILTER"); + return Config_getString(INPUT_FILTER); } else { @@ -2374,7 +2374,7 @@ QCString getFileFilter(const char* name,bool isSourceCode) QCString transcodeCharacterStringToUTF8(const QCString &input) { bool error=FALSE; - static QCString inputEncoding = Config_getString("INPUT_ENCODING"); + static QCString inputEncoding = Config_getString(INPUT_ENCODING); const char *outputEncoding = "UTF-8"; if (inputEncoding.isEmpty() || qstricmp(inputEncoding,outputEncoding)==0) return input; int inputSize=input.length(); @@ -4658,7 +4658,7 @@ bool resolveRef(/* in */ const char *scName, QCString linkToText(SrcLangExt lang,const char *link,bool isFileName) { - //static bool optimizeOutputJava = Config_getBool("OPTIMIZE_OUTPUT_JAVA"); + //static bool optimizeOutputJava = Config_getBool(OPTIMIZE_OUTPUT_JAVA); QCString result=link; if (!result.isEmpty()) { @@ -5131,20 +5131,20 @@ QCString substituteKeywords(const QCString &s,const char *title, result = substitute(result,"$projectname",projName); result = substitute(result,"$projectnumber",projNum); result = substitute(result,"$projectbrief",projBrief); - result = substitute(result,"$projectlogo",stripPath(Config_getString("PROJECT_LOGO"))); + result = substitute(result,"$projectlogo",stripPath(Config_getString(PROJECT_LOGO))); return result; } //---------------------------------------------------------------------- /*! Returns the character index within \a name of the first prefix - * in Config_getList("IGNORE_PREFIX") that matches \a name at the left hand side, + * in Config_getList(IGNORE_PREFIX) that matches \a name at the left hand side, * or zero if no match was found */ int getPrefixIndex(const QCString &name) { if (name.isEmpty()) return 0; - static QStrList &sl = Config_getList("IGNORE_PREFIX"); + static QStrList &sl = Config_getList(IGNORE_PREFIX); char *s = sl.first(); while (s) { @@ -5241,8 +5241,8 @@ bool hasVisibleRoot(BaseClassList *bcl) // note that this function is not reentrant due to the use of static growBuf! QCString escapeCharsInString(const char *name,bool allowDots,bool allowUnderscore) { - static bool caseSenseNames = Config_getBool("CASE_SENSE_NAMES"); - static bool allowUnicodeNames = Config_getBool("ALLOW_UNICODE_NAMES"); + static bool caseSenseNames = Config_getBool(CASE_SENSE_NAMES); + static bool allowUnicodeNames = Config_getBool(ALLOW_UNICODE_NAMES); static GrowBuf growBuf; growBuf.clear(); char c; @@ -5353,8 +5353,8 @@ QCString escapeCharsInString(const char *name,bool allowDots,bool allowUnderscor */ QCString convertNameToFile(const char *name,bool allowDots,bool allowUnderscore) { - static bool shortNames = Config_getBool("SHORT_NAMES"); - static bool createSubdirs = Config_getBool("CREATE_SUBDIRS"); + static bool shortNames = Config_getBool(SHORT_NAMES); + static bool createSubdirs = Config_getBool(CREATE_SUBDIRS); QCString result; if (shortNames) // use short names only { @@ -5436,7 +5436,7 @@ QCString convertNameToFile(const char *name,bool allowDots,bool allowUnderscore) QCString relativePathToRoot(const char *name) { QCString result; - if (Config_getBool("CREATE_SUBDIRS")) + if (Config_getBool(CREATE_SUBDIRS)) { if (name==0) { @@ -5457,7 +5457,7 @@ QCString relativePathToRoot(const char *name) void createSubDirs(QDir &d) { - if (Config_getBool("CREATE_SUBDIRS")) + if (Config_getBool(CREATE_SUBDIRS)) { // create 4096 subdirectories int l1,l2; @@ -6469,10 +6469,10 @@ void addRefItem(const QList<ListItemInfo> *sli, && ( // either not a built-in list or the list is enabled - (lii->type!="todo" || Config_getBool("GENERATE_TODOLIST")) && - (lii->type!="test" || Config_getBool("GENERATE_TESTLIST")) && - (lii->type!="bug" || Config_getBool("GENERATE_BUGLIST")) && - (lii->type!="deprecated" || Config_getBool("GENERATE_DEPRECATEDLIST")) + (lii->type!="todo" || Config_getBool(GENERATE_TODOLIST)) && + (lii->type!="test" || Config_getBool(GENERATE_TESTLIST)) && + (lii->type!="bug" || Config_getBool(GENERATE_BUGLIST)) && + (lii->type!="deprecated" || Config_getBool(GENERATE_DEPRECATEDLIST)) ) ) { @@ -6607,13 +6607,13 @@ void filterLatexString(FTextStream &t,const char *str, case '>': t << "$>$"; break; case '|': t << "$\\vert$"; break; case '~': t << "$\\sim$"; break; - case '[': if (Config_getBool("PDF_HYPERLINKS") || insideItem) + case '[': if (Config_getBool(PDF_HYPERLINKS) || insideItem) t << "\\mbox{[}"; else t << "["; break; case ']': if (pc=='[') t << "$\\,$"; - if (Config_getBool("PDF_HYPERLINKS") || insideItem) + if (Config_getBool(PDF_HYPERLINKS) || insideItem) t << "\\mbox{]}"; else t << "]"; @@ -6913,7 +6913,7 @@ QCString stripLeadingAndTrailingEmptyLines(const QCString &s,int &docLine) void stringToSearchIndex(const QCString &docBaseUrl,const QCString &title, const QCString &str,bool priority,const QCString &anchor) { - static bool searchEngine = Config_getBool("SEARCHENGINE"); + static bool searchEngine = Config_getBool(SEARCHENGINE); if (searchEngine) { Doxygen::searchIndex->setCurrentDoc(title,docBaseUrl,anchor); @@ -6932,6 +6932,8 @@ void stringToSearchIndex(const QCString &docBaseUrl,const QCString &title, static QDict<int> g_extLookup; +const QDict<int> &getExtensionLookup() { return g_extLookup; } + static struct Lang2ExtMap { const char *langName; @@ -7743,7 +7745,7 @@ bool readInputFile(const char *fileName,BufStr &inBuf,bool filter,bool isSourceC { // do character transcoding if needed. transcodeCharacterBuffer(fileName,inBuf,inBuf.curPos(), - Config_getString("INPUT_ENCODING"),"UTF-8"); + Config_getString(INPUT_ENCODING),"UTF-8"); } //inBuf.addChar('\n'); /* to prevent problems under Windows ? */ @@ -7849,7 +7851,7 @@ void writeSummaryLink(OutputList &ol,const char *label,const char *title, QCString externalLinkTarget() { - static bool extLinksInWindow = Config_getBool("EXT_LINKS_IN_WINDOW"); + static bool extLinksInWindow = Config_getBool(EXT_LINKS_IN_WINDOW); if (extLinksInWindow) return "target=\"_blank\" "; else return ""; } @@ -7888,9 +7890,9 @@ QCString externalRef(const QCString &relPath,const QCString &ref,bool href) */ void writeColoredImgData(const char *dir,ColoredImgDataItem data[]) { - static int hue = Config_getInt("HTML_COLORSTYLE_HUE"); - static int sat = Config_getInt("HTML_COLORSTYLE_SAT"); - static int gamma = Config_getInt("HTML_COLORSTYLE_GAMMA"); + static int hue = Config_getInt(HTML_COLORSTYLE_HUE); + static int sat = Config_getInt(HTML_COLORSTYLE_SAT); + static int gamma = Config_getInt(HTML_COLORSTYLE_GAMMA); while (data->name) { QCString fileName; @@ -7923,9 +7925,9 @@ QCString replaceColorMarkers(const char *str) if (s.isEmpty()) return result; static QRegExp re("##[0-9A-Fa-f][0-9A-Fa-f]"); static const char hex[] = "0123456789ABCDEF"; - static int hue = Config_getInt("HTML_COLORSTYLE_HUE"); - static int sat = Config_getInt("HTML_COLORSTYLE_SAT"); - static int gamma = Config_getInt("HTML_COLORSTYLE_GAMMA"); + static int hue = Config_getInt(HTML_COLORSTYLE_HUE); + static int sat = Config_getInt(HTML_COLORSTYLE_SAT); + static int gamma = Config_getInt(HTML_COLORSTYLE_GAMMA); int i,l,sl=s.length(),p=0; while ((i=re.match(s,p,&l))!=-1) { @@ -8097,8 +8099,8 @@ QCString correctURL(const QCString &url,const QCString &relPath) bool protectionLevelVisible(Protection prot) { - static bool extractPrivate = Config_getBool("EXTRACT_PRIVATE"); - static bool extractPackage = Config_getBool("EXTRACT_PACKAGE"); + static bool extractPrivate = Config_getBool(EXTRACT_PRIVATE); + static bool extractPackage = Config_getBool(EXTRACT_PACKAGE); return (prot!=Private && prot!=Package) || (prot==Private && extractPrivate) || @@ -8118,7 +8120,7 @@ QCString stripIndentation(const QCString &s) int indent=0; int minIndent=1000000; // "infinite" bool searchIndent=TRUE; - static int tabSize=Config_getInt("TAB_SIZE"); + static int tabSize=Config_getInt(TAB_SIZE); while ((c=*p++)) { if (c=='\t') indent+=tabSize - (indent%tabSize); @@ -8176,7 +8178,7 @@ QCString stripIndentation(const QCString &s) bool fileVisibleInIndex(FileDef *fd,bool &genSourceFile) { - static bool allExternals = Config_getBool("ALLEXTERNALS"); + static bool allExternals = Config_getBool(ALLEXTERNALS); bool isDocFile = fd->isDocumentationFile(); genSourceFile = !isDocFile && fd->generateSourceFile(); return ( ((allExternals && fd->isLinkable()) || @@ -8188,8 +8190,8 @@ bool fileVisibleInIndex(FileDef *fd,bool &genSourceFile) void addDocCrossReference(MemberDef *src,MemberDef *dst) { - static bool referencedByRelation = Config_getBool("REFERENCED_BY_RELATION"); - static bool referencesRelation = Config_getBool("REFERENCES_RELATION"); + static bool referencedByRelation = Config_getBool(REFERENCED_BY_RELATION); + static bool referencesRelation = Config_getBool(REFERENCES_RELATION); //printf("--> addDocCrossReference src=%s,dst=%s\n",src->name().data(),dst->name().data()); if (dst->isTypedef() || dst->isEnumerate()) return; // don't add types @@ -8333,7 +8335,7 @@ bool namespaceHasVisibleChild(NamespaceDef *nd,bool includeClasses) bool classVisibleInIndex(ClassDef *cd) { - static bool allExternals = Config_getBool("ALLEXTERNALS"); + static bool allExternals = Config_getBool(ALLEXTERNALS); return (allExternals && cd->isLinkable()) || cd->isLinkableInProject(); } @@ -8382,7 +8384,7 @@ void convertProtectionLevel( int *outListType2 ) { - static bool extractPrivate = Config_getBool("EXTRACT_PRIVATE"); + static bool extractPrivate = Config_getBool(EXTRACT_PRIVATE); // default representing 1-1 mapping *outListType1=inListType; *outListType2=-1; @@ -8561,30 +8563,11 @@ bool mainPageHasTitle() QCString getDotImageExtension(void) { - QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgExt = Config_getEnum(DOT_IMAGE_FORMAT); imgExt = imgExt.replace( QRegExp(":.*"), "" ); return imgExt; } -void initFilePattern(void) -{ - // add default pattern if needed - QStrList &filePatternList = Config_getList("FILE_PATTERNS"); - if (filePatternList.isEmpty()) - { - QDictIterator<int> it( g_extLookup ); - QCString pattern; - bool caseSens = portable_fileSystemIsCaseSensitive(); - for (;it.current();++it) - { - pattern = "*"; - pattern += it.currentKey(); - filePatternList.append(pattern.data()); - if (caseSens) filePatternList.append(pattern.upper().data()); - } - } -} - bool openOutputFile(const char *outFile,QFile &f) { bool fileOpened=FALSE; @@ -474,7 +474,7 @@ void convertProtectionLevel( ); bool mainPageHasTitle(); -void initFilePattern(void); +const QDict<int> &getExtensionLookup(); bool openOutputFile(const char *outFile,QFile &f); #endif diff --git a/src/vhdlcode.l b/src/vhdlcode.l index e4ae0e7..6d2ebcb 100644 --- a/src/vhdlcode.l +++ b/src/vhdlcode.l @@ -394,7 +394,7 @@ static void writeMultiLineCodeLink(CodeOutputInterface &ol, Definition *d, const char *text) { - static bool sourceTooltips = Config_getBool("SOURCE_TOOLTIPS"); + static bool sourceTooltips = Config_getBool(SOURCE_TOOLTIPS); TooltipManager::instance()->addTooltip(d); QCString ref = d->getReference(); QCString file = d->getOutputFileBase(); @@ -1464,7 +1464,7 @@ XILINX "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI QCString text(vhdlcodeYYtext); int i=text.find("--"); if (text.mid(i,3)=="--!" && // hide special comment - Config_getBool("STRIP_CODE_COMMENTS")) + Config_getBool(STRIP_CODE_COMMENTS)) { g_yyLineNr++; // skip complete line } @@ -1479,7 +1479,7 @@ XILINX "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI QCString text(vhdlcodeYYtext); int i=text.find("--"); if (text.mid(i,3)=="--!" && - Config_getBool("STRIP_CODE_COMMENTS")) + Config_getBool(STRIP_CODE_COMMENTS)) { // hide special comment } diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp index 2d473b2..5088475 100644 --- a/src/vhdldocgen.cpp +++ b/src/vhdldocgen.cpp @@ -162,7 +162,7 @@ static int compareString(const QCString& s1,const QCString& s2) static void createSVG() { - QCString ov =Config_getString("HTML_OUTPUT"); + QCString ov =Config_getString(HTML_OUTPUT); QCString dir="-o \""+ov+"/vhdl_design_overview.html\""; ov+="/vhdl_design.dot"; @@ -192,7 +192,7 @@ void VhdlDocGen::writeOverview() if (!found) return; - QCString ov =Config_getString("HTML_OUTPUT"); + QCString ov =Config_getString(HTML_OUTPUT); QCString fileName=ov+"/vhdl_design.dot"; QFile f(fileName); FTextStream t(&f); @@ -1989,7 +1989,7 @@ void VhdlDocGen::writeVHDLDeclaration(MemberDef* mdef,OutputList &ol, QCString cfname = d->getOutputFileBase(); //HtmlHelp *htmlHelp=0; - // bool hasHtmlHelp = Config_getBool("GENERATE_HTML") && Config_getBool("GENERATE_HTMLHELP"); + // bool hasHtmlHelp = Config_getBool(GENERATE_HTML) && Config_getBool(GENERATE_HTMLHELP); // if (hasHtmlHelp) htmlHelp = HtmlHelp::getInstance(); // search for the last anonymous scope in the member type @@ -2242,7 +2242,7 @@ void VhdlDocGen::writeVHDLDeclaration(MemberDef* mdef,OutputList &ol, } bool htmlOn = ol.isEnabled(OutputGenerator::Html); - if (htmlOn && /*Config_getBool("HTML_ALIGN_MEMBERS") &&*/ !ltype.isEmpty()) + if (htmlOn && /*Config_getBool(HTML_ALIGN_MEMBERS) &&*/ !ltype.isEmpty()) { ol.disable(OutputGenerator::Html); } @@ -2261,7 +2261,7 @@ void VhdlDocGen::writeVHDLDeclaration(MemberDef* mdef,OutputList &ol, // name().data(),annoClassDef,annEnumType); // if(mm!=VhdlDocGen::MISCELLANEOUS) ol.endMemberItem(); - if (!mdef->briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC") /* && !annMemb */) + if (!mdef->briefDescription().isEmpty() && Config_getBool(BRIEF_MEMBER_DESC) /* && !annMemb */) { QCString s=mdef->briefDescription(); ol.startMemberDescription(mdef->anchor()); @@ -2802,7 +2802,7 @@ bool VhdlDocGen::findConstraintFile(LayoutNavEntry *lne) QCString co("Constraints"); QCString imgExt = getDotImageExtension(); - if (Config_getBool("HAVE_DOT") && imgExt=="svg") + if (Config_getBool(HAVE_DOT) && imgExt=="svg") { QCString ov = theTranslator->trDesignOverview(); QCString ofile("vhdl_design_overview"); @@ -3926,8 +3926,8 @@ void FlowChart::printUmlTree() } qcs+="\n"; - QCString & outDir = Config_getString("OUTPUT_DIRECTORY"); - QCString & htmlOutDir = Config_getString("HTML_OUTPUT"); + QCString & outDir = Config_getString(OUTPUT_DIRECTORY); + QCString & htmlOutDir = Config_getString(HTML_OUTPUT); QCString n=convertNameToFileName(); QCString tmp=htmlOutDir; @@ -3988,7 +3988,7 @@ const char* FlowChart::getNodeType(int c) void FlowChart::createSVG() { QCString qcs("/"); - QCString ov = Config_getString("HTML_OUTPUT"); + QCString ov = Config_getString(HTML_OUTPUT); qcs+=FlowChart::convertNameToFileName()+".svg"; @@ -4024,7 +4024,7 @@ void FlowChart::writeFlowChart() { // assert(VhdlDocGen::flowMember); - QCString ov = Config_getString("HTML_OUTPUT"); + QCString ov = Config_getString(HTML_OUTPUT); QCString fileName = ov+"/flow_design.dot"; QFile f(fileName); FTextStream t(&f); diff --git a/src/vhdljjparser.cpp b/src/vhdljjparser.cpp index c29bc69..c68ef36 100644 --- a/src/vhdljjparser.cpp +++ b/src/vhdljjparser.cpp @@ -705,7 +705,7 @@ void VhdlParser::mapLibPackage( Entry* root) bool VhdlParser::addLibUseClause(const QCString &type) { - static bool showIEEESTD=Config_getBool("FORCE_LOCAL_INCLUDES"); + static bool showIEEESTD=Config_getBool(FORCE_LOCAL_INCLUDES); if (showIEEESTD) // all standard packages and libraries will not be shown { diff --git a/src/xmldocvisitor.cpp b/src/xmldocvisitor.cpp index c5550f0..380a39b 100644 --- a/src/xmldocvisitor.cpp +++ b/src/xmldocvisitor.cpp @@ -726,7 +726,7 @@ void XmlDocVisitor::visitPre(DocImage *img) // copy the image to the output dir QFile inImage(img->name()); - QFile outImage(Config_getString("XML_OUTPUT")+"/"+baseName.data()); + QFile outImage(Config_getString(XML_OUTPUT)+"/"+baseName.data()); if (inImage.open(IO_ReadOnly)) { if (outImage.open(IO_WriteOnly)) diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp index 467ebe4..8aae051 100644 --- a/src/xmlgen.cpp +++ b/src/xmlgen.cpp @@ -120,7 +120,7 @@ inline void writeXMLCodeString(FTextStream &t,const char *s, int &col) { case '\t': { - static int tabSize = Config_getInt("TAB_SIZE"); + static int tabSize = Config_getInt(TAB_SIZE); int spacesToNextTabStop = tabSize - (col%tabSize); col+=spacesToNextTabStop; while (spacesToNextTabStop--) t << "<sp/>"; @@ -153,7 +153,7 @@ static void writeXMLHeader(FTextStream &t) static void writeCombineScript() { - QCString outputDirectory = Config_getString("XML_OUTPUT"); + QCString outputDirectory = Config_getString(XML_OUTPUT); QCString fileName=outputDirectory+"/combine.xslt"; QFile f(fileName); if (!f.open(IO_WriteOnly)) @@ -452,7 +452,7 @@ void writeXMLCodeBlock(FTextStream &t,FileDef *fd) XMLCodeGenerator *xmlGen = new XMLCodeGenerator(t); pIntf->parseCode(*xmlGen, // codeOutIntf 0, // scopeName - fileToString(fd->absFilePath(),Config_getBool("FILTER_SOURCE_FILES")), + fileToString(fd->absFilePath(),Config_getBool(FILTER_SOURCE_FILES)), langExt, // lang FALSE, // isExampleBlock 0, // exampleName @@ -505,7 +505,7 @@ static void stripQualifiers(QCString &typeStr) static QCString classOutputFileBase(ClassDef *cd) { - //static bool inlineGroupedClasses = Config_getBool("INLINE_GROUPED_CLASSES"); + //static bool inlineGroupedClasses = Config_getBool(INLINE_GROUPED_CLASSES); //if (inlineGroupedClasses && cd->partOfGroups()!=0) return cd->getOutputFileBase(); //else @@ -514,7 +514,7 @@ static QCString classOutputFileBase(ClassDef *cd) static QCString memberOutputFileBase(MemberDef *md) { - //static bool inlineGroupedClasses = Config_getBool("INLINE_GROUPED_CLASSES"); + //static bool inlineGroupedClasses = Config_getBool(INLINE_GROUPED_CLASSES); //if (inlineGroupedClasses && md->getClassDef() && md->getClassDef()->partOfGroups()!=0) // return md->getClassDef()->getXmlOutputFileBase(); //else @@ -1242,7 +1242,7 @@ static void generateXMLForClass(ClassDef *cd,FTextStream &ti) << "\" kind=\"" << cd->compoundTypeString() << "\"><name>" << convertToXML(cd->name()) << "</name>" << endl; - QCString outputDirectory = Config_getString("XML_OUTPUT"); + QCString outputDirectory = Config_getString(XML_OUTPUT); QCString fileName=outputDirectory+"/"+ classOutputFileBase(cd)+".xml"; QFile f(fileName); if (!f.open(IO_WriteOnly)) @@ -1442,7 +1442,7 @@ static void generateXMLForNamespace(NamespaceDef *nd,FTextStream &ti) << "\" kind=\"namespace\"" << "><name>" << convertToXML(nd->name()) << "</name>" << endl; - QCString outputDirectory = Config_getString("XML_OUTPUT"); + QCString outputDirectory = Config_getString(XML_OUTPUT); QCString fileName=outputDirectory+"/"+nd->getOutputFileBase()+".xml"; QFile f(fileName); if (!f.open(IO_WriteOnly)) @@ -1523,7 +1523,7 @@ static void generateXMLForFile(FileDef *fd,FTextStream &ti) << "\" kind=\"file\"><name>" << convertToXML(fd->name()) << "</name>" << endl; - QCString outputDirectory = Config_getString("XML_OUTPUT"); + QCString outputDirectory = Config_getString(XML_OUTPUT); QCString fileName=outputDirectory+"/"+fd->getOutputFileBase()+".xml"; QFile f(fileName); if (!f.open(IO_WriteOnly)) @@ -1628,7 +1628,7 @@ static void generateXMLForFile(FileDef *fd,FTextStream &ti) t << " <detaileddescription>" << endl; writeXMLDocBlock(t,fd->docFile(),fd->docLine(),fd,0,fd->documentation()); t << " </detaileddescription>" << endl; - if (Config_getBool("XML_PROGRAMLISTING")) + if (Config_getBool(XML_PROGRAMLISTING)) { t << " <programlisting>" << endl; writeXMLCodeBlock(t,fd); @@ -1660,7 +1660,7 @@ static void generateXMLForGroup(GroupDef *gd,FTextStream &ti) ti << " <compound refid=\"" << gd->getOutputFileBase() << "\" kind=\"group\"><name>" << convertToXML(gd->name()) << "</name>" << endl; - QCString outputDirectory = Config_getString("XML_OUTPUT"); + QCString outputDirectory = Config_getString(XML_OUTPUT); QCString fileName=outputDirectory+"/"+gd->getOutputFileBase()+".xml"; QFile f(fileName); if (!f.open(IO_WriteOnly)) @@ -1723,7 +1723,7 @@ static void generateXMLForDir(DirDef *dd,FTextStream &ti) << "\" kind=\"dir\"><name>" << convertToXML(dd->displayName()) << "</name>" << endl; - QCString outputDirectory = Config_getString("XML_OUTPUT"); + QCString outputDirectory = Config_getString(XML_OUTPUT); QCString fileName=outputDirectory+"/"+dd->getOutputFileBase()+".xml"; QFile f(fileName); if (!f.open(IO_WriteOnly)) @@ -1776,7 +1776,7 @@ static void generateXMLForPage(PageDef *pd,FTextStream &ti,bool isExample) << "\" kind=\"" << kindName << "\"><name>" << convertToXML(pd->name()) << "</name>" << endl; - QCString outputDirectory = Config_getString("XML_OUTPUT"); + QCString outputDirectory = Config_getString(XML_OUTPUT); QCString fileName=outputDirectory+"/"+pageName+".xml"; QFile f(fileName); if (!f.open(IO_WriteOnly)) @@ -1802,7 +1802,7 @@ static void generateXMLForPage(PageDef *pd,FTextStream &ti,bool isExample) } else { - title = Config_getString("PROJECT_NAME"); + title = Config_getString(PROJECT_NAME); } t << " <title>" << convertToXML(convertCharEntitiesToUTF8(title)) << "</title>" << endl; @@ -1845,7 +1845,7 @@ void generateXML() // + related pages // - examples - QCString outputDirectory = Config_getString("XML_OUTPUT"); + QCString outputDirectory = Config_getString(XML_OUTPUT); QDir xmlDir(outputDirectory); createSubDirs(xmlDir); diff --git a/vhdlparser/CMakeLists.txt b/vhdlparser/CMakeLists.txt index 1f60ae0..71e97df 100644 --- a/vhdlparser/CMakeLists.txt +++ b/vhdlparser/CMakeLists.txt @@ -1,5 +1,14 @@ -include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools) +# configvalues.h +add_custom_command( + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h + DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py + OUTPUT ${GENERATED_SRC}/configvalues.h +) +set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) + +include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC}) add_library(vhdlparser STATIC +${GENERATED_SRC}/configvalues.h CharStream.cc ParseException.cc Token.cc diff --git a/vhdlparser/VhdlParser.cc b/vhdlparser/VhdlParser.cc index acdea91..f6de9f9 100644 --- a/vhdlparser/VhdlParser.cc +++ b/vhdlparser/VhdlParser.cc @@ -5710,7 +5710,7 @@ QCString VhdlParser::library_clause() {QCString s;if (!hasError) { } -if ( parse_sec==0 && Config_getBool("SHOW_INCLUDE_FILES") ) +if ( parse_sec==0 && Config_getBool(SHOW_INCLUDE_FILES) ) { addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::LIBRARY,s.data(),"_library_",Public); } @@ -10397,7 +10397,7 @@ QStringList ql1=QStringList::split(",",s,FALSE); { QStringList ql=QStringList::split(".",ql1[j],FALSE); QCString it=ql[1].utf8(); - if ( parse_sec==0 && Config_getBool("SHOW_INCLUDE_FILES") ) + if ( parse_sec==0 && Config_getBool(SHOW_INCLUDE_FILES) ) { VhdlParser::addVhdlType(it.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::USE,it.data(),"_use_",Public); } diff --git a/vhdlparser/vhdlparser.jj b/vhdlparser/vhdlparser.jj index 2886d29..88132ae 100644 --- a/vhdlparser/vhdlparser.jj +++ b/vhdlparser/vhdlparser.jj @@ -1501,7 +1501,7 @@ QCString library_clause() : {QCString s;} (<LIBRARY_T> s=identifier_list() <SEMI_T> ) { - if ( parse_sec==0 && Config_getBool("SHOW_INCLUDE_FILES") ) + if ( parse_sec==0 && Config_getBool(SHOW_INCLUDE_FILES) ) { addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::LIBRARY,s.data(),"_library_",Public); } @@ -2408,7 +2408,7 @@ QCString unconstraint_array_definition() : {QCString s,s1,s2,s3;} { QStringList ql=QStringList::split(".",ql1[j],FALSE); QCString it=ql[1].utf8(); - if ( parse_sec==0 && Config_getBool("SHOW_INCLUDE_FILES") ) + if ( parse_sec==0 && Config_getBool(SHOW_INCLUDE_FILES) ) { VhdlParser::addVhdlType(it.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::USE,it.data(),"_use_",Public); } |