diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/config.xml | 10 | ||||
-rw-r--r-- | src/defgen.cpp | 2 | ||||
-rw-r--r-- | src/docparser.cpp | 4 | ||||
-rw-r--r-- | src/docparser.h | 4 | ||||
-rw-r--r-- | src/docsets.cpp | 2 | ||||
-rw-r--r-- | src/doxygen.cpp | 8 | ||||
-rw-r--r-- | src/doxygen.md | 2 | ||||
-rw-r--r-- | src/fortrancode.l | 2 | ||||
-rw-r--r-- | src/htmldocvisitor.cpp | 6 | ||||
-rw-r--r-- | src/htmlgen.cpp | 4 | ||||
-rw-r--r-- | src/latexgen.cpp | 2 | ||||
-rw-r--r-- | src/memberdef.cpp | 4 | ||||
-rw-r--r-- | src/plantuml.h | 2 | ||||
-rw-r--r-- | src/searchindex.cpp | 4 | ||||
-rw-r--r-- | src/searchindex.h | 4 | ||||
-rw-r--r-- | src/translator.h | 4 | ||||
-rw-r--r-- | src/util.cpp | 8 | ||||
-rw-r--r-- | src/vhdldocgen.cpp | 6 | ||||
-rw-r--r-- | src/vhdljjparser.h | 2 |
19 files changed, 40 insertions, 40 deletions
diff --git a/src/config.xml b/src/config.xml index bf74fff..7dc95b4 100644 --- a/src/config.xml +++ b/src/config.xml @@ -648,7 +648,7 @@ Go to the <a href="commands.html">next</a> section or return to the With this tag you can assign which parser to use for a given extension. Doxygen has a built-in mapping, but you can override or extend it using this tag. The format is <code>ext=language</code>, where \c ext is a file extension, and language is one of - the parsers supported by doxygen: IDL, Java, Javascript, Csharp (C#), C, C++, D, PHP, + the parsers supported by doxygen: IDL, Java, JavaScript, Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: Fortran. In the later case the parser tries to guess whether the code is fixed or free @@ -2034,9 +2034,9 @@ hr.footer { <![CDATA[ If the \c HTML_DYNAMIC_MENUS tag is set to \c YES then the generated HTML documentation will contain a main index with vertical navigation menus that - are dynamically created via Javascript. If disabled, the navigation index will consists of + are dynamically created via JavaScript. If disabled, the navigation index will consists of multiple levels of tabs that are statically embedded in every HTML page. - Disable this option to support browsers that do not have Javascript, like + Disable this option to support browsers that do not have JavaScript, like the Qt help browser. ]]> </docs> @@ -2383,7 +2383,7 @@ The \c DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. <docs> <![CDATA[ Enable the \c USE_MATHJAX option to render \f$\mbox{\LaTeX}\f$ formulas using MathJax - (see https://www.mathjax.org) which uses client side Javascript for the + (see https://www.mathjax.org) which uses client side JavaScript for the rendering instead of using pre-rendered bitmaps. Use this if you do not have \f$\mbox{\LaTeX}\f$ installed or if you want to formulas look prettier in the HTML output. When enabled you may also need to install MathJax separately and @@ -2493,7 +2493,7 @@ MATHJAX_CODEFILE = disableRenderer.js <docs> <![CDATA[ When the \c SERVER_BASED_SEARCH tag is enabled the search engine will be -implemented using a web server instead of a web client using Javascript. +implemented using a web server instead of a web client using JavaScript. There are two flavors of web server based searching depending on the \ref cfg_external_search "EXTERNAL_SEARCH" setting. When disabled, diff --git a/src/defgen.cpp b/src/defgen.cpp index b145f0e..cc3d5af 100644 --- a/src/defgen.cpp +++ b/src/defgen.cpp @@ -288,7 +288,7 @@ void generateDEFForMember(MemberDef *md, { if (rmd->getStartBodyLine()!=-1 && rmd->getBodyDef()) { - t << memPrefix << "referenceby = {" << endl; + t << memPrefix << "referencedby = {" << endl; t << refPrefix << "id = '" << rmd->getBodyDef()->getOutputFileBase() << "_1" // encoded ':' character (see util.cpp:convertNameToFile) diff --git a/src/docparser.cpp b/src/docparser.cpp index a1509fc..a8d13d9 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -7532,7 +7532,7 @@ QCString getDirHtmlClassOfPage(QCString pageTitle) return result; } -QCString getHtmlDirEmbedingChar(QString::Direction textDir) +QCString getHtmlDirEmbeddingChar(QString::Direction textDir) { if (textDir == QString::DirLTR) return "‪"; @@ -7541,7 +7541,7 @@ QCString getHtmlDirEmbedingChar(QString::Direction textDir) return ""; } -QCString getJsDirEmbedingChar(QString::Direction textDir) +QCString getJsDirEmbeddingChar(QString::Direction textDir) { if (textDir == QString::DirLTR) return "\\u202A"; diff --git a/src/docparser.h b/src/docparser.h index 5999eae..2d53429 100644 --- a/src/docparser.h +++ b/src/docparser.h @@ -40,8 +40,8 @@ QString::Direction getTextDirByConfig(const DocNode *node); QString::Direction getTextDirByConfig(const DocPara *para, int nodeIndex); QCString getDirHtmlClassOfNode(QString::Direction textDir, const QCString &initValue=""); QCString getDirHtmlClassOfPage(QCString pageTitle); -QCString getHtmlDirEmbedingChar(QString::Direction textDir); -QCString getJsDirEmbedingChar(QString::Direction textDir); +QCString getHtmlDirEmbeddingChar(QString::Direction textDir); +QCString getJsDirEmbeddingChar(QString::Direction textDir); //--------------------------------------------------------------------------- diff --git a/src/docsets.cpp b/src/docsets.cpp index 439e924..a838923 100644 --- a/src/docsets.cpp +++ b/src/docsets.cpp @@ -322,7 +322,7 @@ void DocSets::addIndexItem(const Definition *context,const MemberDef *md, case SrcLangExt_PHP: lang="php"; break; // PHP4/5 case SrcLangExt_D: lang="d"; break; // D case SrcLangExt_Java: lang="java"; break; // Java - case SrcLangExt_JS: lang="javascript"; break; // Javascript + case SrcLangExt_JS: lang="javascript"; break; // JavaScript case SrcLangExt_Python: lang="python"; break; // Python case SrcLangExt_Fortran: lang="fortran"; break; // Fortran case SrcLangExt_VHDL: lang="vhdl"; break; // VHDL diff --git a/src/doxygen.cpp b/src/doxygen.cpp index ed1c5a8..d760678 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -1230,7 +1230,7 @@ static void resolveClassNestingRelations() Definition *d = buildScopeFromQualifiedName(name,name.contains("::"),cd->getLanguage(),0); if (d!=cd && !cd->getDefFileName().isEmpty()) // avoid recursion in case of redundant scopes, i.e: namespace N { class N::C {}; } - // for this case doxygen assumes the exitance of a namespace N::N in which C is to be found! + // for this case doxygen assumes the existence of a namespace N::N in which C is to be found! // also avoid warning for stuff imported via a tagfile. { d->addInnerCompound(cd); @@ -4432,7 +4432,7 @@ static bool findClassRelation( // base class has template specifiers { // TODO: here we should try to find the correct template specialization - // but for now, we only look for the unspecializated base class. + // but for now, we only look for the unspecialized base class. int e=findEndOfTemplate(baseClassName,i+1); //printf("baseClass==0 i=%d e=%d\n",i,e); if (e!=-1) // end of template was found at e @@ -11456,7 +11456,7 @@ void generateOutput() g_s.begin("Generating search indices...\n"); if (searchEngine && !serverBasedSearch && (generateHtml || g_useOutputTemplate)) { - createJavascriptSearchIndex(); + createJavaScriptSearchIndex(); } // generate search indices (need to do this before writing other HTML @@ -11474,7 +11474,7 @@ void generateOutput() HtmlGenerator::writeSearchData(searchDirName); if (!serverBasedSearch) // client side search index { - writeJavascriptSearchIndex(); + writeJavaScriptSearchIndex(); } } g_s.end(); diff --git a/src/doxygen.md b/src/doxygen.md index 7680a94..c124e09 100644 --- a/src/doxygen.md +++ b/src/doxygen.md @@ -188,7 +188,7 @@ Topics TODO - Qt Help (qhp) - Eclipse Help - Search index - - Javascript based + - JavaScript based - Server based - External - Citations diff --git a/src/fortrancode.l b/src/fortrancode.l index 21d1fa5..c4532f3 100644 --- a/src/fortrancode.l +++ b/src/fortrancode.l @@ -1250,7 +1250,7 @@ LANGUAGE_BIND_SPEC BIND{BS}"("{BS}C{BS}(,{BS}NAME{BS}"="{BS}"\""(.*)"\""{BS})?") else { codifyLines(yytext); - // comment cannot extend over the end of a line so should always be terminatd at the end of the line. + // comment cannot extend over the end of a line so should always be terminated at the end of the line. if (g_currentFontClass && !strcmp(g_currentFontClass,"comment")) endFontClass(); } g_contLineNr++; diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index e1466da..6312a65 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -1259,7 +1259,7 @@ void HtmlDocVisitor::visitPre(DocPara *p) if (needsTag) m_t << "<p" << getDirHtmlClassOfNode(getTextDirByConfig(p), contexts[t]) << htmlAttribsToString(p->attribs()) << ">"; else if(!paragraphAlreadyStarted) - m_t << getHtmlDirEmbedingChar(getTextDirByConfig(p)) << htmlAttribsToString(p->attribs()); + m_t << getHtmlDirEmbeddingChar(getTextDirByConfig(p)) << htmlAttribsToString(p->attribs()); } void HtmlDocVisitor::visitPost(DocPara *p) @@ -1757,7 +1757,7 @@ void HtmlDocVisitor::visitPre(DocImage *img) else { m_t << "<div class=\"caption\">" << endl; - m_t << getHtmlDirEmbedingChar(getTextDirByConfig(img)); + m_t << getHtmlDirEmbeddingChar(getTextDirByConfig(img)); } } else if (inlineImage) @@ -2491,7 +2491,7 @@ void HtmlDocVisitor::forceStartParagraph(DocNode *n) if (needsTag) m_t << "<p" << getDirHtmlClassOfNode(getTextDirByConfig(para, nodeIndex)) << ">"; else - m_t << getHtmlDirEmbedingChar(getTextDirByConfig(para, nodeIndex)); + m_t << getHtmlDirEmbeddingChar(getTextDirByConfig(para, nodeIndex)); } } diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index d47a38c..52ffecc 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -229,7 +229,7 @@ static QCString substituteHtmlKeywords(const QCString &s, const QCString &relPath, const QCString &navPath=QCString()) { - // Build CSS/Javascript tags depending on treeview, search engine settings + // Build CSS/JavaScript tags depending on treeview, search engine settings QCString cssFile; QStrList extraCssFile; QCString generatedBy; @@ -487,7 +487,7 @@ void HtmlCodeGenerator::codify(const char *str) void HtmlCodeGenerator::docify(const char *str) { - m_t << getHtmlDirEmbedingChar(getTextDirByConfig(str)); + m_t << getHtmlDirEmbeddingChar(getTextDirByConfig(str)); if (str && m_streamSet) { diff --git a/src/latexgen.cpp b/src/latexgen.cpp index addde4c..7d54f7a 100644 --- a/src/latexgen.cpp +++ b/src/latexgen.cpp @@ -1938,7 +1938,7 @@ void LatexGenerator::writeNonBreakableSpace(int) // startDescTable() // - startDescTableRow() // - startDescTableTitle() -// - endDescTabelTitle() +// - endDescTableTitle() // - startDescTableData() // - endDescTableData() // - endDescTableRow() diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 99ed224..e03d1df 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -2181,7 +2181,7 @@ bool MemberDefImpl::isBriefSectionVisible() const //printf("visibleIfStatic=%d visibleIfDocumented=%d visibleIfEnabled=%d " - // "visibleIfPrivate=%d visibltIfNotDefaultCDTor=%d " + // "visibleIfPrivate=%d visibleIfNotDefaultCDTor=%d " // "visibleIfFriendCompound=%d !annScope=%d\n", // visibleIfStatic,visibleIfDocumented, // visibleIfEnabled,visibleIfPrivate,visibleIfNotDefaultCDTor, @@ -2744,7 +2744,7 @@ bool MemberDefImpl::isDetailedSectionVisible(bool inGroup,bool inFile) const bool visible = isDetailedSectionLinkable() && groupFilter && fileFilter && !isReference(); bool result = visible || simpleFilter; - //printf("%s::isDetailedSectionVisble: %d groupFilter=%d fileFilter=%d\n", + //printf("%s::isDetailedSectionVisible: %d groupFilter=%d fileFilter=%d\n", // name().data(),result,groupFilter,fileFilter); return result; } diff --git a/src/plantuml.h b/src/plantuml.h index 6c99eba..d3a01f5 100644 --- a/src/plantuml.h +++ b/src/plantuml.h @@ -64,7 +64,7 @@ class PlantumlManager QDict< QList<QCString> > m_pngPlantumlFiles; QDict< QList<QCString> > m_svgPlantumlFiles; QDict< QList<QCString> > m_epsPlantumlFiles; - QDict< QCString > m_pngPlantumlContent; // use circular queue for using multi-proecessor (multi threading) + QDict< QCString > m_pngPlantumlContent; // use circular queue for using multi-processor (multi threading) QDict< QCString > m_svgPlantumlContent; QDict< QCString > m_epsPlantumlContent; QCString m_cachedPlantumlAllContent; // read from CACHE_FILENAME file diff --git a/src/searchindex.cpp b/src/searchindex.cpp index 22d33b6..eee1aa1 100644 --- a/src/searchindex.cpp +++ b/src/searchindex.cpp @@ -731,7 +731,7 @@ static QCString searchId(const QCString &s) return result; } -void createJavascriptSearchIndex() +void createJavaScriptSearchIndex() { bool sliceOpt = Config_getBool(OPTIMIZE_OUTPUT_SLICE); @@ -953,7 +953,7 @@ void createJavascriptSearchIndex() } } -void writeJavascriptSearchIndex() +void writeJavaScriptSearchIndex() { int i; int cnt = 0; diff --git a/src/searchindex.h b/src/searchindex.h index 8cbe352..923973c 100644 --- a/src/searchindex.h +++ b/src/searchindex.h @@ -165,8 +165,8 @@ struct SearchIndexInfo QCString text; }; -void createJavascriptSearchIndex(); -void writeJavascriptSearchIndex(); +void createJavaScriptSearchIndex(); +void writeJavaScriptSearchIndex(); const SearchIndexInfo *getSearchIndices(); #endif diff --git a/src/translator.h b/src/translator.h index ac55911..188b775 100644 --- a/src/translator.h +++ b/src/translator.h @@ -51,12 +51,12 @@ class Translator */ virtual QCString latexFontenc() { return "T1"; } /*! - * Sets the commands to be insered directly after the `\\begin{document}` + * Sets the commands to be inserted directly after the `\\begin{document}` * in the LaTeX document. */ virtual QCString latexDocumentPre() { return ""; } /*! - * Sets the commands to be insered directly before the `\\end{document}` + * Sets the commands to be inserted directly before the `\\end{document}` * in the LaTeX document. */ virtual QCString latexDocumentPost() { return ""; } diff --git a/src/util.cpp b/src/util.cpp index 4c3ebb0..9c46516 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -3376,7 +3376,7 @@ static QCString getCanonicalTypeForIdentifier( if (cd && cd->isUsedOnly()) cd=0; // ignore types introduced by usage relations //printf("cd=%p mtype=%p\n",cd,mType); - //printf(" getCanonicalTypeForIdentifer: symbol=%s word=%s cd=%s d=%s fs=%s cd->isTemplate=%d\n", + //printf(" getCanonicalTypeForIdentifier: symbol=%s word=%s cd=%s d=%s fs=%s cd->isTemplate=%d\n", // symName.data(), // word.data(), // cd?cd->name().data():"<none>", @@ -5966,7 +5966,7 @@ QCString convertToHtml(const char *s,bool keepEntities) static GrowBuf growBuf; growBuf.clear(); if (s==0) return ""; - growBuf.addStr(getHtmlDirEmbedingChar(getTextDirByConfig(s))); + growBuf.addStr(getHtmlDirEmbeddingChar(getTextDirByConfig(s))); const char *p=s; char c; while ((c=*p++)) @@ -6014,7 +6014,7 @@ QCString convertToJSString(const char *s, bool applyTextDir) growBuf.clear(); if (s==0) return ""; if (applyTextDir) - growBuf.addStr(getJsDirEmbedingChar(getTextDirByConfig(s))); + growBuf.addStr(getJsDirEmbeddingChar(getTextDirByConfig(s))); const char *p=s; char c; while ((c=*p++)) @@ -8395,7 +8395,7 @@ QCString langToString(SrcLangExt lang) case SrcLangExt_PHP: return "PHP"; case SrcLangExt_ObjC: return "Objective-C"; case SrcLangExt_Cpp: return "C++"; - case SrcLangExt_JS: return "Javascript"; + case SrcLangExt_JS: return "JavaScript"; case SrcLangExt_Python: return "Python"; case SrcLangExt_Fortran: return "Fortran"; case SrcLangExt_VHDL: return "VHDL"; diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp index 66d8384..3c30174 100644 --- a/src/vhdldocgen.cpp +++ b/src/vhdldocgen.cpp @@ -82,7 +82,7 @@ static QList<MemberDef>* getPorts(ClassDef *cd); static void writeVhdlEntityToolTip(FTextStream& t,ClassDef *cd); static void endDot(FTextStream &t); static void writeTable(QList<MemberDef>* port,FTextStream & t); -static void endTabel(FTextStream &t); +static void endTable(FTextStream &t); static void writeClassToDot(FTextStream &t,ClassDef* cd); static void writeVhdlDotLink(FTextStream &t,const QCString &a,const QCString &b,const QCString &style); //static void writeVhdlPortToolTip(FTextStream& t,QList<MemberDef>* port,ClassDef *cd); @@ -228,7 +228,7 @@ void VhdlDocGen::writeOverview() startTable(t,cd->name()); writeClassToDot(t,cd); writeTable(port,t); - endTabel(t); + endTable(t); // writeVhdlPortToolTip(t,port,cd); writeVhdlEntityToolTip(t,cd); @@ -448,7 +448,7 @@ static void writeColumn(FTextStream &t,MemberDef *md,bool start) } } -static void endTabel(FTextStream &t) +static void endTable(FTextStream &t) { t << "</TABLE>>\n"; t << "] \n"; diff --git a/src/vhdljjparser.h b/src/vhdljjparser.h index f6cd17d..f3e7d70 100644 --- a/src/vhdljjparser.h +++ b/src/vhdljjparser.h @@ -61,7 +61,7 @@ struct VhdlConfNode { arch=a; // architecture e.g. for iobuffer arch=arch.lower(); - binding=b; // binding e.g. use entiy work.xxx(bev) + binding=b; // binding e.g. use entity work.xxx(bev) binding=binding.lower(); confVhdl=config; // configuration foo is bar compSpec=cs; |