From a883f65ab94973d4c7948623186159f978517851 Mon Sep 17 00:00:00 2001 From: albert-github Date: Mon, 9 Mar 2015 19:33:18 +0100 Subject: Bug 745870 - [PATCH] QT4's qmake is titled differently on Fedora 21 Corrected patch for the problem. Here nothing to be copied but multiple possibilities for executables are checked. --- addon/doxywizard/Makefile.in | 2 +- configure | 28 +++++++++++++++++++--------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/addon/doxywizard/Makefile.in b/addon/doxywizard/Makefile.in index fe0ac21..79b885e 100644 --- a/addon/doxywizard/Makefile.in +++ b/addon/doxywizard/Makefile.in @@ -10,7 +10,7 @@ # See the GNU General Public License for more details. # -QMAKE=$(QTDIR)/bin/qmake $(MKSPECS) +QMAKE=$(QTDIR)/bin/$(QMAKEEXE) $(MKSPECS) INCBUFSIZE=$(PYTHON) ../../src/increasebuffer.py all: Makefile.doxywizard diff --git a/configure b/configure index 544d06a..c7040be 100755 --- a/configure +++ b/configure @@ -363,18 +363,27 @@ if test "$f_wizard" = YES; then echo " QTDIR environment variable not set!" printf " Checking for Qt..." for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do - if test -x "$d/bin/qmake"; then - QTDIR=$d - break 2 - fi + for e in qmake gmake-qt4; do + if test -x "$d/bin/$e"; then + QTDIR=$d + QMAKEEXE=$e + break 2 + fi + done done else - if test -e "$QTDIR/bin/qmake"; then - printf " Detected Qt via the QTDIR environment variable..." - else + for e in qmake gmake-qt4; do + if test -x "$QTDIR/bin/$e"; then + if test -e "$QTDIR/bin/$e"; then + printf " Detected Qt via the QTDIR environment variable..." + QMAKEEXE=$e + fi + fi + done + if test -z "$QMAKEEXE"; then printf "ERROR Detected Qt via the QTDIR environment variable..." - echo ", but $QTDIR/bin/qmake does not exist." - echo " Set the QTDIR environment variable such that \$QTDIR/bin/qmake exists." + echo ", but $QTDIR/bin/qmake or variant does not exist." + echo " Set the QTDIR environment variable such that \$QTDIR/bin/qmake or variant exists." exit 2 fi fi @@ -771,6 +780,7 @@ INSTTOOL = $f_insttool DOXYDOCS = .. DOCDIR = $f_docdir QTDIR = $QTDIR +QMAKEEXE = $QMAKEEXE EOF if test "$f_dot" != NO; then -- cgit v0.12 From eac0fd660bffe62ae29a190308bf21b21d49647b Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Tue, 10 Mar 2015 20:18:39 +0100 Subject: Patch fixing a typo in Pull Request 307 --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index c7040be..8d9f1bb 100755 --- a/configure +++ b/configure @@ -363,7 +363,7 @@ if test "$f_wizard" = YES; then echo " QTDIR environment variable not set!" printf " Checking for Qt..." for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; do - for e in qmake gmake-qt4; do + for e in qmake qmake-qt4; do if test -x "$d/bin/$e"; then QTDIR=$d QMAKEEXE=$e @@ -372,7 +372,7 @@ if test "$f_wizard" = YES; then done done else - for e in qmake gmake-qt4; do + for e in qmake qmake-qt4; do if test -x "$QTDIR/bin/$e"; then if test -e "$QTDIR/bin/$e"; then printf " Detected Qt via the QTDIR environment variable..." -- cgit v0.12 From f5efa2f383fe89b53bd8fc27b2116e8636417ebf Mon Sep 17 00:00:00 2001 From: Adrian Negreanu Date: Mon, 9 Mar 2015 22:38:41 +0200 Subject: runtests.pl: mmn version has dash as separator Final version can be major.minor.revision-mmn Revision can either be x or x.y. --- testing/runtests.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/runtests.pl b/testing/runtests.pl index 30fe969..0e1938d 100755 --- a/testing/runtests.pl +++ b/testing/runtests.pl @@ -81,7 +81,7 @@ sub compare_ok { sub chop_volatile { my $line = shift; - $line =~ s/version="\d\.\d+\.\d+(\.\d+)?"/version=""/g; # strip version + $line =~ s/version="\d\.\d+\.\d+(\.\d+)?(\-\d+)?"/version=""/g; # strip version $line =~ s/file=".*\/(.*)"/file="$1"/g; # strip location return $line; } -- cgit v0.12 From e366acaf0c27ce43ec80a70c0667c27cd5ef9d29 Mon Sep 17 00:00:00 2001 From: albert-github Date: Wed, 11 Mar 2015 18:07:02 +0100 Subject: Internal doxygen docs gives: warning: Unsupported xml/html tag <...> found When generating the doxygen internal documentation we get the warning about Unsupported xml/html tag. This patch fixes this problem. (TokenManager.h is said to be generated code but original source is not found). --- src/arguments.h | 2 +- vhdlparser/TokenManager.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/arguments.h b/src/arguments.h index 778fc32..8b3d211 100644 --- a/src/arguments.h +++ b/src/arguments.h @@ -70,7 +70,7 @@ struct Argument QCString array; /*!< Argument's array specifier (may be empty) */ QCString defval; /*!< Argument's default value (may be empty) */ QCString docs; /*!< Argument's documentation (may be empty) */ - QCString typeConstraint; /*!< Used for Java generics: */ + QCString typeConstraint; /*!< Used for Java generics: \ */ }; /*! \brief This class represents an function or template argument list. diff --git a/vhdlparser/TokenManager.h b/vhdlparser/TokenManager.h index 775e43d..68fbe2f 100644 --- a/vhdlparser/TokenManager.h +++ b/vhdlparser/TokenManager.h @@ -16,7 +16,7 @@ namespace parser { class TokenManager { public: /** This gets the next token from the input stream. - * A token of kind 0 () should be returned on EOF. + * A token of kind 0 (\) should be returned on EOF. */ virtual ~TokenManager() { } virtual Token *getNextToken() = 0; -- cgit v0.12 From 320ebb35dd4a615a7a692d71de4587be9ce8b99b Mon Sep 17 00:00:00 2001 From: albert-github Date: Wed, 11 Mar 2015 19:02:51 +0100 Subject: Showing grey/gray in documentation The US-English spelling is gray where as the British-English spelling is grey. The doxygen documentation is in US-English spelling. This patch corrects the wrong spelled, user visible, grey to gray. --- qtools/qfeatures.h | 2 +- src/translator_ar.h | 2 +- src/translator_en.h | 2 +- src/translator_fa.h | 2 +- src/translator_lt.h | 2 +- src/translator_lv.h | 2 +- src/translator_si.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtools/qfeatures.h b/qtools/qfeatures.h index d6c2882..1042ce6 100644 --- a/qtools/qfeatures.h +++ b/qtools/qfeatures.h @@ -378,7 +378,7 @@ */ //#define QT_NO_QWS_DEPTH_1 /*! - 4-bit greyscale + 4-bit grayscale */ //#define QT_NO_QWS_DEPTH_4 /*! diff --git a/src/translator_ar.h b/src/translator_ar.h index f23d6df..5daaa4c 100644 --- a/src/translator_ar.h +++ b/src/translator_ar.h @@ -1051,7 +1051,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6 "
  • %A filled black box represents the struct or class for which the " "graph is generated.\n" "
  • %A box with a black border denotes a documented struct or class.\n" - "
  • %A box with a grey border denotes an undocumented struct or class.\n" + "
  • %A box with a gray border denotes an undocumented struct or class.\n" "
  • %A box with a red border denotes a documented struct or class for" "which not all inheritance/containment relations are shown. %A graph is " "truncated if it does not fit within the specified boundaries.\n" diff --git a/src/translator_en.h b/src/translator_en.h index 93998d2..ba89726 100644 --- a/src/translator_en.h +++ b/src/translator_en.h @@ -1022,7 +1022,7 @@ class TranslatorEnglish : public Translator "
  • %A filled gray box represents the struct or class for which the " "graph is generated.
    • \n" "
  • %A box with a black border denotes a documented struct or class.
    • \n" - "
  • %A box with a grey border denotes an undocumented struct or class.
    • \n" + "
  • %A box with a gray border denotes an undocumented struct or class.
    • \n" "
  • %A box with a red border denotes a documented struct or class for" "which not all inheritance/containment relations are shown. %A graph is " "truncated if it does not fit within the specified boundaries.
    • \n" diff --git a/src/translator_fa.h b/src/translator_fa.h index e18e118..7effafe 100644 --- a/src/translator_fa.h +++ b/src/translator_fa.h @@ -1022,7 +1022,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5 "
  • %A filled black box represents the struct or class for which the " "graph is generated.\n" "
  • %A box with a black border denotes a documented struct or class.\n" - "
  • %A box with a grey border denotes an undocumented struct or class.\n" + "
  • %A box with a gray border denotes an undocumented struct or class.\n" "
  • %A box with a red border denotes a documented struct or class for" "which not all inheritance/containment relations are shown. %A graph is " "truncated if it does not fit within the specified boundaries.\n" diff --git a/src/translator_lt.h b/src/translator_lt.h index f6e07bf..faf4197 100644 --- a/src/translator_lt.h +++ b/src/translator_lt.h @@ -1013,7 +1013,7 @@ class TranslatorLithuanian : public TranslatorAdapter_1_4_6 "
  • %A filled black box represents the struct or class for which the " "graph is generated.\n" "
  • %A box with a black border denotes a documented struct or class.\n" - "
  • %A box with a grey border denotes an undocumented struct or class.\n" + "
  • %A box with a gray border denotes an undocumented struct or class.\n" "
  • %A box with a red border denotes a documented struct or class for" "which not all inheritance/containment relations are shown. %A graph is " "truncated if it does not fit within the specified boundaries.\n" diff --git a/src/translator_lv.h b/src/translator_lv.h index 1161d48..20b2a38 100644 --- a/src/translator_lv.h +++ b/src/translator_lv.h @@ -1028,7 +1028,7 @@ class TranslatorLatvian : public TranslatorAdapter_1_8_4 "
  • %A filled gray box represents the struct or class for which the " "graph is generated.
    • \n" "
  • %A box with a black border denotes a documented struct or class.
    • \n" - "
  • %A box with a grey border denotes an undocumented struct or class.
    • \n" + "
  • %A box with a gray border denotes an undocumented struct or class.
    • \n" "
  • %A box with a red border denotes a documented struct or class for" "which not all inheritance/containment relations are shown. %A graph is " "truncated if it does not fit within the specified boundaries.
    • \n" diff --git a/src/translator_si.h b/src/translator_si.h index 10193a6..97a1931 100644 --- a/src/translator_si.h +++ b/src/translator_si.h @@ -691,7 +691,7 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6 "
  • %A filled black box represents the struct or class for which the " "graph is generated.\n" "
  • %A box with a black border denotes a documented struct or class.\n" - "
  • %A box with a grey border denotes an undocumented struct or class.\n" + "
  • %A box with a gray border denotes an undocumented struct or class.\n" "
  • %A box with a red border denotes a documented struct or class for\n" "which not all inheritance/containment relations are shown. %A graph is " "truncated if it does not fit within the specified boundaries." -- cgit v0.12 From 072383ed1c6fcfff7a7619d92ce3a8cb0b91fff9 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sun, 15 Mar 2015 18:11:58 +0100 Subject: HTML entity ° gives problems in LaTeX When having °C in the documentation there is no separation between the \textdegree and C in LaTeX. This patch fixes this problem. --- src/htmlentity.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/htmlentity.cpp b/src/htmlentity.cpp index 7b61ead..c4c601f 100644 --- a/src/htmlentity.cpp +++ b/src/htmlentity.cpp @@ -59,7 +59,7 @@ static struct htmlEntityInfo { SYM(shy), "\xc2\xad", "­", "", "­", "{$\\-$}", NULL, "\\-", { NULL, DocSymbol::Perl_unknown }}, { SYM(reg), "\xc2\xae", "®", "", "®", "\\textregistered{}", "(R)", "\\'AE", { "registered", DocSymbol::Perl_symbol }}, { SYM(macr), "\xc2\xaf", "¯", "", "¯", "\\={}", NULL, "\\'AF", { NULL, DocSymbol::Perl_unknown }}, - { SYM(deg), "\xc2\xb0", "°", "", "°", "\\textdegree", NULL, "\\'B0", { "deg", DocSymbol::Perl_symbol }}, + { SYM(deg), "\xc2\xb0", "°", "", "°", "\\textdegree{}", NULL, "\\'B0", { "deg", DocSymbol::Perl_symbol }}, { SYM(plusmn), "\xc2\xb1", "±", "", "±", "{$\\pm$}", NULL, "\\'B1", { "+/-", DocSymbol::Perl_string }}, { SYM(sup2), "\xc2\xb2", "²", "", "²", "\\texttwosuperior{}", NULL, "\\'B2", { NULL, DocSymbol::Perl_unknown }}, { SYM(sup3), "\xc2\xb3", "³", "", "³", "\\textthreesuperior{}", NULL, "\\'B3", { NULL, DocSymbol::Perl_unknown }}, -- cgit v0.12 From ebe3e8ec4a09edbb8a5b2dde88b6c479b03c0be9 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sun, 15 Mar 2015 18:44:07 +0100 Subject: Internal debug option -d lex is not described The Internal debug option -d lex had not been described. --- src/doxygen.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/doxygen.md b/src/doxygen.md index 9a9d726..4caa198 100644 --- a/src/doxygen.md +++ b/src/doxygen.md @@ -168,6 +168,10 @@ easy ways to get debug information. command is specified) - validate
    Currently not used + - lex
    + Provide output of the `lex` files used. When a lexer ais started and when a lexer + ends the name of `lex` file is given so it is possible to see in which lexer the + problem occurs. This makes it easier to select the file to be compiled in `lex` debug mode. Producing output ---------------- -- cgit v0.12 From 00a91ae9fabe7783260c7c3fcdfec5b1ead49350 Mon Sep 17 00:00:00 2001 From: albert-github Date: Mon, 16 Mar 2015 20:03:16 +0100 Subject: Internal debug option -d lex is not described Corrected typing error in internal -d lex documentation --- src/doxygen.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/doxygen.md b/src/doxygen.md index 4caa198..ccb47b9 100644 --- a/src/doxygen.md +++ b/src/doxygen.md @@ -169,8 +169,8 @@ easy ways to get debug information. - validate
    Currently not used - lex
    - Provide output of the `lex` files used. When a lexer ais started and when a lexer - ends the name of `lex` file is given so it is possible to see in which lexer the + Provide output of the `lex` files used. When a lexer is started and when a lexer + ends the name of the `lex` file is given so it is possible to see in which lexer the problem occurs. This makes it easier to select the file to be compiled in `lex` debug mode. Producing output -- cgit v0.12 From 17fdd71a0f7a02e8b72eaf86d67bc142210a7059 Mon Sep 17 00:00:00 2001 From: albert-github Date: Thu, 19 Mar 2015 19:56:14 +0100 Subject: Warning message multiple mainpages Based on the report in the doxygen forum (http://doxygen.10944.n7.nabble.com/WARNING-Found-more-than-one-mainpage-comment-block-td7092.html) about the hard to find multiple occurrences of a mainpage definition. This patch also outputs the name (and approximate line) of the first found mainpage. --- src/doxygen.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/doxygen.cpp b/src/doxygen.cpp index fbad9d1..17ec15d 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -8726,9 +8726,8 @@ static void findMainPage(EntryNav *rootNav) { Entry *root = rootNav->entry(); warn(root->fileName,root->startLine, - "found more than one \\mainpage comment block! Skipping this " - "block." - ); + "found more than one \\mainpage comment block! (first occurrence: %s, line %d), Skipping current block!", + Doxygen::mainPage->docFile().data(),Doxygen::mainPage->docLine()); } rootNav->releaseEntry(); -- cgit v0.12 From 213e680537303959f29b2424d40d74ecf66cb3f6 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 21 Mar 2015 11:54:21 +0100 Subject: Missing cross reference link Added cross reference link that was missing --- doc/commands.doc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/commands.doc b/doc/commands.doc index c899c1d..c8f77eb 100644 --- a/doc/commands.doc +++ b/doc/commands.doc @@ -3230,7 +3230,7 @@ class Receiver \addindex \\\. This command writes a dot (`.`) to the output. This can be useful to - prevent ending a brief description when JAVADOC_AUTOBRIEF is enabled + prevent ending a brief description when \ref cfg_javadoc_autobrief "JAVADOC_AUTOBRIEF" is enabled or to prevent starting a numbered list when the dot follows a number at the start of a line. -- cgit v0.12 From da3faf6b93fd3eb4e751d2c0cbd4ed9ceae7922b Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 21 Mar 2015 17:52:12 +0100 Subject: Warnings without filename In a number of instances we don't get the filename of where the error occurs but a name or even unknown between <> e.g. :1: warning: parameters of member fie_p2 are not (all) documented :1: warning: parameters of member p1.error are not (all) documented :1: warning: Member fie_p3 (function) of class p3::int1_p3 is not documented. This patch tries to overcome this problem by providing the right file: .../p2.h:8: warning: parameters of member fie_p2 are not (all) documented .../p1.py:7: warning: parameters of member p1.error are not (all) documented .../p3.f90:3: warning: Member fie_p3 (function) of class p3::int1_p3 is not documented. --- src/docparser.cpp | 4 ++-- src/memberdef.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/docparser.cpp b/src/docparser.cpp index fa77784..7944bf7 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -519,8 +519,8 @@ static void checkUndocumentedParams() } else { - warn_doc_error(g_memberDef->docFile(), - g_memberDef->docLine(), + warn_doc_error(g_memberDef->getDefFileName(), + g_memberDef->getDefLine(), substitute(errMsg,"%","%%")); } } diff --git a/src/memberdef.cpp b/src/memberdef.cpp index f27a579..4331181 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -2991,13 +2991,13 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol, { if (!hasDocumentedParams()) { - warn_doc_error(docFile(),docLine(), + warn_doc_error(getDefFileName(),getDefLine(), "parameters of member %s are not (all) documented", qPrint(qualifiedName())); } if (!hasDocumentedReturnType() && isFunction() && hasDocumentation()) { - warn_doc_error(docFile(),docLine(), + warn_doc_error(getDefFileName(),getDefLine(), "return type of member %s is not documented", qPrint(qualifiedName())); } @@ -3230,7 +3230,7 @@ void MemberDef::warnIfUndocumented() !isReference() ) { - warn_undoc(getDefFileName(),getDefLine(),"Member %s%s (%s) of %s %s is not documented.", + warn_undoc(d->getDefFileName(),d->getDefLine(),"Member %s%s (%s) of %s %s is not documented.", qPrint(name()),qPrint(argsString()),qPrint(memberTypeName()),t,qPrint(d->name())); } } -- cgit v0.12 From e4c0036962d8fa0ea9c1e38dbdb5e91168201f22 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sun, 22 Mar 2015 18:53:24 +0100 Subject: Bug 746614 - Bogus warning regarding nested comments In case the previous file gives a warning regarding the wrong used nested comments and the next file does not have any doxygen comment there is still the message that there is a nested comment but even without probable line numbers. The variable counting the nested comment level was not reset, this has been corrected with this patch. --- src/commentcnv.l | 1 + 1 file changed, 1 insertion(+) diff --git a/src/commentcnv.l b/src/commentcnv.l index 8c73ecb..979e6ee 100644 --- a/src/commentcnv.l +++ b/src/commentcnv.l @@ -1028,6 +1028,7 @@ void convertCppComments(BufStr *inBuf,BufStr *outBuf,const char *fileName) "Nesting level %d %s",g_nestingCount+1,tmp.data()); // add one for "normal" expected end of comment } g_commentStack.clear(); + g_nestingCount = 0; if (Debug::isFlagSet(Debug::CommentCnv)) { g_outBuf->at(g_outBuf->curPos())='\0'; -- cgit v0.12 From effbbcc72295f5843377ddce2794bcf6e7000322 Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Tue, 24 Mar 2015 07:20:21 -0500 Subject: Fix for bug 746673. Resolves a typo (dervied->derived) in sqlite prepared query var, which was preventing the derivedcompounddef table from populating. Fixing this issue also exposed an underlying problem where junk data was showing up in two columns. Porting some if/else logic from the code that inserts to basecompounddef seems to have fixed this, as well. --- src/sqlite3gen.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/sqlite3gen.cpp b/src/sqlite3gen.cpp index acd3995..40d744a 100644 --- a/src/sqlite3gen.cpp +++ b/src/sqlite3gen.cpp @@ -754,7 +754,7 @@ static void generateSqlite3ForMember(sqlite3*db,MemberDef *md,Definition *def) bindIntParameter(memberdef_insert,":new",md->isNew()); bindIntParameter(memberdef_insert,":optional",md->isOptional()); bindIntParameter(memberdef_insert,":required",md->isRequired()); - + bindIntParameter(memberdef_insert,":virt",md->virtualness()); } // place in the arguments and linkify the arguments @@ -1027,9 +1027,16 @@ static void generateSqlite3ForClass(sqlite3 *db, ClassDef *cd) BaseClassDef *bcd; for (bcli.toFirst();(bcd=bcli.current());++bcli) { - bindTextParameter(derivedcompoundref_insert,":base",cd->displayName()); - bindTextParameter(derivedcompoundref_insert,":dervied",bcd->classDef->displayName()); - bindTextParameter(derivedcompoundref_insert,":refid",bcd->classDef->getOutputFileBase()); + bindTextParameter(derivedcompoundref_insert,":base",cd->displayName(),FALSE); + if (!bcd->templSpecifiers.isEmpty()) + { + bindTextParameter(derivedcompoundref_insert,":derived",insertTemplateSpecifierInScope(bcd->classDef->name(),bcd->templSpecifiers),FALSE); + } + else + { + bindTextParameter(derivedcompoundref_insert,":derived",bcd->classDef->displayName(),FALSE); + } + bindTextParameter(derivedcompoundref_insert,":refid",bcd->classDef->getOutputFileBase(),FALSE); bindIntParameter(derivedcompoundref_insert,":prot",bcd->prot); bindIntParameter(derivedcompoundref_insert,":virt",bcd->virt); step(db,derivedcompoundref_insert); -- cgit v0.12 From b82320a6f57519443c46e5e3044fef97b1f8f618 Mon Sep 17 00:00:00 2001 From: orbitcowboy Date: Wed, 25 Mar 2015 15:14:12 +0100 Subject: Fixed typos in comments. --- jquery/jquery.ui-1.8.18.core.js | 2 +- testing/011/category_integer_07_arithmetic_08.xml | 2 +- testing/011_category.m | 2 +- testing/049/indexpage.xml | 2 +- testing/049_snippet.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jquery/jquery.ui-1.8.18.core.js b/jquery/jquery.ui-1.8.18.core.js index 98b4f9b..e6f1212 100644 --- a/jquery/jquery.ui-1.8.18.core.js +++ b/jquery/jquery.ui-1.8.18.core.js @@ -226,7 +226,7 @@ $(function() { div = body.appendChild( div = document.createElement( "div" ) ); // access offsetHeight before setting the style to prevent a layout bug - // in IE 9 which causes the elemnt to continue to take up space even + // in IE 9 which causes the element to continue to take up space even // after it is removed from the DOM (#8026) div.offsetHeight; diff --git a/testing/011/category_integer_07_arithmetic_08.xml b/testing/011/category_integer_07_arithmetic_08.xml index 73308db..12b6b6d 100644 --- a/testing/011/category_integer_07_arithmetic_08.xml +++ b/testing/011/category_integer_07_arithmetic_08.xml @@ -33,7 +33,7 @@ - substract operation + subtract operation diff --git a/testing/011_category.m b/testing/011_category.m index 8cb4d3a..f57c1d1 100644 --- a/testing/011_category.m +++ b/testing/011_category.m @@ -17,7 +17,7 @@ @interface Integer (Arithmetic) /** add operation */ - (id) add: (Integer *) addend; -/** substract operation */ +/** subtract operation */ - (id) sub: (Integer *) subtrahend; @end diff --git a/testing/049/indexpage.xml b/testing/049/indexpage.xml index 0f3a63b..a6c9b97 100644 --- a/testing/049/indexpage.xml +++ b/testing/049/indexpage.xml @@ -4,7 +4,7 @@ index My Project - A bubble sort algoritm First get the inputs for(i=0;i<n;i++){printf("Array[%d]=",i);scanf("%d",&arr[i]);}Then do the bubbling for(i=0;i<n;i++){for(j=0;j<n-i-1;j++){if(arr[j]>arr[j+1])//SwappingConditionisChecked{temp=arr[j];arr[j]=arr[j+1];arr[j+1]=temp;}}}Then write the result for(i=0;i<n;i++){printf("%4d",arr[i]);} + A bubble sort algorithm First get the inputs for(i=0;i<n;i++){printf("Array[%d]=",i);scanf("%d",&arr[i]);}Then do the bubbling for(i=0;i<n;i++){for(j=0;j<n-i-1;j++){if(arr[j]>arr[j+1])//SwappingConditionisChecked{temp=arr[j];arr[j]=arr[j+1];arr[j+1]=temp;}}}Then write the result for(i=0;i<n;i++){printf("%4d",arr[i]);} diff --git a/testing/049_snippet.cpp b/testing/049_snippet.cpp index 2749a62..614a43c 100644 --- a/testing/049_snippet.cpp +++ b/testing/049_snippet.cpp @@ -3,7 +3,7 @@ // config: EXAMPLE_PATH = . /** \mainpage - * A bubble sort algoritm + * A bubble sort algorithm * First get the inputs * \snippet snippet_test.cpp input * Then do the bubbling -- cgit v0.12 From 87429a2609b822d2b08ec17fb2a20464a5043c9e Mon Sep 17 00:00:00 2001 From: ppescher Date: Wed, 25 Mar 2015 18:33:53 +0100 Subject: fix enum brief description in RTF output bug: brief description of enum member is put at the beginning of the next list item, instead of at the end of the current list item --- src/memberlist.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/memberlist.cpp b/src/memberlist.cpp index fae285f..64fe44a 100644 --- a/src/memberlist.cpp +++ b/src/memberlist.cpp @@ -409,7 +409,6 @@ void MemberList::writePlainDeclarations(OutputList &ol, { ol.endDoxyAnchor(md->getOutputFileBase(),md->anchor()); } - ol.endMemberItem(); if (!md->briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC")) { DocRoot *rootNode = validatingParseDoc( @@ -437,6 +436,7 @@ void MemberList::writePlainDeclarations(OutputList &ol, delete rootNode; } ol.endMemberDeclaration(md->anchor(),inheritId); + ol.endMemberItem(); } md->warnIfUndocumented(); break; -- cgit v0.12 From 700a9ac3c177fdef25b9b00ed6bb5e0ea963d236 Mon Sep 17 00:00:00 2001 From: ppescher Date: Fri, 27 Mar 2015 12:57:39 +0100 Subject: fix for CHM TOC "Classes" entry to point to annotated file bug: when layout file disables Class List but Classes are still visible the related TOC entry of Compiled HTML Help file does not link to any page, so the annotated.html file is not reachable from the TOC tree even though it still gets generated --- src/index.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.cpp b/src/index.cpp index 2cb7de2..e7ba8e7 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -4140,7 +4140,7 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList0 && addToIndex) { - Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,0,0); + Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,"annotated",0); Doxygen::indexList->incContentsDepth(); needsClosing=TRUE; } -- cgit v0.12 From 4438e24b478de1fd97ccc81a3a9f7651124e1c63 Mon Sep 17 00:00:00 2001 From: ppescher Date: Fri, 27 Mar 2015 13:00:00 +0100 Subject: added HHC.exe own output to the debug output when extcmd flag enabled this may help debugging the source of the error --- src/doxygen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 17ec15d..09e92a4 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -11672,7 +11672,7 @@ void generateOutput() QString oldDir = QDir::currentDirPath(); QDir::setCurrent(Config_getString("HTML_OUTPUT")); portable_sysTimerStart(); - if (portable_system(Config_getString("HHC_LOCATION"), "index.hhp", FALSE)) + if (portable_system(Config_getString("HHC_LOCATION"), "index.hhp", Debug::isFlagSet(Debug::ExtCmd))) { err("failed to run html help compiler on index.hhp\n"); } -- cgit v0.12