From 44ca9512aaeb19f7fbd07afda88ec4cfe53ce831 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Sun, 29 Apr 2012 17:51:51 +0000 Subject: Release-1.8.0-20120429 --- INSTALL | 4 +- README | 4 +- configure | 8 +- doc/language.doc | 38 +- doc/lists.doc | 2 +- doc/markdown.doc | 2 +- doc/translator_report.txt | 368 ++++++------- qtools/Doxyfile | 2 +- qtools/qlist.doc | 6 +- src/classdef.cpp | 407 ++++++++++++-- src/classdef.h | 16 +- src/cmdmapper.cpp | 3 + src/cmdmapper.h | 4 +- src/code.l | 20 +- src/compound.xsd | 3 + src/compound_xsd.h | 3 + src/config.xml | 6 +- src/configgen.py | 4 +- src/configoptions.cpp | 11 +- src/definition.cpp | 56 +- src/definition.h | 3 +- src/docparser.cpp | 19 + src/docparser.h | 2 +- src/doctokenizer.h | 1 + src/doctokenizer.l | 20 +- src/dot.cpp | 4 +- src/doxygen.cpp | 6 +- src/doxygen.css | 109 ++-- src/doxygen_css.h | 109 ++-- src/dynsections.js | 78 +++ src/dynsections_js.h | 78 +++ src/footer.html | 10 +- src/footer_html.h | 10 +- src/fortrancode.l | 36 +- src/fortranscanner.l | 6 +- src/ftvhelp.cpp | 291 ++++------ src/ftvhelp.h | 5 +- src/groupdef.cpp | 4 + src/header.html | 7 +- src/header_html.h | 7 +- src/htmldocvisitor.cpp | 9 +- src/htmlgen.cpp | 302 ++++++----- src/htmlgen.h | 10 +- src/index.cpp | 81 ++- src/index.h | 3 +- src/latexdocvisitor.cpp | 2 +- src/latexgen.cpp | 60 +-- src/latexgen.h | 8 +- src/libdoxygen.pro.in | 1 + src/libdoxygen.t.in | 3 + src/mandocvisitor.cpp | 1 + src/mangen.cpp | 2 +- src/mangen.h | 8 +- src/marshal.h | 2 +- src/memberdef.cpp | 21 +- src/memberdef.h | 6 +- src/membergroup.cpp | 41 +- src/membergroup.h | 10 +- src/memberlist.cpp | 176 ++++--- src/memberlist.h | 7 +- src/navtree.css | 2 - src/navtree.js | 2 +- src/navtree_css.h | 2 - src/navtree_js.h | 2 +- src/outputgen.h | 10 +- src/outputlist.cpp | 1 + src/outputlist.h | 18 +- src/perlmodgen.cpp | 1 + src/printdocvisitor.h | 2 + src/rtfdocvisitor.cpp | 3 + src/rtfgen.cpp | 4 +- src/rtfgen.h | 8 +- src/search_functions.php | 16 +- src/search_functions_php.h | 16 +- src/tclscanner.l | 8 +- src/translator_cn.h | 1260 +++++++++++++++++++++----------------------- src/translator_cz.h | 467 ++++++++-------- src/translator_de.h | 65 ++- src/translator_eo.h | 441 +++++++++------- src/translator_es.h | 67 ++- src/translator_hr.h | 44 +- src/translator_it.h | 59 ++- src/translator_pl.h | 114 +++- src/translator_sk.h | 48 +- src/vhdldocgen.cpp | 127 ++++- src/vhdldocgen.h | 3 + src/vhdlparser.y | 22 +- src/vhdlscanner.h | 1 + src/vhdlscanner.l | 47 +- src/xmldocvisitor.cpp | 5 + winbuild/Doxygen.vcproj | 9 +- 91 files changed, 3213 insertions(+), 2186 deletions(-) create mode 100644 src/dynsections.js create mode 100644 src/dynsections_js.h diff --git a/INSTALL b/INSTALL index 88c5e3c..267599d 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ -DOXYGEN Version 1.8.0-20120409 +DOXYGEN Version 1.8.0-20120429 Please read the installation section of the manual (http://www.doxygen.org/install.html) for instructions. -------- -Dimitri van Heesch (09 April 2012) +Dimitri van Heesch (29 April 2012) diff --git a/README b/README index 5db83db..4881010 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -DOXYGEN Version 1.8.0_20120409 +DOXYGEN Version 1.8.0_20120429 Please read INSTALL for compilation instructions. @@ -26,4 +26,4 @@ forum. Enjoy, -Dimitri van Heesch (dimitri@stack.nl) (09 April 2012) +Dimitri van Heesch (dimitri@stack.nl) (29 April 2012) diff --git a/configure b/configure index 27c7e17..60926d8 100755 --- a/configure +++ b/configure @@ -20,7 +20,7 @@ doxygen_version_minor=8 doxygen_version_revision=0 #NOTE: Setting version_mmn to "NO" will omit mmn info from the package. -doxygen_version_mmn=20120409 +doxygen_version_mmn=20120429 bin_dirs=`echo $PATH | sed -e "s/:/ /g"` @@ -180,6 +180,12 @@ if test -z "$f_platform"; then f_insttool=/usr/bin/install fi ;; + NetBSD:*) + f_platform=netbsd-g++ + if test "$f_insttool" = NO; then + f_insttool=/usr/bin/install + fi + ;; HP-UX:*) f_platform=hpux-g++ if test "$f_insttool" = NO; then diff --git a/doc/language.doc b/doc/language.doc index 4e93866..aa15fda 100644 --- a/doc/language.doc +++ b/doc/language.doc @@ -23,7 +23,7 @@ text fragments, generated by doxygen, can be produced in languages other than English (the default). The output language is chosen through the configuration file (with default name and known as Doxyfile). -Currently (version 1.7.6.1), 39 languages +Currently (version 1.8.0), 39 languages are supported (sorted alphabetically): Afrikaans, Arabic, Armenian, Brazilian Portuguese, Catalan, Chinese, Chinese Traditional, Croatian, Czech, Danish, Dutch, English, @@ -86,7 +86,7 @@ when the translator was updated. Chinese Lian Yang
Li Daobing
Wei Liu lian dot yang dot cn at gmail dot com
lidaobing at gmail dot com
liuwei at asiainfo dot com - 1.8.0 + up-to-date Chinese Traditional @@ -98,13 +98,13 @@ when the translator was updated. Croatian Boris Bralo boris dot bralo at gmail dot com - 1.8.0 + up-to-date Czech Petr Přikryl prikrylp at skil dot cz - 1.8.0 + up-to-date Danish @@ -128,7 +128,7 @@ when the translator was updated. Esperanto Ander Martinez dwarfnauko at gmail dot com - 1.7.5 + up-to-date Finnish @@ -146,7 +146,7 @@ when the translator was updated. German Peter Grotrian
Jens Seidel Peter dot Grotrian at pdv-FS dot de
jensseidel at users dot sf dot net - 1.8.0 + up-to-date Greek @@ -170,7 +170,7 @@ when the translator was updated. Italian Alessandro Falappa
Ahmed Aldo Faisal alessandro at falappa dot net
aaf23 at cam dot ac dot uk - 1.7.5 + up-to-date Japanese @@ -224,7 +224,7 @@ when the translator was updated. Polish Piotr Kaminski
Grzegorz Kowal
Krzysztof Kral [unreachable]
[unreachable]
krzysztof dot kral at gmail dot com - 1.6.3 + up-to-date Portuguese @@ -260,7 +260,7 @@ when the translator was updated. Slovak Kali+Laco Švec
Petr Přikryl the Slovak language advisors
prikrylp at skil dot cz - 1.8.0 + up-to-date Slovene @@ -272,7 +272,7 @@ when the translator was updated. Spanish Bartomeu
Francisco Oltra Thennet
David Vaquero bartomeu at loteria3cornella dot com
[unreachable]
david at grupoikusnet dot com - 1.7.5 + up-to-date Swedish @@ -326,16 +326,16 @@ when the translator was updated. Catalan & Maximiliano Pin & {\tt\tiny max dot pin at bitroit dot com} & 1.8.0 \\ ~ & Albert Mora & {\tt\tiny [unreachable] amora at iua dot upf dot es} & ~ \\ \hline - Chinese & Lian Yang & {\tt\tiny lian dot yang dot cn at gmail dot com} & 1.8.0 \\ + Chinese & Lian Yang & {\tt\tiny lian dot yang dot cn at gmail dot com} & up-to-date \\ ~ & Li Daobing & {\tt\tiny lidaobing at gmail dot com} & ~ \\ ~ & Wei Liu & {\tt\tiny liuwei at asiainfo dot com} & ~ \\ \hline Chinese Traditional & Daniel YC Lin & {\tt\tiny dlin dot tw at gmail dot com} & 1.8.0 \\ ~ & Gary Lee & {\tt\tiny garywlee at gmail dot com} & ~ \\ \hline - Croatian & Boris Bralo & {\tt\tiny boris dot bralo at gmail dot com} & 1.8.0 \\ + Croatian & Boris Bralo & {\tt\tiny boris dot bralo at gmail dot com} & up-to-date \\ \hline - Czech & Petr Přikryl & {\tt\tiny prikrylp at skil dot cz} & 1.8.0 \\ + Czech & Petr Přikryl & {\tt\tiny prikrylp at skil dot cz} & up-to-date \\ \hline Danish & Poul-Erik Hansen & {\tt\tiny pouhan at gnotometrics dot dk} & 1.8.0 \\ ~ & Erik Søe Sørensen & {\tt\tiny eriksoe+doxygen at daimi dot au dot dk} & ~ \\ @@ -344,14 +344,14 @@ when the translator was updated. \hline English & Dimitri van Heesch & {\tt\tiny dimitri at stack dot nl} & up-to-date \\ \hline - Esperanto & Ander Martinez & {\tt\tiny dwarfnauko at gmail dot com} & 1.7.5 \\ + Esperanto & Ander Martinez & {\tt\tiny dwarfnauko at gmail dot com} & up-to-date \\ \hline Finnish & Antti Laine & {\tt\tiny antti dot a dot laine at tut dot fi} & 1.6.0 \\ \hline French & David Martinet & {\tt\tiny contact at e-concept-applications dot fr} & 1.8.0 \\ ~ & Xavier Outhier & {\tt\tiny xouthier at yahoo dot fr} & ~ \\ \hline - German & Peter Grotrian & {\tt\tiny Peter dot Grotrian at pdv-FS dot de} & 1.8.0 \\ + German & Peter Grotrian & {\tt\tiny Peter dot Grotrian at pdv-FS dot de} & up-to-date \\ ~ & Jens Seidel & {\tt\tiny jensseidel at users dot sf dot net} & ~ \\ \hline Greek & Paul Gessos & {\tt\tiny gessos dot paul at yahoo dot gr} & 1.8.0 \\ @@ -361,7 +361,7 @@ when the translator was updated. \hline Indonesian & Hendy Irawan & {\tt\tiny ceefour at gauldong dot net} & 1.8.0 \\ \hline - Italian & Alessandro Falappa & {\tt\tiny alessandro at falappa dot net} & 1.7.5 \\ + Italian & Alessandro Falappa & {\tt\tiny alessandro at falappa dot net} & up-to-date \\ ~ & Ahmed Aldo Faisal & {\tt\tiny aaf23 at cam dot ac dot uk} & ~ \\ \hline Japanese & Hiroki Iseri & {\tt\tiny goyoki at gmail dot com} & 1.6.0 \\ @@ -388,7 +388,7 @@ when the translator was updated. \hline Persian & Ali Nadalizadeh & {\tt\tiny nadalizadeh at gmail dot com} & 1.7.5 \\ \hline - Polish & Piotr Kaminski & {\tt\tiny [unreachable] Piotr dot Kaminski at ctm dot gdynia dot pl} & 1.6.3 \\ + Polish & Piotr Kaminski & {\tt\tiny [unreachable] Piotr dot Kaminski at ctm dot gdynia dot pl} & up-to-date \\ ~ & Grzegorz Kowal & {\tt\tiny [unreachable] g\_kowal at poczta dot onet dot pl} & ~ \\ ~ & Krzysztof Kral & {\tt\tiny krzysztof dot kral at gmail dot com} & ~ \\ \hline @@ -404,12 +404,12 @@ when the translator was updated. \hline SerbianCyrilic & Nedeljko Stefanovic & {\tt\tiny stenedjo at yahoo dot com} & 1.6.0 \\ \hline - Slovak & Kali+Laco Švec & {\tt\tiny the Slovak language advisors} & 1.8.0 \\ + Slovak & Kali+Laco Švec & {\tt\tiny the Slovak language advisors} & up-to-date \\ ~ & Petr Přikryl & {\tt\tiny prikrylp at skil dot cz} & ~ \\ \hline Slovene & Matjaž Ostroveršnik & {\tt\tiny matjaz dot ostroversnik at ostri dot org} & 1.4.6 \\ \hline - Spanish & Bartomeu & {\tt\tiny bartomeu at loteria3cornella dot com} & 1.7.5 \\ + Spanish & Bartomeu & {\tt\tiny bartomeu at loteria3cornella dot com} & up-to-date \\ ~ & Francisco Oltra Thennet & {\tt\tiny [unreachable] foltra at puc dot cl} & ~ \\ ~ & David Vaquero & {\tt\tiny david at grupoikusnet dot com} & ~ \\ \hline diff --git a/doc/lists.doc b/doc/lists.doc index 89b21e8..b79b2cd 100644 --- a/doc/lists.doc +++ b/doc/lists.doc @@ -6,7 +6,7 @@ Doxygen provides a number of ways to create lists of items. By putting a number of column-aligned minus (-) signs at the start of a line, a bullet list will automatically be generated. Instead of the minus -sign also plus (+) or asterix (\*) can be used. +sign also plus (+) or asterisk (\*) can be used. Numbered lists can also be generated by using a minus followed by a hash or by using a number followed by a dot. diff --git a/doc/markdown.doc b/doc/markdown.doc index d571eef..30fca62 100644 --- a/doc/markdown.doc +++ b/doc/markdown.doc @@ -515,7 +515,7 @@ Futhermore, a `*` or `_` only starts an emphasis if - it is preceded by a space, newline, or one the following characters `<{([,:;` An emphasis ends if -- it is not following by an alphanumerical character, and +- it is not followed by an alphanumerical character, and - it is not preceded by a space, newline, or one the following characters `({[<=+-\@` Lastly, the span of the emphasis is limited to a single paragraph. diff --git a/doc/translator_report.txt b/doc/translator_report.txt index 01a864a..cf7b205 100644 --- a/doc/translator_report.txt +++ b/doc/translator_report.txt @@ -1,4 +1,4 @@ -(1.7.6.1) +(1.8.0) Doxygen supports the following 39 languages (sorted alphabetically): @@ -10,17 +10,26 @@ Norwegian, Persian, Polish, Portuguese, Romanian, Russian, Serbian, SerbianCyrilic, Slovak, Slovene, Spanish, Swedish, Turkish, Ukrainian, and Vietnamese. -Of them, 2 translators are up-to-date, 37 translators are based on +Of them, 11 translators are up-to-date, 28 translators are based on some adapter class, and 2 are English based. ---------------------------------------------------------------------- The following translator classes are up-to-date (sorted alphabetically). This means that they derive from the Translator class -and they implement all 233 of the required methods. Anyway, there +and they implement all 235 of the required methods. Anyway, there still may be some details listed even for them: + TranslatorChinese + TranslatorCroatian + TranslatorCzech TranslatorDutch TranslatorEnglish + TranslatorEsperanto + TranslatorGerman + TranslatorItalian + TranslatorPolish -- Remove the obsolete methods (never used). + TranslatorSlovak + TranslatorSpanish -- The MAX_DOT_GRAPH_HEIGHT found in trLegendDocs() ---------------------------------------------------------------------- The following translator classes need some maintenance (the most @@ -28,75 +37,66 @@ obsolete at the end). The other info shows the estimation of Doxygen version when the class was last updated and number of methods that must be implemented to become up-to-date: - TranslatorSlovak 1.8.0 5 methods to implement (2 %) - TranslatorPortuguese 1.8.0 5 methods to implement (2 %) - TranslatorIndonesian 1.8.0 5 methods to implement (2 %) + TranslatorPortuguese 1.8.0 7 methods to implement (2 %) + TranslatorIndonesian 1.8.0 7 methods to implement (2 %) Note: Reimplementation using UTF-8 suggested. - TranslatorGreek 1.8.0 5 methods to implement (2 %) - TranslatorGerman 1.8.0 5 methods to implement (2 %) - TranslatorFrench 1.8.0 5 methods to implement (2 %) + TranslatorGreek 1.8.0 7 methods to implement (2 %) + TranslatorFrench 1.8.0 7 methods to implement (2 %) Note: Reimplementation using UTF-8 suggested. - TranslatorDanish 1.8.0 5 methods to implement (2 %) + TranslatorDanish 1.8.0 7 methods to implement (2 %) Note: Reimplementation using UTF-8 suggested. - TranslatorCzech 1.8.0 5 methods to implement (2 %) - TranslatorCroatian 1.8.0 5 methods to implement (2 %) - TranslatorChinese 1.8.0 5 methods to implement (2 %) - TranslatorChinesetraditional 1.8.0 5 methods to implement (2 %) + TranslatorChinesetraditional 1.8.0 7 methods to implement (2 %) Note: Reimplementation using UTF-8 suggested. - TranslatorCatalan 1.8.0 5 methods to implement (2 %) - TranslatorBrazilian 1.8.0 5 methods to implement (2 %) - TranslatorArmenian 1.8.0 5 methods to implement (2 %) - TranslatorTurkish 1.7.5 8 methods to implement (3 %) - TranslatorSpanish 1.7.5 8 methods to implement (3 %) - TranslatorRussian 1.7.5 8 methods to implement (3 %) + TranslatorCatalan 1.8.0 7 methods to implement (2 %) + TranslatorBrazilian 1.8.0 7 methods to implement (2 %) + TranslatorArmenian 1.8.0 7 methods to implement (2 %) + TranslatorTurkish 1.7.5 10 methods to implement (4 %) + TranslatorRussian 1.7.5 10 methods to implement (4 %) Note: Reimplementation using UTF-8 suggested. - TranslatorPersian 1.7.5 8 methods to implement (3 %) - TranslatorKorean 1.7.5 8 methods to implement (3 %) + TranslatorPersian 1.7.5 10 methods to implement (4 %) + TranslatorKorean 1.7.5 10 methods to implement (4 %) Note: Reimplementation using UTF-8 suggested. - TranslatorItalian 1.7.5 8 methods to implement (3 %) - TranslatorEsperanto 1.7.5 8 methods to implement (3 %) - TranslatorPolish 1.6.3 12 methods to implement (5 %) - TranslatorVietnamese 1.6.0 17 methods to implement (7 %) - TranslatorSwedish 1.6.0 17 methods to implement (7 %) + TranslatorVietnamese 1.6.0 19 methods to implement (8 %) + TranslatorSwedish 1.6.0 19 methods to implement (8 %) Note: Reimplementation using UTF-8 suggested. - TranslatorSerbian 1.6.0 17 methods to implement (7 %) + TranslatorSerbian 1.6.0 19 methods to implement (8 %) Note: Reimplementation using UTF-8 suggested. - TranslatorSerbianCyrilic 1.6.0 17 methods to implement (7 %) - TranslatorRomanian 1.6.0 17 methods to implement (7 %) + TranslatorSerbianCyrilic 1.6.0 19 methods to implement (8 %) + TranslatorRomanian 1.6.0 19 methods to implement (8 %) Note: Reimplementation using UTF-8 suggested. - TranslatorMacedonian 1.6.0 17 methods to implement (7 %) - TranslatorJapanese 1.6.0 17 methods to implement (7 %) + TranslatorMacedonian 1.6.0 19 methods to implement (8 %) + TranslatorJapanese 1.6.0 19 methods to implement (8 %) Note: Reimplementation using UTF-8 suggested. - TranslatorFinnish 1.6.0 17 methods to implement (7 %) - TranslatorAfrikaans 1.6.0 17 methods to implement (7 %) + TranslatorFinnish 1.6.0 19 methods to implement (8 %) + TranslatorAfrikaans 1.6.0 19 methods to implement (8 %) Note: Reimplementation using UTF-8 suggested. - TranslatorSlovene 1.4.6 41 methods to implement (17 %) + TranslatorSlovene 1.4.6 43 methods to implement (18 %) Note: Reimplementation using UTF-8 suggested. - TranslatorNorwegian 1.4.6 40 methods to implement (17 %) + TranslatorNorwegian 1.4.6 42 methods to implement (17 %) Note: Reimplementation using UTF-8 suggested. - TranslatorLithuanian 1.4.6 41 methods to implement (17 %) + TranslatorLithuanian 1.4.6 43 methods to implement (18 %) Note: Reimplementation using UTF-8 suggested. - TranslatorHungarian 1.4.6 41 methods to implement (17 %) + TranslatorHungarian 1.4.6 43 methods to implement (18 %) Note: Reimplementation using UTF-8 suggested. - TranslatorArabic 1.4.6 40 methods to implement (17 %) + TranslatorArabic 1.4.6 42 methods to implement (17 %) Note: Reimplementation using UTF-8 suggested. - TranslatorUkrainian 1.4.1 41 methods to implement (17 %) + TranslatorUkrainian 1.4.1 43 methods to implement (18 %) Note: Reimplementation using UTF-8 suggested. @@ -131,10 +131,10 @@ Details for translators (classes sorted alphabetically): -TranslatorAfrikaans (TranslatorAdapter_1_6_0) 17 methods to implement (7 %) +TranslatorAfrikaans (TranslatorAdapter_1_6_0) 19 methods to implement (8 %) ------------------- - Implements 216 of the required methods (92 %). + Implements 216 of the required methods (91 %). Missing methods (should be implemented): @@ -150,14 +150,16 @@ TranslatorAfrikaans (TranslatorAdapter_1_6_0) 17 methods to implement (7 %) virtual QCString trDirDepGraph(const char * name) virtual QCString trDirRelation(const char * name) virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) virtual QCString trCiteReferences() + virtual QCString trAdditionalInheritedMembers() virtual QCString trDirDependency(const char * name) virtual QCString trCopyright() virtual QCString trIncludesFileIn(const char * name) virtual QCString trEnumGeneratedFromFiles(bool single) -TranslatorArabic (TranslatorAdapter_1_4_6) 40 methods to implement (17 %) +TranslatorArabic (TranslatorAdapter_1_4_6) 42 methods to implement (17 %) ---------------- Implements 193 of the required methods (82 %). @@ -191,7 +193,9 @@ TranslatorArabic (TranslatorAdapter_1_4_6) 40 methods to implement (17 %) virtual QCString trCompoundListFortran() virtual QCString trDataTypes() virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) virtual QCString trCiteReferences() + virtual QCString trAdditionalInheritedMembers() virtual QCString trDirDependency(const char * name) virtual QCString trCopyright() virtual QCString trIncludesFileIn(const char * name) @@ -218,7 +222,7 @@ TranslatorArabic (TranslatorAdapter_1_4_6) 40 methods to implement (17 %) virtual QCString trNoDescriptionAvailable() -TranslatorArmenian (TranslatorAdapter_1_8_0) 5 methods to implement (2 %) +TranslatorArmenian (TranslatorAdapter_1_8_0) 7 methods to implement (2 %) ------------------ Implements 228 of the required methods (97 %). @@ -229,10 +233,12 @@ TranslatorArmenian (TranslatorAdapter_1_8_0) 5 methods to implement (2 %) virtual QCString trTemplateParameters() virtual QCString trAndMore(const QCString & number) virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) + virtual QCString trAdditionalInheritedMembers() virtual QCString trEnumGeneratedFromFiles(bool single) -TranslatorBrazilian (TranslatorAdapter_1_8_0) 5 methods to implement (2 %) +TranslatorBrazilian (TranslatorAdapter_1_8_0) 7 methods to implement (2 %) ------------------- Implements 228 of the required methods (97 %). @@ -243,10 +249,12 @@ TranslatorBrazilian (TranslatorAdapter_1_8_0) 5 methods to implement (2 %) virtual QCString trTemplateParameters() virtual QCString trAndMore(const QCString & number) virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) + virtual QCString trAdditionalInheritedMembers() virtual QCString trEnumGeneratedFromFiles(bool single) -TranslatorCatalan (TranslatorAdapter_1_8_0) 5 methods to implement (2 %) +TranslatorCatalan (TranslatorAdapter_1_8_0) 7 methods to implement (2 %) ----------------- Implements 228 of the required methods (97 %). @@ -257,24 +265,12 @@ TranslatorCatalan (TranslatorAdapter_1_8_0) 5 methods to implement (2 %) virtual QCString trTemplateParameters() virtual QCString trAndMore(const QCString & number) virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) + virtual QCString trAdditionalInheritedMembers() virtual QCString trEnumGeneratedFromFiles(bool single) -TranslatorChinese (TranslatorAdapter_1_8_0) 5 methods to implement (2 %) ------------------ - - Implements 228 of the required methods (97 %). - - Missing methods (should be implemented): - - virtual QCString trDetailLevel() - virtual QCString trTemplateParameters() - virtual QCString trAndMore(const QCString & number) - virtual QCString trEnumReference(const char * name) - virtual QCString trEnumGeneratedFromFiles(bool single) - - -TranslatorChinesetraditional (TranslatorAdapter_1_8_0) 5 methods to implement (2 %) +TranslatorChinesetraditional (TranslatorAdapter_1_8_0) 7 methods to implement (2 %) ---------------------------- Implements 228 of the required methods (97 %). @@ -285,38 +281,12 @@ TranslatorChinesetraditional (TranslatorAdapter_1_8_0) 5 methods to implement virtual QCString trTemplateParameters() virtual QCString trAndMore(const QCString & number) virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) + virtual QCString trAdditionalInheritedMembers() virtual QCString trEnumGeneratedFromFiles(bool single) -TranslatorCroatian (TranslatorAdapter_1_8_0) 5 methods to implement (2 %) ------------------- - - Implements 228 of the required methods (97 %). - - Missing methods (should be implemented): - - virtual QCString trDetailLevel() - virtual QCString trTemplateParameters() - virtual QCString trAndMore(const QCString & number) - virtual QCString trEnumReference(const char * name) - virtual QCString trEnumGeneratedFromFiles(bool single) - - -TranslatorCzech (TranslatorAdapter_1_8_0) 5 methods to implement (2 %) ---------------- - - Implements 228 of the required methods (97 %). - - Missing methods (should be implemented): - - virtual QCString trDetailLevel() - virtual QCString trTemplateParameters() - virtual QCString trAndMore(const QCString & number) - virtual QCString trEnumReference(const char * name) - virtual QCString trEnumGeneratedFromFiles(bool single) - - -TranslatorDanish (TranslatorAdapter_1_8_0) 5 methods to implement (2 %) +TranslatorDanish (TranslatorAdapter_1_8_0) 7 methods to implement (2 %) ---------------- Implements 228 of the required methods (97 %). @@ -327,30 +297,15 @@ TranslatorDanish (TranslatorAdapter_1_8_0) 5 methods to implement (2 %) virtual QCString trTemplateParameters() virtual QCString trAndMore(const QCString & number) virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) + virtual QCString trAdditionalInheritedMembers() virtual QCString trEnumGeneratedFromFiles(bool single) -TranslatorEsperanto (TranslatorAdapter_1_7_5) 8 methods to implement (3 %) -------------------- - - Implements 225 of the required methods (96 %). - - Missing methods (should be implemented): - - virtual QCString trDetailLevel() - virtual QCString trTemplateParameters() - virtual QCString trAndMore(const QCString & number) - virtual QCString trDirDepGraph(const char * name) - virtual QCString trEnumReference(const char * name) - virtual QCString trCiteReferences() - virtual QCString trCopyright() - virtual QCString trEnumGeneratedFromFiles(bool single) - - -TranslatorFinnish (TranslatorAdapter_1_6_0) 17 methods to implement (7 %) +TranslatorFinnish (TranslatorAdapter_1_6_0) 19 methods to implement (8 %) ----------------- - Implements 216 of the required methods (92 %). + Implements 216 of the required methods (91 %). Missing methods (should be implemented): @@ -366,14 +321,16 @@ TranslatorFinnish (TranslatorAdapter_1_6_0) 17 methods to implement (7 %) virtual QCString trDirDepGraph(const char * name) virtual QCString trDirRelation(const char * name) virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) virtual QCString trCiteReferences() + virtual QCString trAdditionalInheritedMembers() virtual QCString trDirDependency(const char * name) virtual QCString trCopyright() virtual QCString trIncludesFileIn(const char * name) virtual QCString trEnumGeneratedFromFiles(bool single) -TranslatorFrench (TranslatorAdapter_1_8_0) 5 methods to implement (2 %) +TranslatorFrench (TranslatorAdapter_1_8_0) 7 methods to implement (2 %) ---------------- Implements 228 of the required methods (97 %). @@ -384,24 +341,12 @@ TranslatorFrench (TranslatorAdapter_1_8_0) 5 methods to implement (2 %) virtual QCString trTemplateParameters() virtual QCString trAndMore(const QCString & number) virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) + virtual QCString trAdditionalInheritedMembers() virtual QCString trEnumGeneratedFromFiles(bool single) -TranslatorGerman (TranslatorAdapter_1_8_0) 5 methods to implement (2 %) ----------------- - - Implements 228 of the required methods (97 %). - - Missing methods (should be implemented): - - virtual QCString trDetailLevel() - virtual QCString trTemplateParameters() - virtual QCString trAndMore(const QCString & number) - virtual QCString trEnumReference(const char * name) - virtual QCString trEnumGeneratedFromFiles(bool single) - - -TranslatorGreek (TranslatorAdapter_1_8_0) 5 methods to implement (2 %) +TranslatorGreek (TranslatorAdapter_1_8_0) 7 methods to implement (2 %) --------------- Implements 228 of the required methods (97 %). @@ -412,13 +357,15 @@ TranslatorGreek (TranslatorAdapter_1_8_0) 5 methods to implement (2 %) virtual QCString trTemplateParameters() virtual QCString trAndMore(const QCString & number) virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) + virtual QCString trAdditionalInheritedMembers() virtual QCString trEnumGeneratedFromFiles(bool single) -TranslatorHungarian (TranslatorAdapter_1_4_6) 41 methods to implement (17 %) +TranslatorHungarian (TranslatorAdapter_1_4_6) 43 methods to implement (18 %) ------------------- - Implements 192 of the required methods (82 %). + Implements 192 of the required methods (81 %). Missing methods (should be implemented): @@ -449,7 +396,9 @@ TranslatorHungarian (TranslatorAdapter_1_4_6) 41 methods to implement (17 %) virtual QCString trCompoundListFortran() virtual QCString trDataTypes() virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) virtual QCString trCiteReferences() + virtual QCString trAdditionalInheritedMembers() virtual QCString trDirDependency(const char * name) virtual QCString trCopyright() virtual QCString trIncludesFileIn(const char * name) @@ -465,7 +414,7 @@ TranslatorHungarian (TranslatorAdapter_1_4_6) 41 methods to implement (17 %) virtual QCString trSubprogramDocumentation() -TranslatorIndonesian (TranslatorAdapter_1_8_0) 5 methods to implement (2 %) +TranslatorIndonesian (TranslatorAdapter_1_8_0) 7 methods to implement (2 %) -------------------- Implements 228 of the required methods (97 %). @@ -476,30 +425,15 @@ TranslatorIndonesian (TranslatorAdapter_1_8_0) 5 methods to implement (2 %) virtual QCString trTemplateParameters() virtual QCString trAndMore(const QCString & number) virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) + virtual QCString trAdditionalInheritedMembers() virtual QCString trEnumGeneratedFromFiles(bool single) -TranslatorItalian (TranslatorAdapter_1_7_5) 8 methods to implement (3 %) ------------------ - - Implements 225 of the required methods (96 %). - - Missing methods (should be implemented): - - virtual QCString trDetailLevel() - virtual QCString trTemplateParameters() - virtual QCString trAndMore(const QCString & number) - virtual QCString trDirDepGraph(const char * name) - virtual QCString trEnumReference(const char * name) - virtual QCString trCiteReferences() - virtual QCString trCopyright() - virtual QCString trEnumGeneratedFromFiles(bool single) - - -TranslatorJapanese (TranslatorAdapter_1_6_0) 17 methods to implement (7 %) +TranslatorJapanese (TranslatorAdapter_1_6_0) 19 methods to implement (8 %) ------------------ - Implements 216 of the required methods (92 %). + Implements 216 of the required methods (91 %). Missing methods (should be implemented): @@ -515,7 +449,9 @@ TranslatorJapanese (TranslatorAdapter_1_6_0) 17 methods to implement (7 %) virtual QCString trDirDepGraph(const char * name) virtual QCString trDirRelation(const char * name) virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) virtual QCString trCiteReferences() + virtual QCString trAdditionalInheritedMembers() virtual QCString trDirDependency(const char * name) virtual QCString trCopyright() virtual QCString trIncludesFileIn(const char * name) @@ -534,7 +470,7 @@ TranslatorJapanese (TranslatorAdapter_1_6_0) 17 methods to implement (7 %) virtual QCString trNoDescriptionAvailable() -TranslatorJapaneseEn (TranslatorEnglish) 228 methods to implement (97 %) +TranslatorJapaneseEn (TranslatorEnglish) 230 methods to implement (97 %) -------------------- Implements 5 of the required methods (2 %). @@ -548,10 +484,10 @@ TranslatorJapaneseEn (TranslatorEnglish) 228 methods to implement (97 %) virtual QCString latexLanguageSupportCommand() -TranslatorKorean (TranslatorAdapter_1_7_5) 8 methods to implement (3 %) +TranslatorKorean (TranslatorAdapter_1_7_5) 10 methods to implement (4 %) ---------------- - Implements 225 of the required methods (96 %). + Implements 225 of the required methods (95 %). Missing methods (should be implemented): @@ -560,12 +496,14 @@ TranslatorKorean (TranslatorAdapter_1_7_5) 8 methods to implement (3 %) virtual QCString trAndMore(const QCString & number) virtual QCString trDirDepGraph(const char * name) virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) virtual QCString trCiteReferences() + virtual QCString trAdditionalInheritedMembers() virtual QCString trCopyright() virtual QCString trEnumGeneratedFromFiles(bool single) -TranslatorKoreanEn (TranslatorEnglish) 228 methods to implement (97 %) +TranslatorKoreanEn (TranslatorEnglish) 230 methods to implement (97 %) ------------------ Implements 5 of the required methods (2 %). @@ -579,10 +517,10 @@ TranslatorKoreanEn (TranslatorEnglish) 228 methods to implement (97 %) virtual QCString latexLanguageSupportCommand() -TranslatorLithuanian (TranslatorAdapter_1_4_6) 41 methods to implement (17 %) +TranslatorLithuanian (TranslatorAdapter_1_4_6) 43 methods to implement (18 %) -------------------- - Implements 192 of the required methods (82 %). + Implements 192 of the required methods (81 %). Missing methods (should be implemented): @@ -613,7 +551,9 @@ TranslatorLithuanian (TranslatorAdapter_1_4_6) 41 methods to implement (17 %) virtual QCString trCompoundListFortran() virtual QCString trDataTypes() virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) virtual QCString trCiteReferences() + virtual QCString trAdditionalInheritedMembers() virtual QCString trDirDependency(const char * name) virtual QCString trCopyright() virtual QCString trIncludesFileIn(const char * name) @@ -629,10 +569,10 @@ TranslatorLithuanian (TranslatorAdapter_1_4_6) 41 methods to implement (17 %) virtual QCString trSubprogramDocumentation() -TranslatorMacedonian (TranslatorAdapter_1_6_0) 17 methods to implement (7 %) +TranslatorMacedonian (TranslatorAdapter_1_6_0) 19 methods to implement (8 %) -------------------- - Implements 216 of the required methods (92 %). + Implements 216 of the required methods (91 %). Missing methods (should be implemented): @@ -648,14 +588,16 @@ TranslatorMacedonian (TranslatorAdapter_1_6_0) 17 methods to implement (7 %) virtual QCString trDirDepGraph(const char * name) virtual QCString trDirRelation(const char * name) virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) virtual QCString trCiteReferences() + virtual QCString trAdditionalInheritedMembers() virtual QCString trDirDependency(const char * name) virtual QCString trCopyright() virtual QCString trIncludesFileIn(const char * name) virtual QCString trEnumGeneratedFromFiles(bool single) -TranslatorNorwegian (TranslatorAdapter_1_4_6) 40 methods to implement (17 %) +TranslatorNorwegian (TranslatorAdapter_1_4_6) 42 methods to implement (17 %) ------------------- Implements 193 of the required methods (82 %). @@ -689,7 +631,9 @@ TranslatorNorwegian (TranslatorAdapter_1_4_6) 40 methods to implement (17 %) virtual QCString trCompoundListFortran() virtual QCString trDataTypes() virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) virtual QCString trCiteReferences() + virtual QCString trAdditionalInheritedMembers() virtual QCString trDirDependency(const char * name) virtual QCString trCopyright() virtual QCString trIncludesFileIn(const char * name) @@ -716,10 +660,10 @@ TranslatorNorwegian (TranslatorAdapter_1_4_6) 40 methods to implement (17 %) virtual QCString trNoDescriptionAvailable() -TranslatorPersian (TranslatorAdapter_1_7_5) 8 methods to implement (3 %) +TranslatorPersian (TranslatorAdapter_1_7_5) 10 methods to implement (4 %) ----------------- - Implements 225 of the required methods (96 %). + Implements 225 of the required methods (95 %). Missing methods (should be implemented): @@ -728,30 +672,17 @@ TranslatorPersian (TranslatorAdapter_1_7_5) 8 methods to implement (3 %) virtual QCString trAndMore(const QCString & number) virtual QCString trDirDepGraph(const char * name) virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) virtual QCString trCiteReferences() + virtual QCString trAdditionalInheritedMembers() virtual QCString trCopyright() virtual QCString trEnumGeneratedFromFiles(bool single) -TranslatorPolish (TranslatorAdapter_1_6_3) 12 methods to implement (5 %) +TranslatorPolish (Translator) ---------------- - Implements 221 of the required methods (94 %). - - Missing methods (should be implemented): - - virtual QCString trDetailLevel() - virtual QCString trTemplateParameters() - virtual QCString trDateTime(int year, int month, int day, int dayOfWeek, int hour, int minutes, int seconds, bool includeTime) - virtual QCString trFileIn(const char * name) - virtual QCString trAndMore(const QCString & number) - virtual QCString trDirDepGraph(const char * name) - virtual QCString trEnumReference(const char * name) - virtual QCString trCiteReferences() - virtual QCString trDirDependency(const char * name) - virtual QCString trCopyright() - virtual QCString trIncludesFileIn(const char * name) - virtual QCString trEnumGeneratedFromFiles(bool single) + Implements 235 of the required methods (100 %). Obsolete methods (should be removed, never used): @@ -766,7 +697,7 @@ TranslatorPolish (TranslatorAdapter_1_6_3) 12 methods to implement (5 %) QCString trNoDescriptionAvailable() -TranslatorPortuguese (TranslatorAdapter_1_8_0) 5 methods to implement (2 %) +TranslatorPortuguese (TranslatorAdapter_1_8_0) 7 methods to implement (2 %) -------------------- Implements 228 of the required methods (97 %). @@ -777,13 +708,15 @@ TranslatorPortuguese (TranslatorAdapter_1_8_0) 5 methods to implement (2 %) virtual QCString trTemplateParameters() virtual QCString trAndMore(const QCString & number) virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) + virtual QCString trAdditionalInheritedMembers() virtual QCString trEnumGeneratedFromFiles(bool single) -TranslatorRomanian (TranslatorAdapter_1_6_0) 17 methods to implement (7 %) +TranslatorRomanian (TranslatorAdapter_1_6_0) 19 methods to implement (8 %) ------------------ - Implements 216 of the required methods (92 %). + Implements 216 of the required methods (91 %). Missing methods (should be implemented): @@ -799,17 +732,19 @@ TranslatorRomanian (TranslatorAdapter_1_6_0) 17 methods to implement (7 %) virtual QCString trDirDepGraph(const char * name) virtual QCString trDirRelation(const char * name) virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) virtual QCString trCiteReferences() + virtual QCString trAdditionalInheritedMembers() virtual QCString trDirDependency(const char * name) virtual QCString trCopyright() virtual QCString trIncludesFileIn(const char * name) virtual QCString trEnumGeneratedFromFiles(bool single) -TranslatorRussian (TranslatorAdapter_1_7_5) 8 methods to implement (3 %) +TranslatorRussian (TranslatorAdapter_1_7_5) 10 methods to implement (4 %) ----------------- - Implements 225 of the required methods (96 %). + Implements 225 of the required methods (95 %). Missing methods (should be implemented): @@ -818,15 +753,17 @@ TranslatorRussian (TranslatorAdapter_1_7_5) 8 methods to implement (3 %) virtual QCString trAndMore(const QCString & number) virtual QCString trDirDepGraph(const char * name) virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) virtual QCString trCiteReferences() + virtual QCString trAdditionalInheritedMembers() virtual QCString trCopyright() virtual QCString trEnumGeneratedFromFiles(bool single) -TranslatorSerbian (TranslatorAdapter_1_6_0) 17 methods to implement (7 %) +TranslatorSerbian (TranslatorAdapter_1_6_0) 19 methods to implement (8 %) ----------------- - Implements 216 of the required methods (92 %). + Implements 216 of the required methods (91 %). Missing methods (should be implemented): @@ -842,17 +779,19 @@ TranslatorSerbian (TranslatorAdapter_1_6_0) 17 methods to implement (7 %) virtual QCString trDirDepGraph(const char * name) virtual QCString trDirRelation(const char * name) virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) virtual QCString trCiteReferences() + virtual QCString trAdditionalInheritedMembers() virtual QCString trDirDependency(const char * name) virtual QCString trCopyright() virtual QCString trIncludesFileIn(const char * name) virtual QCString trEnumGeneratedFromFiles(bool single) -TranslatorSerbianCyrilic (TranslatorAdapter_1_6_0) 17 methods to implement (7 %) +TranslatorSerbianCyrilic (TranslatorAdapter_1_6_0) 19 methods to implement (8 %) ------------------------ - Implements 216 of the required methods (92 %). + Implements 216 of the required methods (91 %). Missing methods (should be implemented): @@ -868,31 +807,19 @@ TranslatorSerbianCyrilic (TranslatorAdapter_1_6_0) 17 methods to implement (7 virtual QCString trDirDepGraph(const char * name) virtual QCString trDirRelation(const char * name) virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) virtual QCString trCiteReferences() + virtual QCString trAdditionalInheritedMembers() virtual QCString trDirDependency(const char * name) virtual QCString trCopyright() virtual QCString trIncludesFileIn(const char * name) virtual QCString trEnumGeneratedFromFiles(bool single) -TranslatorSlovak (TranslatorAdapter_1_8_0) 5 methods to implement (2 %) ----------------- - - Implements 228 of the required methods (97 %). - - Missing methods (should be implemented): - - virtual QCString trDetailLevel() - virtual QCString trTemplateParameters() - virtual QCString trAndMore(const QCString & number) - virtual QCString trEnumReference(const char * name) - virtual QCString trEnumGeneratedFromFiles(bool single) - - -TranslatorSlovene (TranslatorAdapter_1_4_6) 41 methods to implement (17 %) +TranslatorSlovene (TranslatorAdapter_1_4_6) 43 methods to implement (18 %) ----------------- - Implements 192 of the required methods (82 %). + Implements 192 of the required methods (81 %). Missing methods (should be implemented): @@ -923,7 +850,9 @@ TranslatorSlovene (TranslatorAdapter_1_4_6) 41 methods to implement (17 %) virtual QCString trCompoundListFortran() virtual QCString trDataTypes() virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) virtual QCString trCiteReferences() + virtual QCString trAdditionalInheritedMembers() virtual QCString trDirDependency(const char * name) virtual QCString trCopyright() virtual QCString trIncludesFileIn(const char * name) @@ -939,27 +868,16 @@ TranslatorSlovene (TranslatorAdapter_1_4_6) 41 methods to implement (17 %) virtual QCString trSubprogramDocumentation() -TranslatorSpanish (TranslatorAdapter_1_7_5) 8 methods to implement (3 %) +TranslatorSpanish (Translator) ----------------- - Implements 225 of the required methods (96 %). - - Missing methods (should be implemented): - - virtual QCString trDetailLevel() - virtual QCString trTemplateParameters() - virtual QCString trAndMore(const QCString & number) - virtual QCString trDirDepGraph(const char * name) - virtual QCString trEnumReference(const char * name) - virtual QCString trCiteReferences() - virtual QCString trCopyright() - virtual QCString trEnumGeneratedFromFiles(bool single) + Implements 235 of the required methods (100 %). -TranslatorSwedish (TranslatorAdapter_1_6_0) 17 methods to implement (7 %) +TranslatorSwedish (TranslatorAdapter_1_6_0) 19 methods to implement (8 %) ----------------- - Implements 216 of the required methods (92 %). + Implements 216 of the required methods (91 %). Missing methods (should be implemented): @@ -975,17 +893,19 @@ TranslatorSwedish (TranslatorAdapter_1_6_0) 17 methods to implement (7 %) virtual QCString trDirDepGraph(const char * name) virtual QCString trDirRelation(const char * name) virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) virtual QCString trCiteReferences() + virtual QCString trAdditionalInheritedMembers() virtual QCString trDirDependency(const char * name) virtual QCString trCopyright() virtual QCString trIncludesFileIn(const char * name) virtual QCString trEnumGeneratedFromFiles(bool single) -TranslatorTurkish (TranslatorAdapter_1_7_5) 8 methods to implement (3 %) +TranslatorTurkish (TranslatorAdapter_1_7_5) 10 methods to implement (4 %) ----------------- - Implements 225 of the required methods (96 %). + Implements 225 of the required methods (95 %). Missing methods (should be implemented): @@ -994,15 +914,17 @@ TranslatorTurkish (TranslatorAdapter_1_7_5) 8 methods to implement (3 %) virtual QCString trAndMore(const QCString & number) virtual QCString trDirDepGraph(const char * name) virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) virtual QCString trCiteReferences() + virtual QCString trAdditionalInheritedMembers() virtual QCString trCopyright() virtual QCString trEnumGeneratedFromFiles(bool single) -TranslatorUkrainian (TranslatorAdapter_1_4_1) 41 methods to implement (17 %) +TranslatorUkrainian (TranslatorAdapter_1_4_1) 43 methods to implement (18 %) ------------------- - Implements 192 of the required methods (82 %). + Implements 192 of the required methods (81 %). Missing methods (should be implemented): @@ -1034,7 +956,9 @@ TranslatorUkrainian (TranslatorAdapter_1_4_1) 41 methods to implement (17 %) virtual QCString trCompoundListFortran() virtual QCString trDataTypes() virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) virtual QCString trCiteReferences() + virtual QCString trAdditionalInheritedMembers() virtual QCString trDirDependency(const char * name) virtual QCString trCopyright() virtual QCString trIncludesFileIn(const char * name) @@ -1061,10 +985,10 @@ TranslatorUkrainian (TranslatorAdapter_1_4_1) 41 methods to implement (17 %) virtual QCString trNoDescriptionAvailable() -TranslatorVietnamese (TranslatorAdapter_1_6_0) 17 methods to implement (7 %) +TranslatorVietnamese (TranslatorAdapter_1_6_0) 19 methods to implement (8 %) -------------------- - Implements 216 of the required methods (92 %). + Implements 216 of the required methods (91 %). Missing methods (should be implemented): @@ -1080,7 +1004,9 @@ TranslatorVietnamese (TranslatorAdapter_1_6_0) 17 methods to implement (7 %) virtual QCString trDirDepGraph(const char * name) virtual QCString trDirRelation(const char * name) virtual QCString trEnumReference(const char * name) + virtual QCString trInheritedFrom(const char * members, const char * what) virtual QCString trCiteReferences() + virtual QCString trAdditionalInheritedMembers() virtual QCString trDirDependency(const char * name) virtual QCString trCopyright() virtual QCString trIncludesFileIn(const char * name) diff --git a/qtools/Doxyfile b/qtools/Doxyfile index 6774882..13f4d0e 100644 --- a/qtools/Doxyfile +++ b/qtools/Doxyfile @@ -260,7 +260,7 @@ PERL_PATH = /usr/bin/perl CLASS_DIAGRAMS = YES MSCGEN_PATH = HIDE_UNDOC_RELATIONS = YES -HAVE_DOT = NO +HAVE_DOT = YES DOT_NUM_THREADS = 0 DOT_FONTNAME = DOT_FONTSIZE = 10 diff --git a/qtools/qlist.doc b/qtools/qlist.doc index 98decd1..6b4278c 100644 --- a/qtools/qlist.doc +++ b/qtools/qlist.doc @@ -927,14 +927,12 @@ QStrList documentation *****************************************************************************/ -typedef QList QStrList +//typedef QList QStrList /*! \class QStrList qstrlist.h \brief The QStrList class provides a doubly linked list of \c char*. - \inherit QList - \ingroup collection \ingroup tools @@ -1039,8 +1037,6 @@ case insensitive compare. \class QStrListIterator qstrlist.h \brief The QStrListIterator class is an iterator for the QStrList and QStrIList classes. - \inherit QListIterator - \ingroup tools This class is a QListIterator\ instance. diff --git a/src/classdef.cpp b/src/classdef.cpp index 499d1e6..ad33bd7 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -961,7 +961,7 @@ void ClassDef::writeDetailedDocumentationBody(OutputList &ol) } // write the detailed description for this class -void ClassDef::writeDetailedDescription(OutputList &ol, const QCString &pageType, bool exampleFlag, +void ClassDef::writeDetailedDescription(OutputList &ol, const QCString &/*pageType*/, bool exampleFlag, const QCString &title,const QCString &anchor) { if ((!briefDescription().isEmpty() && Config_getBool("REPEAT_BRIEF")) || @@ -994,7 +994,7 @@ void ClassDef::writeDetailedDescription(OutputList &ol, const QCString &pageType } else { - writeTemplateSpec(ol,this,pageType); + //writeTemplateSpec(ol,this,pageType); } } @@ -1419,6 +1419,14 @@ 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"); + if (!inlineInheritedMembers && countAdditionalInheritedMembers()>0) + { + ol.startMemberHeader("inherited"); + ol.parseText(theTranslator->trAdditionalInheritedMembers()); + ol.endMemberHeader(); + writeAdditionalInheritedMembers(ol); + } ol.endMemberSections(); } @@ -1533,6 +1541,7 @@ void ClassDef::writeInlineDocumentation(OutputList &ol) ol.parseText(s); ol.endMemberDocName(); ol.endMemberDoc(FALSE); + ol.writeString(""); ol.startIndent(); } ol.popGeneratorState(); @@ -2373,7 +2382,8 @@ bool ClassDef::hasNonReferenceSuperClass() /*! called from MemberDef::writeDeclaration() to (recusively) write the * definition of an anonymous struct, union or class. */ -void ClassDef::writeDeclaration(OutputList &ol,MemberDef *md,bool inGroup) +void ClassDef::writeDeclaration(OutputList &ol,MemberDef *md,bool inGroup, + const char *inheritId) { //ol.insertMemberAlign(); //printf("ClassName=`%s' inGroup=%d\n",name().data(),inGroup); @@ -2413,47 +2423,21 @@ void ClassDef::writeDeclaration(OutputList &ol,MemberDef *md,bool inGroup) for (;(mg=mgli.current());++mgli) { mg->setInGroup(inGroup); - mg->writePlainDeclarations(ol,this,0,0,0); + mg->writePlainDeclarations(ol,this,0,0,0,inheritId); + } + } + + QListIterator eli( + LayoutDocManager::instance().docEntries(LayoutDocManager::Class)); + LayoutDocEntry *lde; + for (eli.toFirst();(lde=eli.current());++eli) + { + if (lde->kind()==LayoutDocEntry::MemberDecl) + { + LayoutDocEntryMemberDecl *lmd = (LayoutDocEntryMemberDecl*)lde; + writePlainMemberDeclaration(ol,lmd->type,inGroup,inheritId); } } - static bool extractPrivate = Config_getBool("EXTRACT_PRIVATE"); - static bool extractPackage = Config_getBool("EXTRACT_PACKAGE"); - - writePlainMemberDeclaration(ol,MemberList::pubTypes,inGroup); - writePlainMemberDeclaration(ol,MemberList::pubMethods,inGroup); - writePlainMemberDeclaration(ol,MemberList::pubAttribs,inGroup); - writePlainMemberDeclaration(ol,MemberList::pubSlots,inGroup); - writePlainMemberDeclaration(ol,MemberList::signals,inGroup); - writePlainMemberDeclaration(ol,MemberList::dcopMethods,inGroup); - writePlainMemberDeclaration(ol,MemberList::properties,inGroup); - writePlainMemberDeclaration(ol,MemberList::events,inGroup); - writePlainMemberDeclaration(ol,MemberList::pubStaticMethods,inGroup); - writePlainMemberDeclaration(ol,MemberList::pubStaticAttribs,inGroup); - writePlainMemberDeclaration(ol,MemberList::proTypes,inGroup); - writePlainMemberDeclaration(ol,MemberList::proMethods,inGroup); - writePlainMemberDeclaration(ol,MemberList::proAttribs,inGroup); - writePlainMemberDeclaration(ol,MemberList::proSlots,inGroup); - writePlainMemberDeclaration(ol,MemberList::proStaticMethods,inGroup); - writePlainMemberDeclaration(ol,MemberList::proStaticAttribs,inGroup); - if (extractPackage) - { - writePlainMemberDeclaration(ol,MemberList::pacTypes,inGroup); - writePlainMemberDeclaration(ol,MemberList::pacMethods,inGroup); - writePlainMemberDeclaration(ol,MemberList::pacAttribs,inGroup); - writePlainMemberDeclaration(ol,MemberList::pacStaticMethods,inGroup); - writePlainMemberDeclaration(ol,MemberList::pacStaticAttribs,inGroup); - } - if (extractPrivate) - { - writePlainMemberDeclaration(ol,MemberList::priTypes,inGroup); - writePlainMemberDeclaration(ol,MemberList::priMethods,inGroup); - writePlainMemberDeclaration(ol,MemberList::priAttribs,inGroup); - writePlainMemberDeclaration(ol,MemberList::priSlots,inGroup); - writePlainMemberDeclaration(ol,MemberList::priStaticMethods,inGroup); - writePlainMemberDeclaration(ol,MemberList::priStaticAttribs,inGroup); - } - writePlainMemberDeclaration(ol,MemberList::friends,inGroup); - writePlainMemberDeclaration(ol,MemberList::related,inGroup); } /*! a link to this class is possible within this project */ @@ -3682,21 +3666,349 @@ void ClassDef::sortMemberLists() } } +static void convertProtectionLevel( + MemberList::ListType inListType, + Protection inProt, + int *outListType1, + int *outListType2 + ) +{ + // default representing Public inheritance + *outListType1=inListType; + *outListType2=-1; + if (inProt==Public) + { + switch (inListType) // in the private section of the derived class, + // the private section of the base class should not + // be visible + { + case MemberList::priMethods: + case MemberList::priStaticMethods: + case MemberList::priSlots: + case MemberList::priAttribs: + case MemberList::priStaticAttribs: + case MemberList::priTypes: + *outListType1=-1; + *outListType2=-1; + break; + default: + break; + } + } + else if (inProt==Protected) // Protected inheritance + { + switch (inListType) // in the protected section of the derived class, + // both the public and protected members are shown + // as protected + { + case MemberList::pubMethods: + case MemberList::pubStaticMethods: + case MemberList::pubSlots: + case MemberList::pubAttribs: + case MemberList::pubStaticAttribs: + case MemberList::pubTypes: + case MemberList::priMethods: + case MemberList::priStaticMethods: + case MemberList::priSlots: + case MemberList::priAttribs: + case MemberList::priStaticAttribs: + case MemberList::priTypes: + *outListType1=-1; + *outListType2=-1; + break; + + case MemberList::proMethods: + *outListType1=MemberList::pubMethods; + *outListType2=MemberList::proMethods; + break; + case MemberList::proStaticMethods: + *outListType1=MemberList::pubStaticMethods; + *outListType2=MemberList::proStaticMethods; + break; + case MemberList::proSlots: + *outListType1=MemberList::pubSlots; + *outListType1=MemberList::proSlots; + break; + case MemberList::proAttribs: + *outListType1=MemberList::pubAttribs; + *outListType2=MemberList::proAttribs; + break; + case MemberList::proStaticAttribs: + *outListType1=MemberList::pubStaticAttribs; + *outListType2=MemberList::proStaticAttribs; + break; + case MemberList::proTypes: + *outListType1=MemberList::pubTypes; + *outListType2=MemberList::proTypes; + break; + default: + break; + } + } + else if (inProt==Private) + { + switch (inListType) // in the private section of the derived class, + // both the public and protected members are shown + // as private + { + case MemberList::pubMethods: + case MemberList::pubStaticMethods: + case MemberList::pubSlots: + case MemberList::pubAttribs: + case MemberList::pubStaticAttribs: + case MemberList::pubTypes: + case MemberList::proMethods: + case MemberList::proStaticMethods: + case MemberList::proSlots: + case MemberList::proAttribs: + case MemberList::proStaticAttribs: + case MemberList::proTypes: + *outListType1=-1; + *outListType2=-1; + break; + + case MemberList::priMethods: + *outListType1=MemberList::pubMethods; + *outListType2=MemberList::proMethods; + break; + case MemberList::priStaticMethods: + *outListType1=MemberList::pubStaticMethods; + *outListType2=MemberList::proStaticMethods; + break; + case MemberList::priSlots: + *outListType1=MemberList::pubSlots; + *outListType1=MemberList::proSlots; + break; + case MemberList::priAttribs: + *outListType1=MemberList::pubAttribs; + *outListType2=MemberList::proAttribs; + break; + case MemberList::priStaticAttribs: + *outListType1=MemberList::pubStaticAttribs; + *outListType2=MemberList::proStaticAttribs; + break; + case MemberList::priTypes: + *outListType1=MemberList::pubTypes; + *outListType2=MemberList::proTypes; + break; + default: + break; + } + } +} + +int ClassDef::countInheritedDecMembersRec(MemberList::ListType lt) +{ + int count=0; + if (m_impl->inherits) + { + BaseClassDef *ibcd=m_impl->inherits->first(); + while (ibcd) + { + ClassDef *icd=ibcd->classDef; + int lt1,lt2; + convertProtectionLevel(lt,ibcd->prot,<1,<2); + MemberList *ml = icd->getMemberList((MemberList::ListType)lt1); + if (ml) + { + ml->countDecMembers(); + count+=ml->numDecMembers(); + count+=icd->countInheritedDecMembersRec((MemberList::ListType)lt1); + } + if (lt2!=-1) + { + ml = icd->getMemberList((MemberList::ListType)lt2); + if (ml) + { + ml->countDecMembers(); + count+=ml->numDecMembers(); + count+=icd->countInheritedDecMembersRec((MemberList::ListType)lt2); + } + } + ibcd=m_impl->inherits->next(); + } + } + if (m_impl->memberGroupSDict) + { + MemberGroupSDict::Iterator mgli(*m_impl->memberGroupSDict); + MemberGroup *mg; + for (;(mg=mgli.current());++mgli) + { + if (!mg->allMembersInSameSection() || !m_impl->subGrouping) // group is in its own section + { + count+=mg->countGroupedInheritedMembers(lt); + } + } + } + return count; +} + +int ClassDef::countInheritedDecMembers(MemberList::ListType lt) +{ + int count=0; + MemberList *ml = getMemberList(lt); + if (ml) + { + ml->countDecMembers(); + count = ml->numDecMembers(); + } + if (count==0) // for this class the member list is empty + { + count = countInheritedDecMembersRec(lt); + } + else // member list is not empty, so we will add the inherited members there + { + count=0; + } + return count; +} + +int ClassDef::countAdditionalInheritedMembers() +{ + int totalCount=0; + QListIterator eli( + LayoutDocManager::instance().docEntries(LayoutDocManager::Class)); + LayoutDocEntry *lde; + for (eli.toFirst();(lde=eli.current());++eli) + { + if (lde->kind()==LayoutDocEntry::MemberDecl) + { + LayoutDocEntryMemberDecl *lmd = (LayoutDocEntryMemberDecl*)lde; + totalCount+=countInheritedDecMembers(lmd->type); + } + } + //printf("countAdditonalInheritedMembers()=%d\n",totalCount); + return totalCount; +} + +void ClassDef::writeAdditionalInheritedMembers(OutputList &ol) +{ + //printf("writeAdditionalInheritedMembers()\n"); + QListIterator eli( + LayoutDocManager::instance().docEntries(LayoutDocManager::Class)); + LayoutDocEntry *lde; + for (eli.toFirst();(lde=eli.current());++eli) + { + if (lde->kind()==LayoutDocEntry::MemberDecl) + { + LayoutDocEntryMemberDecl *lmd = (LayoutDocEntryMemberDecl*)lde; + MemberList *ml = getMemberList(lmd->type); + if (ml==0 || ml->numDecMembers()==0) + { + QPtrDict visited(17); + writeInheritedMemberDeclarations(ol,lmd->type,lmd->title,this,TRUE,&visited); + } + } + } +} + +int ClassDef::countMembersIncludingGrouped(MemberList::ListType lt) +{ + int count=0; + MemberList *ml = getMemberList(lt); + if (ml) + { + ml->countDecMembers(); + count=ml->numDecMembers(); + } + if (m_impl->memberGroupSDict) + { + MemberGroupSDict::Iterator mgli(*m_impl->memberGroupSDict); + MemberGroup *mg; + for (;(mg=mgli.current());++mgli) + { + if (!mg->allMembersInSameSection() || !m_impl->subGrouping) // group is in its own section + { + count+=mg->countGroupedInheritedMembers(lt); + } + } + } + return count; +} + +void ClassDef::writeInheritedMemberDeclarations(OutputList &ol, + MemberList::ListType lt,const QCString &title, + ClassDef *inheritedFrom,bool invert, + QPtrDict *visitedClasses) +{ + ol.pushGeneratorState(); + ol.disableAllBut(OutputGenerator::Html); + bool process = countMembersIncludingGrouped(lt)>0; + if (process^invert) + { + if (m_impl->inherits) + { + BaseClassDef *ibcd=m_impl->inherits->first(); + while (ibcd) + { + ClassDef *icd=ibcd->classDef; + int lt1,lt2; + convertProtectionLevel(lt,ibcd->prot,<1,<2); + //printf("%s:convert %d->(%d,%d)\n",icd->name().data(),lt,lt1,lt2); + if (visitedClasses->find(icd)!=0) return; + visitedClasses->insert(icd,icd); + if (lt1!=-1) + { + icd->writeMemberDeclarations(ol,(MemberList::ListType)lt1,title,QCString(),FALSE,inheritedFrom,lt2,visitedClasses); + } + ibcd=m_impl->inherits->next(); + } + } + } + ol.popGeneratorState(); +} + void ClassDef::writeMemberDeclarations(OutputList &ol,MemberList::ListType lt,const QCString &title, - const char *subTitle,bool showInline) + const char *subTitle,bool showInline,ClassDef *inheritedFrom,int lt2,QPtrDict *visitedClasses) { - //printf("%s: ClassDef::writeMemberDeclarations\n",name().data()); + //printf("%s::writeMemberDeclarations(%s)\n",name().data(),title.data()); //static bool optimizeVhdl = Config_getBool("OPTIMIZE_OUTPUT_VHDL"); MemberList * ml = getMemberList(lt); if (ml) { + //printf("%s: ClassDef::writeMemberDeclarations for %s\n",name().data(),ml->listTypeAsString().data()); if (getLanguage()==SrcLangExt_VHDL) // use specific declarations function { VhdlDocGen::writeVhdlDeclarations(ml,ol,0,this,0,0); } else // use generic declaration function { - ml->writeDeclarations(ol,this,0,0,0,title,subTitle,FALSE,showInline); + ml->writeDeclarations(ol,this,0,0,0,title,subTitle,FALSE,showInline,inheritedFrom); + if (lt2!=-1) + { + MemberList * ml2 = getMemberList((MemberList::ListType)lt2); + if (ml2) + { + ml2->writeDeclarations(ol,this,0,0,0,0,0,FALSE,showInline,inheritedFrom); + } + } + + static bool inlineInheritedMembers = Config_getBool("INLINE_INHERITED_MEMB"); + if (!inlineInheritedMembers) // show inherited members as separate lists + { + QPtrDict visited(17); + writeInheritedMemberDeclarations(ol,lt,title, + inheritedFrom ? inheritedFrom : this, + FALSE,visitedClasses==0 ? &visited: visitedClasses); + } + } + } +} + +void ClassDef::addGroupedInheritedMembers(OutputList &ol,MemberList::ListType lt,const QCString &inheritId) +{ + //printf("** %s::addGroupedInheritedMembers(%p) inheritId=%s\n",name().data(),m_impl->memberGroupSDict,inheritId.data()); + if (m_impl->memberGroupSDict) + { + MemberGroupSDict::Iterator mgli(*m_impl->memberGroupSDict); + MemberGroup *mg; + for (;(mg=mgli.current());++mgli) + { + //printf(" candidate %s\n",mg->header().data()); + if (!mg->allMembersInSameSection() || !m_impl->subGrouping) // group is in its own section + { + mg->addGroupedInheritedMembers(ol,this,lt,inheritId); + } } } } @@ -3715,14 +4027,15 @@ void ClassDef::writeSimpleMemberDocumentation(OutputList &ol,MemberList::ListTyp if (ml) ml->writeSimpleDocumentation(ol,this); } -void ClassDef::writePlainMemberDeclaration(OutputList &ol,MemberList::ListType lt,bool inGroup) +void ClassDef::writePlainMemberDeclaration(OutputList &ol, + MemberList::ListType lt,bool inGroup,const char *inheritId) { //printf("%s: ClassDef::writePlainMemberDeclaration()\n",name().data()); MemberList * ml = getMemberList(lt); if (ml) { ml->setInGroup(inGroup); - ml->writePlainDeclarations(ol,this,0,0,0); + ml->writePlainDeclarations(ol,this,0,0,0,inheritId); } } diff --git a/src/classdef.h b/src/classdef.h index 205b437..f73b08c 100644 --- a/src/classdef.h +++ b/src/classdef.h @@ -21,6 +21,7 @@ #include "qtbc.h" #include #include +#include #include #include "util.h" @@ -330,7 +331,7 @@ class ClassDef : public Definition void writeDocumentationForInnerClasses(OutputList &ol); void writeMemberPages(OutputList &ol); void writeMemberList(OutputList &ol); - void writeDeclaration(OutputList &ol,MemberDef *md,bool inGroup); + void writeDeclaration(OutputList &ol,MemberDef *md,bool inGroup,const char *inheritId); void writeQuickMemberLinks(OutputList &ol,MemberDef *md) const; void writeSummaryLinks(OutputList &ol); void reclassifyMember(MemberDef *md,MemberDef::MemberType t); @@ -338,6 +339,8 @@ class ClassDef : public Definition void writeDeclarationLink(OutputList &ol,bool &found, const char *header,bool localNames); void removeMemberFromLists(MemberDef *md); + void addGroupedInheritedMembers(OutputList &ol,MemberList::ListType lt, + const QCString &inheritId); bool visited; @@ -354,11 +357,12 @@ class ClassDef : public Definition QCString getMemberListFileName() const; void addMemberToList(MemberList::ListType lt,MemberDef *md,bool isBrief); MemberList *createMemberList(MemberList::ListType lt); + void writeInheritedMemberDeclarations(OutputList &ol,MemberList::ListType lt,const QCString &title,ClassDef *inheritedFrom,bool invert,QPtrDict *visitedClasses); void writeMemberDeclarations(OutputList &ol,MemberList::ListType lt,const QCString &title, - const char *subTitle=0,bool showInline=FALSE); + const char *subTitle=0,bool showInline=FALSE,ClassDef *inheritedFrom=0,int lt2=-1,QPtrDict *visitedClasses=0); void writeMemberDocumentation(OutputList &ol,MemberList::ListType lt,const QCString &title,bool showInline=FALSE); void writeSimpleMemberDocumentation(OutputList &ol,MemberList::ListType lt); - void writePlainMemberDeclaration(OutputList &ol,MemberList::ListType lt,bool inGroup); + void writePlainMemberDeclaration(OutputList &ol,MemberList::ListType lt,bool inGroup,const char *inheritId); void writeBriefDescription(OutputList &ol,bool exampleFlag); void writeDetailedDescription(OutputList &ol,const QCString &pageType,bool exampleFlag, const QCString &title,const QCString &anchor=QCString()); @@ -377,6 +381,12 @@ class ClassDef : public Definition void writeMoreLink(OutputList &ol,const QCString &anchor); void writeDetailedDocumentationBody(OutputList &ol); + int countInheritedDecMembersRec(MemberList::ListType lt); + int countInheritedDecMembers(MemberList::ListType lt); + int countAdditionalInheritedMembers(); + void writeAdditionalInheritedMembers(OutputList &ol); + int countMembersIncludingGrouped(MemberList::ListType lt); + ClassDefImpl *m_impl; }; diff --git a/src/cmdmapper.cpp b/src/cmdmapper.cpp index 5d52557..c4379e3 100644 --- a/src/cmdmapper.cpp +++ b/src/cmdmapper.cpp @@ -75,6 +75,7 @@ CommandMap cmdMap[] = { "return", CMD_RETURN }, { "returns", CMD_RETURN }, { "retval", CMD_RETVAL }, + { "rtfonly", CMD_RTFONLY }, { "sa", CMD_SA }, { "secreflist", CMD_SECREFLIST }, { "section", CMD_SECTION }, @@ -117,6 +118,8 @@ CommandMap cmdMap[] = { "includelineno", CMD_INCWITHLINES }, { "inheritdoc", CMD_INHERITDOC }, { "mscfile", CMD_MSCFILE }, + { "rtfonly", CMD_RTFONLY }, + { "endrtfonly", CMD_ENDRTFONLY }, { 0, 0 }, }; diff --git a/src/cmdmapper.h b/src/cmdmapper.h index 04bb3ed..deb5f50 100644 --- a/src/cmdmapper.h +++ b/src/cmdmapper.h @@ -118,7 +118,9 @@ enum CommandType CMD_DCOLON = 84, CMD_COPYRIGHT = 85 | SIMPLESECT_BIT, CMD_CITE = 86, - CMD_SNIPPET = 87 + CMD_SNIPPET = 87, + CMD_RTFONLY = 88, + CMD_ENDRTFONLY = 89 }; enum HtmlTagType diff --git a/src/code.l b/src/code.l index dff0218..33c50c5 100644 --- a/src/code.l +++ b/src/code.l @@ -2378,6 +2378,13 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP} codifyLines(yytext); endFontClass(); } +"*"{B}*")" { // end of cast? + g_code->codify(yytext); + g_theCallContext.popScope(); + g_bracketCount--; + g_parmType = g_name; + BEGIN(FuncCall); + } [\\|\)\+\-\/\%\~\!] { g_code->codify(yytext); g_name.resize(0);g_type.resize(0); @@ -2870,8 +2877,17 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP} } g_code->codify(yytext); } -")" { - g_theVarContext.addVariable(g_parmType,g_parmName); +("*"{B}*)?")" { + if (yytext[0]==')') // no a pointer cast + { + //printf("addVariable(%s,%s)\n",g_parmType.data(),g_parmName.data()); + g_theVarContext.addVariable(g_parmType,g_parmName); + } + else + { + g_parmType.resize(0); + g_parmName.resize(0); + } g_theCallContext.popScope(); g_inForEachExpression = FALSE; //g_theCallContext.setClass(0); // commented out, otherwise a()->b() does not work for b(). diff --git a/src/compound.xsd b/src/compound.xsd index 1149266..406f6f5 100644 --- a/src/compound.xsd +++ b/src/compound.xsd @@ -365,6 +365,9 @@ + + + diff --git a/src/compound_xsd.h b/src/compound_xsd.h index 6531857..5e04417 100644 --- a/src/compound_xsd.h +++ b/src/compound_xsd.h @@ -365,6 +365,9 @@ " \n" " \n" " \n" +" \n" +" \n" +" \n" " \n" " \n" " \n" diff --git a/src/config.xml b/src/config.xml index e3ea5bf..e42a3ae 100644 --- a/src/config.xml +++ b/src/config.xml @@ -888,11 +888,6 @@ If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML page will contain the date and time when the page was generated. Setting this to NO can help when comparing the output of multiple runs. ' defval='1' depends='GENERATE_HTML'/> -