diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/classdef.cpp | 32 | ||||
| -rw-r--r-- | src/config.xml | 9 | ||||
| -rw-r--r-- | src/define.cpp | 2 | ||||
| -rw-r--r-- | src/doxygen.cpp | 59 | ||||
| -rw-r--r-- | src/lodepng.cpp | 15 | ||||
| -rw-r--r-- | src/memberdef.cpp | 2 | ||||
| -rw-r--r-- | src/translator_br.h | 218 | ||||
| -rw-r--r-- | src/translator_kr.h | 6 | ||||
| -rw-r--r-- | src/translator_lt.h | 2 | ||||
| -rw-r--r-- | src/translator_pt.h | 190 | ||||
| -rw-r--r-- | src/translator_sr.h | 16 | ||||
| -rw-r--r-- | src/translator_tw.h | 5 | ||||
| -rw-r--r-- | src/translator_vi.h | 8 | ||||
| -rw-r--r-- | src/util.cpp | 6 | ||||
| -rw-r--r-- | src/util.h | 2 |
15 files changed, 484 insertions, 88 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp index 4a48de1..1e0a15f 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -854,13 +854,14 @@ void ClassDef::setIncludeFile(FileDef *fd, static void searchTemplateSpecs(/*in*/ Definition *d, /*out*/ QList<ArgumentList> &result, - /*out*/ QCString &name) + /*out*/ QCString &name, + /*in*/ SrcLangExt lang) { if (d->definitionType()==Definition::TypeClass) { if (d->getOuterScope()) { - searchTemplateSpecs(d->getOuterScope(),result,name); + searchTemplateSpecs(d->getOuterScope(),result,name,lang); } ClassDef *cd=(ClassDef *)d; if (!name.isEmpty()) name+="::"; @@ -876,7 +877,7 @@ static void searchTemplateSpecs(/*in*/ Definition *d, result.append(cd->templateArguments()); if (!isSpecialization) { - name+=tempArgListToString(cd->templateArguments()); + name+=tempArgListToString(cd->templateArguments(),lang); } } } @@ -887,11 +888,11 @@ static void searchTemplateSpecs(/*in*/ Definition *d, } static void writeTemplateSpec(OutputList &ol,Definition *d, - const QCString &type) + const QCString &type,SrcLangExt lang) { QList<ArgumentList> specs; QCString name; - searchTemplateSpecs(d,specs,name); + searchTemplateSpecs(d,specs,name,lang); if (specs.count()>0) // class has template scope specifiers { ol.startSubsubsection(); @@ -962,7 +963,7 @@ void ClassDef::writeDetailedDocumentationBody(OutputList &ol) if (getLanguage()==SrcLangExt_Cpp) { - writeTemplateSpec(ol,this,compoundTypeString()); + writeTemplateSpec(ol,this,compoundTypeString(),getLanguage()); } // repeat brief description @@ -2053,9 +2054,16 @@ QCString ClassDef::title() const } else { - pageTitle = theTranslator->trCompoundReference(displayName(), - m_impl->compType == Interface && getLanguage()==SrcLangExt_ObjC ? Class : m_impl->compType, - m_impl->tempArgs != 0); + if (Config_getBool("HIDE_COMPOUND_REFERENCE")) + { + pageTitle = displayName(); + } + else + { + pageTitle = theTranslator->trCompoundReference(displayName(), + m_impl->compType == Interface && getLanguage()==SrcLangExt_ObjC ? Class : m_impl->compType, + m_impl->tempArgs != 0); + } } return pageTitle; } @@ -3767,7 +3775,7 @@ QCString ClassDef::qualifiedNameWithTemplateParameters( //{ // clName = clName.left(clName.length()-2); //} - //printf("m_impl->lang=%d clName=%s\n",m_impl->lang,clName.data()); + //printf("m_impl->lang=%d clName=%s isSpecialization=%d\n",getLanguage(),clName.data(),isSpecialization); scName+=clName; ArgumentList *al=0; if (templateArguments()) @@ -3777,7 +3785,7 @@ QCString ClassDef::qualifiedNameWithTemplateParameters( al = actualParams->at(*actualParamIndex); if (!isSpecialization) { - scName+=tempArgListToString(al); + scName+=tempArgListToString(al,lang); } (*actualParamIndex)++; } @@ -3785,7 +3793,7 @@ QCString ClassDef::qualifiedNameWithTemplateParameters( { if (!isSpecialization) { - scName+=tempArgListToString(templateArguments()); + scName+=tempArgListToString(templateArguments(),lang); } } } diff --git a/src/config.xml b/src/config.xml index fb60c4c..670ebaf 100644 --- a/src/config.xml +++ b/src/config.xml @@ -886,6 +886,15 @@ Go to the <a href="commands.html">next</a> section or return to the ]]> </docs> </option> + <option type='bool' id='HIDE_COMPOUND_REFERENCE' defval='0'> + <docs> +<![CDATA[ + If the \c HIDE_COMPOUND_REFERENCE tag is set to \c NO (default) then + doxygen will append additional text to a page's title, such as Class Reference. + If set to \c YES the compound reference will be hidden. +]]> + </docs> + </option> <option type='bool' id='SHOW_INCLUDE_FILES' defval='1'> <docs> <![CDATA[ diff --git a/src/define.cpp b/src/define.cpp index 75459c9..2f4e43a 100644 --- a/src/define.cpp +++ b/src/define.cpp @@ -35,7 +35,7 @@ Define::Define(const Define &d) { //name=d.name; definition=d.definition; fileName=d.fileName; lineNr=d.lineNr; - lineNr=d.columnNr; + columnNr=d.columnNr; nargs=d.nargs; undef=d.undef; varArgs=d.varArgs; diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 8ab4591..68d48ff 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -1310,18 +1310,31 @@ static void addClassToContext(EntryNav *rootNav) QCString tagName; QCString refFileName; TagInfo *tagInfo = rootNav->tagInfo(); + int i; if (tagInfo) { tagName = tagInfo->tagName; refFileName = tagInfo->fileName; - int i; - if ((i=fullName.find("::"))!=-1) + if (fullName.find("::")!=-1) // symbols imported via tag files may come without the parent scope, // so we artificially create it here { buildScopeFromQualifiedName(fullName,fullName.contains("::"),root->lang,tagInfo); } } + ArgumentList *tArgList = 0; + if ((root->lang==SrcLangExt_CSharp || root->lang==SrcLangExt_Java) && (i=fullName.find('<'))!=-1) + { + // a Java/C# generic class looks like a C++ specialization, so we need to split the + // name and template arguments here + tArgList = new ArgumentList; + stringToArgumentList(fullName.mid(i),tArgList); + fullName=fullName.left(i); + } + else + { + tArgList = getTemplateArgumentsFromName(fullName,root->tArgLists); + } cd=new ClassDef(root->fileName,root->startLine,root->startColumn, fullName,sec,tagName,refFileName,TRUE,root->spec&Entry::Enum); Debug::print(Debug::Classes,0," New class `%s' (sec=0x%08x)! #tArgLists=%d tagInfo=%p\n", @@ -1336,8 +1349,6 @@ static void addClassToContext(EntryNav *rootNav) cd->setTypeConstraints(root->typeConstr); //printf("new ClassDef %s tempArgList=%p specScope=%s\n",fullName.data(),root->tArgList,root->scopeSpec.data()); - ArgumentList *tArgList = - getTemplateArgumentsFromName(fullName,root->tArgLists); //printf("class %s template args=%s\n",fullName.data(), // tArgList ? tempArgListToString(tArgList).data() : "<none>"); cd->setTemplateArguments(tArgList); @@ -4394,7 +4405,7 @@ static bool findTemplateInstanceRelation(Entry *root, //printf("\n"); bool existingClass = (templSpec == - tempArgListToString(templateClass->templateArguments()) + tempArgListToString(templateClass->templateArguments(),root->lang) ); if (existingClass) return TRUE; @@ -4648,7 +4659,8 @@ static bool findClassRelation( if (si==-1) si=0; if (baseClass==0 && (root->lang==SrcLangExt_CSharp || root->lang==SrcLangExt_Java)) { - baseClass = Doxygen::genericsDict->find(baseClassName); + // for Java/C# strip the template part before looking for matching + baseClass = Doxygen::genericsDict->find(baseClassName.left(i)); //printf("looking for '%s' result=%p\n",baseClassName.data(),baseClass); } if (baseClass==0 && i!=-1) @@ -4710,7 +4722,7 @@ static bool findClassRelation( if (found) templSpec = tmpTemplSpec; } //printf("2. found=%d\n",found); - + //printf("root->name=%s biName=%s baseClassName=%s\n", // root->name.data(),biName.data(),baseClassName.data()); //if (cd->isCSharp() && i!=-1) // C# generic -> add internal -g postfix @@ -4938,6 +4950,22 @@ static void findClassEntries(EntryNav *rootNav) RECURSE_ENTRYTREE(findClassEntries,rootNav); } +static QCString extractClassName(EntryNav *rootNav) +{ + // strip any anonymous scopes first + QCString bName=stripAnonymousNamespaceScope(rootNav->name()); + bName=stripTemplateSpecifiersFromScope(bName); + int i; + if ((rootNav->lang()==SrcLangExt_CSharp || rootNav->lang()==SrcLangExt_Java) && + (i=bName.find('<'))!=-1) + { + // a Java/C# generic class looks like a C++ specialization, so we need to strip the + // template part before looking for matches + bName=bName.left(i); + } + return bName; +} + /*! Using the dictionary build by findClassEntries(), this * function will look for additional template specialization that * exists as inheritance relations only. These instances will be @@ -4952,9 +4980,7 @@ static void findInheritedTemplateInstances() for (;(rootNav=edi.current());++edi) { ClassDef *cd; - // strip any anonymous scopes first - QCString bName=stripAnonymousNamespaceScope(rootNav->name()); - bName=stripTemplateSpecifiersFromScope(bName); + QCString bName = extractClassName(rootNav); Debug::print(Debug::Classes,0," Inheritance: Class %s : \n",bName.data()); if ((cd=getClass(bName))) { @@ -4975,9 +5001,7 @@ static void findUsedTemplateInstances() for (;(rootNav=edi.current());++edi) { ClassDef *cd; - // strip any anonymous scopes first - QCString bName=stripAnonymousNamespaceScope(rootNav->name()); - bName=stripTemplateSpecifiersFromScope(bName); + QCString bName = extractClassName(rootNav); Debug::print(Debug::Classes,0," Usage: Class %s : \n",bName.data()); if ((cd=getClass(bName))) { @@ -5000,10 +5024,7 @@ static void computeClassRelations() rootNav->loadEntry(g_storage); Entry *root = rootNav->entry(); - - // strip any anonymous scopes first - QCString bName=stripAnonymousNamespaceScope(rootNav->name()); - bName=stripTemplateSpecifiersFromScope(bName); + QCString bName = extractClassName(rootNav); Debug::print(Debug::Classes,0," Relations: Class %s : \n",bName.data()); if ((cd=getClass(bName))) { @@ -6311,7 +6332,7 @@ static void findMember(EntryNav *rootNav, for (;(al=alli.current());++alli) { warnMsg+=" template "; - warnMsg+=tempArgListToString(al); + warnMsg+=tempArgListToString(al,root->lang); warnMsg+='\n'; } } @@ -6334,7 +6355,7 @@ static void findMember(EntryNav *rootNav, if (templAl!=0) { warnMsg+=" 'template "; - warnMsg+=tempArgListToString(templAl); + warnMsg+=tempArgListToString(templAl,root->lang); warnMsg+='\n'; } warnMsg+=" "; diff --git a/src/lodepng.cpp b/src/lodepng.cpp index b237d5a..3bf1d46 100644 --- a/src/lodepng.cpp +++ b/src/lodepng.cpp @@ -3535,20 +3535,11 @@ static void filterScanline(unsigned char* out, const unsigned char* scanline, co switch(filterType) { case 0: - if(prevline) for(i = 0; i < length; i++) out[i] = scanline[i]; - else for(i = 0; i < length; i++) out[i] = scanline[i]; + for(i = 0; i < length; i++) out[i] = scanline[i]; break; case 1: - if(prevline) - { - for(i = 0; i < bytewidth; i++) out[i] = scanline[i]; - for(i = bytewidth; i < length ; i++) out[i] = scanline[i] - scanline[i - bytewidth]; - } - else - { - for(i = 0; i < bytewidth; i++) out[i] = scanline[i]; - for(i = bytewidth; i < length; i++) out[i] = scanline[i] - scanline[i - bytewidth]; - } + for(i = 0; i < bytewidth; i++) out[i] = scanline[i]; + for(i = bytewidth; i < length; i++) out[i] = scanline[i] - scanline[i - bytewidth]; break; case 2: if(prevline) for(i = 0; i < length; i++) out[i] = scanline[i] - prevline[i]; diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 0485c88..e79f13a 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -194,7 +194,7 @@ static bool writeDefArgumentList(OutputList &ol,ClassDef *cd, } else if (cd->templateArguments()) { - cName=tempArgListToString(cd->templateArguments()); + cName=tempArgListToString(cd->templateArguments(),cd->getLanguage()); //printf("2. cName=%s\n",cName.data()); } else // no template specifier diff --git a/src/translator_br.h b/src/translator_br.h index b381495..b7bd604 100644 --- a/src/translator_br.h +++ b/src/translator_br.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (C) 1997-2014 by Dimitri van Heesch. + * Copyright (C) 1997-2013 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -15,26 +15,30 @@ * Thanks to Jorge Ramos, Fernando Carijo and others for their contributions. * * History: - * 20110628: - * - Updated to 1.7.5; - * 20100531: - * - Updated to 1.6.3; - * 20091218: - * - Updated to 1.6.1; - * - Copyright year updated; - * - Translation updates suggested by Fernando Carijó added; - * 20080709: + * 20131129: + * - Updated to 1.8.5; + * - Translation in the method trFileMembers() fixed; + * - Translation in the method trEnumerationValues() fixed; + * 20110628: + * - Updated to 1.7.5; + * 20100531: + * - Updated to 1.6.3; + * 20091218: + * - Updated to 1.6.1; + * - Copyright year updated; + * - Translation updates suggested by Fernando Carijó added; + * 20080709: * - References to MAX_DOT_GRAPH_HEIGHT removed from trLegendDocs(). - * 20080206: - * - Method trTypeContraints() renamed to trTypeConstraints(). - * 20071216: + * 20080206: + * - Method trTypeContraints() renamed to trTypeConstraints(). + * 20071216: * - New methods since 1.5.4 updated. - * Previous history removed from this version. + * Previous history removed from this version. */ #ifndef TRANSLATOR_BR_H #define TRANSLATOR_BR_H -class TranslatorBrazilian : public TranslatorAdapter_1_8_0 +class TranslatorBrazilian : public Translator { public: @@ -194,7 +198,7 @@ class TranslatorBrazilian : public TranslatorAdapter_1_8_0 } else { - return "Arquivos Membros"; + return "Membros dos Arquivos"; } } @@ -432,7 +436,7 @@ class TranslatorBrazilian : public TranslatorAdapter_1_8_0 * list of (global) variables */ virtual QCString trEnumerationValues() - { return "Valores enumerados"; } + { return "Valores de enumerações"; } /*! This is used in the documentation of a file before the list of * documentation blocks for defines @@ -1834,5 +1838,185 @@ class TranslatorBrazilian : public TranslatorAdapter_1_8_0 /*! Header for the graph showing the directory dependencies */ virtual QCString trDirDepGraph(const char *name) { return QCString("Grafo de dependências do diretório ")+name+":"; } + +////////////////////////////////////////////////////////////////////////// +// new since 1.8.0 +////////////////////////////////////////////////////////////////////////// + + /*! Detail level selector shown for hierarchical indices */ + virtual QCString trDetailLevel() + { return "nível de detalhes"; } + + /*! Section header for list of template parameters */ + virtual QCString trTemplateParameters() + { return "Parâmetros de template"; } + + /*! Used in dot graph when UML_LOOK is enabled and there are many fields */ + virtual QCString trAndMore(const QCString &number) + { return "e "+number+" mais..."; } + + /*! Used file list for a Java enum */ + virtual QCString trEnumGeneratedFromFiles(bool single) + { QCString result = "A documentação para esta enumeração foi gerada a partir"; + if (single) { + result += "do seguinte arquivo:"; + } else { + result += "dos seguintes arquivos:"; + } + return result; + } + + /*! Header of a Java enum page (Java enums are represented as classes). */ + virtual QCString trEnumReference(const char *name) + { + QCString result = "Referência da enumeração "; + return result + name; + } + + /*! Used for a section containing inherited members */ + virtual QCString trInheritedFrom(const char *members,const char *what) + { return QCString(members)+" herdados de "+what; } + + /*! Header of the sections with inherited members specific for the + * base class(es) + */ + virtual QCString trAdditionalInheritedMembers() + { return "Outros membros herdados"; } + +////////////////////////////////////////////////////////////////////////// +// new since 1.8.2 +////////////////////////////////////////////////////////////////////////// + + /*! Used as a tooltip for the toggle button that appears in the + * navigation tree in the HTML output when GENERATE_TREEVIEW is + * enabled. This tooltip explains the meaning of the button. + */ + virtual QCString trPanelSynchronisationTooltip(bool enable) + { + QCString opt = enable ? "ativar" : "desativar"; + return "clique para "+opt+" a sincronização do painel"; + } + + /*! Used in a method of an Objective-C class that is declared in a + * a category. Note that the @1 marker is required and is replaced + * by a link. + */ + virtual QCString trProvidedByCategory() + { + return "Provido pela categoria @1."; + } + + /*! Used in a method of an Objective-C category that extends a class. + * Note that the @1 marker is required and is replaced by a link to + * the class method. + */ + virtual QCString trExtendsClass() + { + return "estende a classe @1."; + } + + /*! Used as the header of a list of class methods in Objective-C. + * These are similar to static public member functions in C++. + */ + virtual QCString trClassMethods() + { + return "Métodos de classe"; + } + + /*! Used as the header of a list of instance methods in Objective-C. + * These are similar to public member functions in C++. + */ + virtual QCString trInstanceMethods() + { + return "Métodos de instância"; + } + + /*! Used as the header of the member functions of an Objective-C class. + */ + virtual QCString trMethodDocumentation() + { + return "Documentação do método"; + } + + /*! Used as the title of the design overview picture created for the + * VHDL output. + */ + virtual QCString trDesignOverview() + { + // I'm not sure how to accurately translate it + return "Visão geral do design"; + } + +////////////////////////////////////////////////////////////////////////// +// new since 1.8.4 +////////////////////////////////////////////////////////////////////////// + + /** old style UNO IDL services: implemented interfaces */ + virtual QCString trInterfaces() + { return "Interfaces Exportadas"; } + + /** old style UNO IDL services: inherited services */ + virtual QCString trServices() + { return "Serviços Incluídos"; } + + /** UNO IDL constant groups */ + virtual QCString trConstantGroups() + { return "Grupos de Constantes"; } + + /** UNO IDL constant groups */ + virtual QCString trConstantGroupReference(const char *namespaceName) + { + QCString result = "Referência do grupo de constantes "; + result += namespaceName; + return result; + } + + /** UNO IDL service page title */ + virtual QCString trServiceReference(const char *sName) + { + QCString result = "Referência do serviço "; + result += sName; + return result; + } + + /** UNO IDL singleton page title */ + virtual QCString trSingletonReference(const char *sName) + { + QCString result = "Referência do Singleton "; + result += sName; + return result; + } + + /** UNO IDL service page */ + virtual QCString trServiceGeneratedFromFiles(bool single) + { + // single is true implies a single file + QCString result=(QCString)"A documentação para este serviço " + "foi gerada a partir "; + if (single) { + result+="do seguinte arquivo:"; + } else { + result+="dos: seguintes arquivos:"; + } + return result; + } + + /** UNO IDL singleton page */ + virtual QCString trSingletonGeneratedFromFiles(bool single) + { + // single is true implies a single file + QCString result=(QCString)"A documentação para este singleton " + "foi gerada a partir "; + if (single) { + result+="do seguinte arquivo:"; + } else { + result+="dos: seguintes arquivos:"; + } + + return result; + } + +////////////////////////////////////////////////////////////////////////// }; #endif + diff --git a/src/translator_kr.h b/src/translator_kr.h index c82d0b2..18337a5 100644 --- a/src/translator_kr.h +++ b/src/translator_kr.h @@ -677,10 +677,10 @@ class TranslatorKorean : public Translator if (i!=numEntries-1) // not the last entry, so we need a separator { - if (i<numEntries-2) // not the fore last entry - result+=", "; - else // the fore last entry + //if (i<numEntries-2) // not the fore last entry result+=", "; + //else // the fore last entry + // result+=", "; // TODO: does the 'and' need to be translated here? } } return result; diff --git a/src/translator_lt.h b/src/translator_lt.h index 000dc6e..174170e 100644 --- a/src/translator_lt.h +++ b/src/translator_lt.h @@ -197,7 +197,7 @@ class TranslatorLithuanian : public TranslatorAdapter_1_4_6 } else { - return "Globalūs Nariai"; + return "Failų Nariai"; } } diff --git a/src/translator_pt.h b/src/translator_pt.h index 95a62b0..13422f6 100644 --- a/src/translator_pt.h +++ b/src/translator_pt.h @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (C) 1997-2014 by Dimitri van Heesch. + * Copyright (C) 1997-2013 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -24,6 +24,9 @@ * VERSION HISTORY * --------------- * History: + * 20131129: + * - Updated to 1.8.5; + * - Translation in the method trFileMembers() fixed; * 20110628: * - Updated to 1.7.5; * - All obsolete methods have been removed; @@ -52,7 +55,7 @@ #define TRANSLATOR_PT_H -class TranslatorPortuguese : public TranslatorAdapter_1_8_0 +class TranslatorPortuguese : public Translator { public: @@ -216,7 +219,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0 } else { - return "Ficheiros membro"; + return "Membros dos Ficheiros"; } } @@ -442,7 +445,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0 * list of (global) variables */ QCString trEnumerationValues() - { return "Valores da enumeração"; } + { return "Valores de enumerações"; } /*! This is used in the documentation of a file before the list of * documentation blocks for defines @@ -1835,6 +1838,185 @@ class TranslatorPortuguese : public TranslatorAdapter_1_8_0 /*! Header for the graph showing the directory dependencies */ virtual QCString trDirDepGraph(const char *name) { return QCString("Grafo de dependências do directório ")+name+":"; } + +////////////////////////////////////////////////////////////////////////// +// new since 1.8.0 +////////////////////////////////////////////////////////////////////////// + + /*! Detail level selector shown for hierarchical indices */ + virtual QCString trDetailLevel() + { return "nível de detalhes"; } + + /*! Section header for list of template parameters */ + virtual QCString trTemplateParameters() + { return "Parâmetros de template"; } + + /*! Used in dot graph when UML_LOOK is enabled and there are many fields */ + virtual QCString trAndMore(const QCString &number) + { return "e "+number+" mais..."; } + + /*! Used file list for a Java enum */ + virtual QCString trEnumGeneratedFromFiles(bool single) + { QCString result = "A documentação para esta enumeração foi gerada a partir"; + if (single) { + result += "do seguinte ficheiro:"; + } else { + result += "dos seguintes ficheiros:"; + } + return result; + } + + /*! Header of a Java enum page (Java enums are represented as classes). */ + virtual QCString trEnumReference(const char *name) + { + QCString result = "Referência da enumeração "; + return result + name; + } + + /*! Used for a section containing inherited members */ + virtual QCString trInheritedFrom(const char *members,const char *what) + { return QCString(members)+" herdados de "+what; } + + /*! Header of the sections with inherited members specific for the + * base class(es) + */ + virtual QCString trAdditionalInheritedMembers() + { return "Outros membros herdados"; } + +////////////////////////////////////////////////////////////////////////// +// new since 1.8.2 +////////////////////////////////////////////////////////////////////////// + + /*! Used as a tooltip for the toggle button that appears in the + * navigation tree in the HTML output when GENERATE_TREEVIEW is + * enabled. This tooltip explains the meaning of the button. + */ + virtual QCString trPanelSynchronisationTooltip(bool enable) + { + QCString opt = enable ? "ativar" : "desativar"; + return "clique para "+opt+" a sincronização do painel"; + } + + /*! Used in a method of an Objective-C class that is declared in a + * a category. Note that the @1 marker is required and is replaced + * by a link. + */ + virtual QCString trProvidedByCategory() + { + return "Provido pela categoria @1."; + } + + /*! Used in a method of an Objective-C category that extends a class. + * Note that the @1 marker is required and is replaced by a link to + * the class method. + */ + virtual QCString trExtendsClass() + { + return "estende a classe @1."; + } + + /*! Used as the header of a list of class methods in Objective-C. + * These are similar to static public member functions in C++. + */ + virtual QCString trClassMethods() + { + return "Métodos de classe"; + } + + /*! Used as the header of a list of instance methods in Objective-C. + * These are similar to public member functions in C++. + */ + virtual QCString trInstanceMethods() + { + return "Métodos de instância"; + } + + /*! Used as the header of the member functions of an Objective-C class. + */ + virtual QCString trMethodDocumentation() + { + return "Documentação do método"; + } + + /*! Used as the title of the design overview picture created for the + * VHDL output. + */ + virtual QCString trDesignOverview() + { + // I'm not sure how to accurately translate it + return "Visão geral do design"; + } + +////////////////////////////////////////////////////////////////////////// +// new since 1.8.4 +////////////////////////////////////////////////////////////////////////// + + /** old style UNO IDL services: implemented interfaces */ + virtual QCString trInterfaces() + { return "Interfaces Exportadas"; } + + /** old style UNO IDL services: inherited services */ + virtual QCString trServices() + { return "Serviços Incluídos"; } + + /** UNO IDL constant groups */ + virtual QCString trConstantGroups() + { return "Grupos de Constantes"; } + + /** UNO IDL constant groups */ + virtual QCString trConstantGroupReference(const char *namespaceName) + { + QCString result = "Referência do grupo de constantes "; + result += namespaceName; + return result; + } + + /** UNO IDL service page title */ + virtual QCString trServiceReference(const char *sName) + { + QCString result = "Referência do serviço "; + result += sName; + return result; + } + + /** UNO IDL singleton page title */ + virtual QCString trSingletonReference(const char *sName) + { + QCString result = "Referência do Singleton "; + result += sName; + return result; + } + + /** UNO IDL service page */ + virtual QCString trServiceGeneratedFromFiles(bool single) + { + // single is true implies a single file + QCString result=(QCString)"A documentação para este serviço " + "foi gerada a partir "; + if (single) { + result+="do seguinte ficheiro:"; + } else { + result+="dos: seguintes ficheiros:"; + } + return result; + } + + /** UNO IDL singleton page */ + virtual QCString trSingletonGeneratedFromFiles(bool single) + { + // single is true implies a single file + QCString result=(QCString)"A documentação para este singleton " + "foi gerada a partir "; + if (single) { + result+="do seguinte ficheiro:"; + } else { + result+="dos: seguintes ficheiros:"; + } + + return result; + } + +////////////////////////////////////////////////////////////////////////// }; #endif diff --git a/src/translator_sr.h b/src/translator_sr.h index f58ac13..09b6534 100644 --- a/src/translator_sr.h +++ b/src/translator_sr.h @@ -188,14 +188,14 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0 /*! This is put above each page as a link to all members of files. */ virtual QCString trFileMembers() { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) - { - return "Članovi datoteke"; - } - else - { - return "Članovi datoteke"; - } + //if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + //{ + // return "Članovi datoteke"; // TODO: translate me + //} + //else + //{ + return "Članovi datoteke"; + //} } /*! This is put above each page as a link to all related pages. */ diff --git a/src/translator_tw.h b/src/translator_tw.h index 581d7fe..e8c1123 100644 --- a/src/translator_tw.h +++ b/src/translator_tw.h @@ -749,8 +749,7 @@ class TranslatorChinesetraditional : public Translator /*! This is put at the bottom of a class documentation page and is * followed by a list of files that were used to generate the page. */ - virtual QCString trGeneratedFromFiles(ClassDef::CompoundType compType, - bool single) + virtual QCString trGeneratedFromFiles(ClassDef::CompoundType compType,bool) { // here s is one of " Class", " Struct" or " Union" // single is true implies a single file QCString result=(QCString)"此"; @@ -766,7 +765,7 @@ class TranslatorChinesetraditional : public Translator default: break; } result+=" 文件是由下列檔案中產生"; - if (single) result+=":"; else result+=":"; + result+=":"; return result; } diff --git a/src/translator_vi.h b/src/translator_vi.h index 54c68b8..dd0a8f1 100644 --- a/src/translator_vi.h +++ b/src/translator_vi.h @@ -749,8 +749,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0 /*! This is put at the bottom of a class documentation page and is * followed by a list of files that were used to generate the page. */ - virtual QCString trGeneratedFromFiles(ClassDef::CompoundType compType, - bool single) + virtual QCString trGeneratedFromFiles(ClassDef::CompoundType compType,bool) { // here s is one of " Class", " Struct" or " Union" // single is true implies a single file QCString result=(QCString)"Thông tin cho "; @@ -766,7 +765,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0 default: break; } result+=" được biên soạn từ các file sau đây"; - if (single) result+=":"; else result+=":"; + result+=":"; return result; } @@ -1501,10 +1500,9 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0 /*! This returns the word directory with or without starting capital * (\a first_capital) and in sigular or plural form (\a singular). */ - virtual QCString trDir(bool first_capital, bool singular) + virtual QCString trDir(bool first_capital, bool) { QCString result((first_capital ? "Thư mục" : "thư mục")); - if (singular) result+=""; else result+=""; return result; } diff --git a/src/util.cpp b/src/util.cpp index a524922..1de3349 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -2190,7 +2190,7 @@ QCString argListToString(ArgumentList *al,bool useCanonicalType,bool showDefVals return removeRedundantWhiteSpace(result); } -QCString tempArgListToString(ArgumentList *al) +QCString tempArgListToString(ArgumentList *al,SrcLangExt lang) { QCString result; if (al==0) return result; @@ -2209,6 +2209,10 @@ QCString tempArgListToString(ArgumentList *al) { result+="in "; } + if (lang==SrcLangExt_Java || lang==SrcLangExt_CSharp) + { + result+=a->type+" "; + } result+=a->name; } else // extract name from type @@ -229,7 +229,7 @@ QCString removeRedundantWhiteSpace(const QCString &s); QCString argListToString(ArgumentList *al,bool useCanonicalType=FALSE,bool showDefVals=TRUE); -QCString tempArgListToString(ArgumentList *al); +QCString tempArgListToString(ArgumentList *al,SrcLangExt lang); QCString generateMarker(int id); |