From 9e4e94fbabe856b8de4041ff2a27524f923343dc Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Wed, 3 Oct 2001 19:57:09 +0000 Subject: Release-1.2.11-20011003 --- INSTALL | 4 +- README | 4 +- VERSION | 2 +- addon/xmlparse/compoundhandler.cpp | 17 +- addon/xmlparse/compoundhandler.h | 3 + addon/xmlparse/memberhandler.cpp | 9 + addon/xmlparse/memberhandler.h | 3 + doc/install.doc | 7 +- doc/language.doc | 6 +- packages/rpm/doxygen.spec | 2 +- src/bufstr.h | 17 +- src/code.l | 2 +- src/doxygen.cpp | 52 +- src/doxygen.h | 5 +- src/htmlgen.cpp | 4 +- src/htmlgen.h | 4 +- src/index.cpp | 37 +- src/latexgen.cpp | 25 +- src/latexgen.h | 4 +- src/mangen.h | 4 +- src/namespacedef.cpp | 6 +- src/namespacedef.h | 35 +- src/outputgen.h | 4 +- src/outputlist.h | 8 +- src/rtfgen.cpp | 63 +- src/rtfgen.h | 4 +- src/sortdict.h | 6 + src/translator_sk.h | 2413 ++++++++++++++++++------------------ src/util.cpp | 14 +- src/xmlgen.cpp | 61 +- 30 files changed, 1454 insertions(+), 1371 deletions(-) diff --git a/INSTALL b/INSTALL index b943985..2da29f4 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ -DOXYGEN Version 1.2.11 +DOXYGEN Version 1.2.11-20011003 Please read the installation section of the manual for instructions. -------- -Dimitri van Heesch (30 September 2001) +Dimitri van Heesch (03 October 2001) diff --git a/README b/README index e370028..2624a77 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -DOXYGEN Version 1.2.11 +DOXYGEN Version 1.2.11_20011003 Please read INSTALL for compilation instructions. @@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives. Enjoy, -Dimitri van Heesch (dimitri@stack.nl) (30 September 2001) +Dimitri van Heesch (dimitri@stack.nl) (03 October 2001) diff --git a/VERSION b/VERSION index c114700..05aac50 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.11 +1.2.11-20011003 diff --git a/addon/xmlparse/compoundhandler.cpp b/addon/xmlparse/compoundhandler.cpp index dd81a2a..9763e9d 100644 --- a/addon/xmlparse/compoundhandler.cpp +++ b/addon/xmlparse/compoundhandler.cpp @@ -40,6 +40,9 @@ CompoundHandler::CompoundHandler(IBaseHandler *parent) addStartHandler("detaileddescription",this,&CompoundHandler::startDetailedDesc); addStartHandler("sectiondef",this,&CompoundHandler::startSection); + + addStartHandler("location",this,&CompoundHandler::startLocation); + addEndHandler("location"); } CompoundHandler::~CompoundHandler() @@ -71,10 +74,16 @@ void CompoundHandler::startDetailedDesc(const QXmlAttributes& attrib) void CompoundHandler::startCompound(const QXmlAttributes& attrib) { - m_parent->setDelegate(this); - m_id = attrib.value("id"); - m_kind = attrib.value("kind"); - printf("startCompound(id=`%s' type=`%s')\n",m_id.data(),m_kind.data()); + m_parent->setDelegate(this); + m_id = attrib.value("id"); + m_kind = attrib.value("kind"); + printf("startCompound(id=`%s' type=`%s')\n",m_id.data(),m_kind.data()); +} + +void CompoundHandler::startLocation(const QXmlAttributes& attrib) +{ + m_defFile = attrib.value("file"); + m_defLine = attrib.value("line").toInt(); } void CompoundHandler::endCompound() diff --git a/addon/xmlparse/compoundhandler.h b/addon/xmlparse/compoundhandler.h index 7d7c9b9..420cac6 100644 --- a/addon/xmlparse/compoundhandler.h +++ b/addon/xmlparse/compoundhandler.h @@ -36,6 +36,7 @@ class CompoundHandler : public ICompound, public BaseHandler virtual void endCompoundName(); virtual void startBriefDesc(const QXmlAttributes& attrib); virtual void startDetailedDesc(const QXmlAttributes& attrib); + virtual void startLocation(const QXmlAttributes& attrib); CompoundHandler(IBaseHandler *parent); virtual ~CompoundHandler(); @@ -74,6 +75,8 @@ class CompoundHandler : public ICompound, public BaseHandler QString m_id; QString m_kind; QString m_name; + QString m_defFile; + int m_defLine; }; #endif diff --git a/addon/xmlparse/memberhandler.cpp b/addon/xmlparse/memberhandler.cpp index 3198676..cf29e05 100644 --- a/addon/xmlparse/memberhandler.cpp +++ b/addon/xmlparse/memberhandler.cpp @@ -34,6 +34,9 @@ MemberHandler::MemberHandler(IBaseHandler *parent) addStartHandler("detaileddescription",this,&MemberHandler::startDetailedDesc); + addStartHandler("location",this,&MemberHandler::startLocation); + addEndHandler("location"); + m_params.setAutoDelete(TRUE); } @@ -69,6 +72,12 @@ void MemberHandler::startDetailedDesc(const QXmlAttributes& attrib) m_detailed = docHandler; } +void MemberHandler::startLocation(const QXmlAttributes& attrib) +{ + m_defFile = attrib.value("file"); + m_defLine = attrib.value("line").toInt(); +} + void MemberHandler::endMember() { m_parent->setDelegate(0); diff --git a/addon/xmlparse/memberhandler.h b/addon/xmlparse/memberhandler.h index 7a5ea06..0b017e5 100644 --- a/addon/xmlparse/memberhandler.h +++ b/addon/xmlparse/memberhandler.h @@ -36,6 +36,7 @@ class MemberHandler : public IMember, public BaseHandler virtual void endName(); virtual void startBriefDesc(const QXmlAttributes& attrib); virtual void startDetailedDesc(const QXmlAttributes& attrib); + virtual void startLocation(const QXmlAttributes& attrib); MemberHandler(IBaseHandler *parent); virtual ~MemberHandler(); @@ -60,6 +61,8 @@ class MemberHandler : public IMember, public BaseHandler DocHandler *m_brief; DocHandler *m_detailed; QList m_params; + QString m_defFile; + int m_defLine; }; #endif diff --git a/doc/install.doc b/doc/install.doc index 528c36e..d32e762 100644 --- a/doc/install.doc +++ b/doc/install.doc @@ -408,11 +408,8 @@ Here is what is required: commerical version of Qt. For doxywizard, a complete Qt library is - still a requirement however. You may be interested in the professional - license of Qt for - Windows \latexonly\par (see - {\tt http://www.trolltech.com/products/qt.html})\endlatexonly. If you - donate me a professional license I'll port doxywizard for you :-) + still a requirement however. You can download the non-commercial version + from Troll-Tech web-site. See doxygen download page for a link.
  • To generate LaTeX documentation or formulas in HTML you need the tools: latex, dvips and gswin32. diff --git a/doc/language.doc b/doc/language.doc index ceb842b..19e5133 100644 --- a/doc/language.doc +++ b/doc/language.doc @@ -25,7 +25,7 @@ Doxygen has built-in support for multiple languages. This means that the text fragments that doxygen generates can be produced in languages other than English (the default) at configuration time. -Currently (version 1.2.10-20010909), 24 languages +Currently (version 1.2.11), 24 languages are supported (sorted alphabetically): Brazilian Portuguese, Chinese, Croatian, Czech, Danish, Dutch, English, Finnish, French, German, @@ -168,7 +168,7 @@ when the translator was updated. Slovak Stanislav Kudláč qwerty1@NOSPAM.pobox.sk - 1.2.7 + up-to-date Slovene @@ -245,7 +245,7 @@ when the translator was updated. \hline Russian & Alexandr Chelpanov & {\tt cav@cryptopro.ru} & up-to-date \\ \hline - Slovak & Stanislav Kudl\'{a}\v{c} & {\tt qwerty1@pobox.sk} & 1.2.7 \\ + Slovak & Stanislav Kudl\'{a}\v{c} & {\tt qwerty1@pobox.sk} & up-to-date \\ \hline Slovene & Matjaz Ostroversnik & {\tt matjaz.ostroversnik@zrs-tk.si} & 1.1.5 \\ \hline diff --git a/packages/rpm/doxygen.spec b/packages/rpm/doxygen.spec index bf48a28..e802ad6 100644 --- a/packages/rpm/doxygen.spec +++ b/packages/rpm/doxygen.spec @@ -1,5 +1,5 @@ Name: doxygen -Version: 1.2.11 +Version: 1.2.11_20011003 Summary: documentation system for C, C++ and IDL Release: 4 Source: doxygen-%{version}.src.tar.gz diff --git a/src/bufstr.h b/src/bufstr.h index 550ec4d..b771c03 100644 --- a/src/bufstr.h +++ b/src/bufstr.h @@ -31,7 +31,7 @@ class BufStr : public QCString { if (offset>=size()) { - resize(size()+spareRoom); + QCString::resize(size()+spareRoom); } data()[offset++]=c; } @@ -39,7 +39,7 @@ class BufStr : public QCString { if (offset+len>=size()) { - resize(size()+len+spareRoom); + QCString::resize(size()+len+spareRoom); } memcpy(data()+offset,a,len); offset+=len; @@ -49,16 +49,21 @@ class BufStr : public QCString { if (offset+s>=size()) { - resize(size()+s+spareRoom); + QCString::resize(size()+s+spareRoom); } offset+=s; } void resize( uint newlen ) { - QCString::resize(newlen); - if (offset>newlen) + //QCString::resize(newlen); + //if (offset>newlen) + //{ + // offset=newlen; + //} + offset=newlen; + if (offset>=size()) { - offset=newlen; + QCString::resize(size()+spareRoom); } } private: diff --git a/src/code.l b/src/code.l index 39f5e6e..a6f0fb1 100644 --- a/src/code.l +++ b/src/code.l @@ -231,7 +231,7 @@ static void startCodeLine() static void endFontClass(); static void endCodeLine() { - endFontClass(); + if (g_currentFontClass) { g_code->endFontClass(); } g_code->endCodeLine(); } diff --git a/src/doxygen.cpp b/src/doxygen.cpp index b3582f0..6f9ba95 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -70,8 +70,9 @@ static QDict classEntries(1009); ClassSDict Doxygen::classSDict(1009); ClassSDict Doxygen::hiddenClasses(257); -NamespaceList Doxygen::namespaceList; // all namespaces -NamespaceDict Doxygen::namespaceDict(257); +//NamespaceList Doxygen::namespaceList; // all namespaces +//NamespaceDict Doxygen::namespaceDict(257); +NamespaceSDict Doxygen::namespaceSDict(17); MemberNameList Doxygen::memberNameList; // class member + related functions MemberNameDict Doxygen::memberNameDict(10007); @@ -123,7 +124,7 @@ void clearAll() delete outputList; outputList=0; Doxygen::classSDict.clear(); - Doxygen::namespaceList.clear(); + Doxygen::namespaceSDict.clear(); Doxygen::pageSDict->clear(); Doxygen::exampleSDict->clear(); Doxygen::memberNameList.clear(); @@ -132,7 +133,6 @@ void clearAll() Doxygen::groupList.clear(); Doxygen::formulaList.clear(); Doxygen::classSDict.clear(); - Doxygen::namespaceDict.clear(); Doxygen::memberNameDict.clear(); Doxygen::functionNameDict.clear(); Doxygen::sectionDict.clear(); @@ -161,8 +161,6 @@ void statistics() Doxygen::imageNameDict->statistics(); fprintf(stderr,"--- dotFileNameDict stats ----\n"); Doxygen::dotFileNameDict->statistics(); - fprintf(stderr,"--- namespaceDict stats ----\n"); - Doxygen::namespaceDict.statistics(); fprintf(stderr,"--- memberNameDict stats ----\n"); Doxygen::memberNameDict.statistics(); fprintf(stderr,"--- functionNameDict stats ----\n"); @@ -713,7 +711,7 @@ ArgumentList *getTemplateArgumentsFromName( int i,p=0; while ((i=name.find("::",p))!=-1) { - NamespaceDef *nd = Doxygen::namespaceDict[name.left(i)]; + NamespaceDef *nd = Doxygen::namespaceSDict[name.left(i)]; if (nd==0) { ClassDef *cd = getClass(name.left(i)); @@ -982,7 +980,7 @@ static void buildNamespaceList(Entry *root) //printf("Found namespace %s in %s at line %d\n",root->name.data(), // root->fileName.data(), root->startLine); NamespaceDef *nd; - if ((nd=Doxygen::namespaceDict[fullName])) // existing namespace + if ((nd=Doxygen::namespaceSDict[fullName])) // existing namespace { if (!root->doc.isEmpty() || !root->brief.isEmpty()) // block contains docs { @@ -1051,8 +1049,7 @@ static void buildNamespaceList(Entry *root) nd->setBodySegment(root->bodyLine,root->endBodyLine); nd->setBodyDef(fd); // add class to the list - Doxygen::namespaceList.inSort(nd); - Doxygen::namespaceDict.insert(fullName,nd); + Doxygen::namespaceSDict.inSort(fullName,nd); // also add namespace to the correct structural context Definition *d = findScopeFromQualifiedName(Doxygen::globalScope,fullName); @@ -1177,8 +1174,7 @@ static void findUsingDirectives(Entry *root) nd->setBriefDescription(root->brief); nd->insertUsedFile(root->fileName); // add class to the list - Doxygen::namespaceList.inSort(nd); - Doxygen::namespaceDict.insert(root->name,nd); + Doxygen::namespaceSDict.inSort(root->name,nd); nd->setRefItems(root->todoId,root->testId,root->bugId); } } @@ -3225,11 +3221,11 @@ static void computeMemberReferences() } fn=Doxygen::inputNameList.next(); } - NamespaceDef *nd=Doxygen::namespaceList.first(); - while (nd) + NamespaceSDict::Iterator nli(Doxygen::namespaceSDict); + NamespaceDef *nd=0; + for (nli.toFirst();(nd=nli.current());++nli) { nd->computeAnchors(); - nd=Doxygen::namespaceList.next(); } GroupDef *gd=Doxygen::groupList.first(); while (gd) @@ -3355,14 +3351,14 @@ static void addTodoTestBugReferences() } fn=Doxygen::inputNameList.next(); } - NamespaceDef *nd=Doxygen::namespaceList.first(); - while (nd) + NamespaceSDict::Iterator nli(Doxygen::namespaceSDict); + NamespaceDef *nd=0; + for (nli.toFirst();(nd=nli.current());++nli) { addRefItem(nd->todoId(),nd->testId(),nd->bugId(), theTranslator->trNamespace(TRUE,TRUE), nd->getOutputFileBase(),nd->name()); addFileMemberTodoTestBugReferences(nd); - nd=Doxygen::namespaceList.next(); } GroupDef *gd=Doxygen::groupList.first(); while (gd) @@ -5081,7 +5077,7 @@ static void addSourceReferences() } } // add source references for namespace definitions - NamespaceListIterator nli(Doxygen::namespaceList); + NamespaceSDict::Iterator nli(Doxygen::namespaceSDict); NamespaceDef *nd=0; for (nli.toFirst();(nd=nli.current());++nli) { @@ -5251,11 +5247,11 @@ static void addMembersToMemberGroup() fn=Doxygen::inputNameList.next(); } // for each namespace - NamespaceDef *nd=Doxygen::namespaceList.first(); - while (nd) + NamespaceSDict::Iterator nli(Doxygen::namespaceSDict); + NamespaceDef *nd; + for ( ; (nd=nli.current()) ; ++nli ) { nd->addMembersToMemberGroup(); - nd=Doxygen::namespaceList.next(); } // for each group GroupDef *gd=Doxygen::groupList.first(); @@ -5290,11 +5286,11 @@ static void distributeMemberGroupDocumentation() fn=Doxygen::inputNameList.next(); } // for each namespace - NamespaceDef *nd=Doxygen::namespaceList.first(); - while (nd) + NamespaceSDict::Iterator nli(Doxygen::namespaceSDict); + NamespaceDef *nd; + for ( ; (nd=nli.current()) ; ++nli ) { nd->distributeMemberGroupDocumentation(); - nd=Doxygen::namespaceList.next(); } // for each group GroupDef *gd=Doxygen::groupList.first(); @@ -5770,7 +5766,7 @@ static void generateNamespaceDocs() { writeNamespaceIndex(*outputList); - NamespaceListIterator nli(Doxygen::namespaceList); + NamespaceSDict::Iterator nli(Doxygen::namespaceSDict); NamespaceDef *nd; for (;(nd=nli.current());++nli) { @@ -6083,6 +6079,7 @@ static void copyAndFilterFile(const char *fileName,BufStr &dest) // try to open file int size=0; uint oldPos = dest.curPos(); + //printf(".......oldPos=%d\n",oldPos); QFileInfo fi(fileName); if (!fi.exists()) return; @@ -6136,7 +6133,8 @@ static void copyAndFilterFile(const char *fileName,BufStr &dest) //printf("filter char at %p size=%d newSize=%d\n",dest.data()+oldPos,size,newSize); if (newSize!=size) // we removed chars { - dest.resize(newSize); // resize the array + dest.resize(oldPos+newSize); // resize the array + //printf(".......resizing from %d to %d\n",oldPos+size,oldPos+newSize); } } diff --git a/src/doxygen.h b/src/doxygen.h index de5372d..aa85485 100644 --- a/src/doxygen.h +++ b/src/doxygen.h @@ -83,8 +83,9 @@ class Doxygen static StringDict namespaceAliasDict; static GroupList groupList; static GroupDict groupDict; - static NamespaceList namespaceList; - static NamespaceDict namespaceDict; + //static NamespaceList namespaceList; + //static NamespaceDict namespaceDict; + static NamespaceSDict namespaceSDict; static FormulaList formulaList; static FormulaDict formulaDict; static FormulaDict formulaNameDict; diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index 286b35d..8ef3df0 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -819,12 +819,12 @@ void HtmlGenerator::endIndexKey() t << ""; } -void HtmlGenerator::startIndexValue() +void HtmlGenerator::startIndexValue(bool) { t << ""; } -void HtmlGenerator::endIndexValue(const char *) +void HtmlGenerator::endIndexValue(const char *,bool) { t << "" << endl; } diff --git a/src/htmlgen.h b/src/htmlgen.h index c220473..40a37bc 100644 --- a/src/htmlgen.h +++ b/src/htmlgen.h @@ -68,8 +68,8 @@ class HtmlGenerator : public OutputGenerator void endIndexList(); void startIndexKey(); void endIndexKey(); - void startIndexValue(); - void endIndexValue(const char *); + void startIndexValue(bool); + void endIndexValue(const char *,bool); void startItemList() { t << "
      " << endl; } void endItemList() { t << "
    " << endl; } void startEnumList() { t << "
      " << endl; } diff --git a/src/index.cpp b/src/index.cpp index 79cc8cc..492c4da 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -944,8 +944,9 @@ void writeFileIndex(OutputList &ol) ol.popGeneratorState(); } ol.endIndexKey(); - ol.startIndexValue(); - if (!fd->briefDescription().isEmpty()) + bool hasBrief = !fd->briefDescription().isEmpty(); + ol.startIndexValue(hasBrief); + if (hasBrief) { //ol.docify(" ("); parseDoc(ol, @@ -954,7 +955,7 @@ void writeFileIndex(OutputList &ol) abbreviate(fd->briefDescription(),fd->name())); //ol.docify(")"); } - ol.endIndexValue(fd->getOutputFileBase()); + ol.endIndexValue(fd->getOutputFileBase(),hasBrief); //ol.popGeneratorState(); // -------------------------------------------------------- } @@ -986,7 +987,7 @@ void writeFileIndex(OutputList &ol) int countNamespaces() { int count=0; - NamespaceListIterator nli(Doxygen::namespaceList); + NamespaceSDict::Iterator nli(Doxygen::namespaceSDict); NamespaceDef *nd; for (;(nd=nli.current());++nli) { @@ -1034,8 +1035,10 @@ void writeNamespaceIndex(OutputList &ol) ol.endTextBlock(); bool first=TRUE; - NamespaceDef *nd=Doxygen::namespaceList.first(); - while (nd) + + NamespaceSDict::Iterator nli(Doxygen::namespaceSDict); + NamespaceDef *nd; + for (nli.toFirst();(nd=nli.current());++nli) { if (nd->isLinkableInProject()) { @@ -1048,8 +1051,9 @@ void writeNamespaceIndex(OutputList &ol) ol.startIndexKey(); ol.writeObjectLink(0,nd->getOutputFileBase(),0,nd->name()); ol.endIndexKey(); - ol.startIndexValue(); - if (!nd->briefDescription().isEmpty()) + bool hasBrief = !nd->briefDescription().isEmpty(); + ol.startIndexValue(hasBrief); + if (hasBrief) { //ol.docify(" ("); parseDoc(ol, @@ -1058,7 +1062,7 @@ void writeNamespaceIndex(OutputList &ol) abbreviate(nd->briefDescription(),nd->name())); //ol.docify(")"); } - ol.endIndexValue(nd->getOutputFileBase()); + ol.endIndexValue(nd->getOutputFileBase(),hasBrief); //ol.writeEndAnnoItem(nd->getOutputFileBase()); if (hasHtmlHelp) { @@ -1069,7 +1073,6 @@ void writeNamespaceIndex(OutputList &ol) ftvHelp->addContentsItem(FALSE,nd->getReference(),nd->getOutputFileBase(),0,nd->name()); } } - nd=Doxygen::namespaceList.next(); } if (!first) ol.endIndexList(); if (hasHtmlHelp) @@ -1124,8 +1127,9 @@ void writeAnnotatedClassList(OutputList &ol) ol.startIndexKey(); ol.writeObjectLink(0,cd->getOutputFileBase(),0,cd->displayName()); ol.endIndexKey(); - ol.startIndexValue(); - if (!cd->briefDescription().isEmpty()) + bool hasBrief = !cd->briefDescription().isEmpty(); + ol.startIndexValue(hasBrief); + if (hasBrief) { //ol.docify(" ("); parseDoc(ol, @@ -1134,7 +1138,7 @@ void writeAnnotatedClassList(OutputList &ol) abbreviate(cd->briefDescription(),cd->name())); //ol.docify(")"); } - ol.endIndexValue(cd->getOutputFileBase()); + ol.endIndexValue(cd->getOutputFileBase(),hasBrief); //ol.writeEndAnnoItem(cd->getOutputFileBase()); if (hasHtmlHelp) { @@ -1167,8 +1171,9 @@ void writePackageList(OutputList &ol) ol.startIndexKey(); ol.writeObjectLink(0,pd->getOutputFileBase(),0,pd->name()); ol.endIndexKey(); - ol.startIndexValue(); - if (!pd->briefDescription().isEmpty()) + bool hasBrief = !pd->briefDescription().isEmpty(); + ol.startIndexValue(hasBrief); + if (hasBrief) { //ol.docify(" ("); parseDoc(ol, @@ -1177,7 +1182,7 @@ void writePackageList(OutputList &ol) abbreviate(pd->briefDescription(),pd->name())); //ol.docify(")"); } - ol.endIndexValue(pd->getOutputFileBase()); + ol.endIndexValue(pd->getOutputFileBase(),hasBrief); //ol.writeEndAnnoItem(pd->getOutputFileBase()); if (hasHtmlHelp) diff --git a/src/latexgen.cpp b/src/latexgen.cpp index 6b4f901..da50b21 100644 --- a/src/latexgen.cpp +++ b/src/latexgen.cpp @@ -520,9 +520,10 @@ void LatexGenerator::startIndexSection(IndexSections is) break; case isNamespaceDocumentation: { - NamespaceDef *nd=Doxygen::namespaceList.first(); + NamespaceSDict::Iterator nli(Doxygen::namespaceSDict); + NamespaceDef *nd; bool found=FALSE; - while (nd && !found) + for (nli.toFirst();(nd=nli.current()) && !found;++nli) { if (nd->isLinkableInProject()) { @@ -530,7 +531,6 @@ void LatexGenerator::startIndexSection(IndexSections is) t << "{"; // Namespace Documentation}\n": found=TRUE; } - nd=Doxygen::namespaceList.next(); } } break; @@ -683,25 +683,25 @@ void LatexGenerator::endIndexSection(IndexSections is) break; case isNamespaceDocumentation: { - NamespaceDef *nd=Doxygen::namespaceList.first(); + NamespaceSDict::Iterator nli(Doxygen::namespaceSDict); + NamespaceDef *nd; bool found=FALSE; - while (nd && !found) + for (nli.toFirst();(nd=nli.current()) && !found;++nli) { if (nd->isLinkableInProject()) { t << "}\n\\input{" << nd->getOutputFileBase() << "}\n"; found=TRUE; } - nd=Doxygen::namespaceList.next(); } - while (nd) + while ((nd=nli.current())) { if (nd->isLinkableInProject()) { if (compactLatex) t << "\\input"; else t << "\\include"; t << "{" << nd->getOutputFileBase() << "}\n"; } - nd=Doxygen::namespaceList.next(); + ++nli; } } break; @@ -916,14 +916,15 @@ void LatexGenerator::endIndexKey() { } -void LatexGenerator::startIndexValue() +void LatexGenerator::startIndexValue(bool hasBrief) { - t << " ("; + t << " "; + if (hasBrief) t << "("; } -void LatexGenerator::endIndexValue(const char *name) +void LatexGenerator::endIndexValue(const char *name,bool hasBrief) { - t << ")"; + if (hasBrief) t << ")"; t << "}{\\pageref{" << name << "}}{}" << endl; } diff --git a/src/latexgen.h b/src/latexgen.h index 802542a..dccabdf 100644 --- a/src/latexgen.h +++ b/src/latexgen.h @@ -65,8 +65,8 @@ class LatexGenerator : public OutputGenerator void endIndexList() { t << "\\end{CompactList}" << endl; } void startIndexKey(); void endIndexKey(); - void startIndexValue(); - void endIndexValue(const char *); + void startIndexValue(bool); + void endIndexValue(const char *,bool); void startItemList() { t << "\\begin{CompactItemize}" << endl; } void endItemList() { t << "\\end{CompactItemize}" << endl; } void startEnumList() { t << "\\begin{enumerate}" << endl; } diff --git a/src/mangen.h b/src/mangen.h index 6599c1e..a5f15fe 100644 --- a/src/mangen.h +++ b/src/mangen.h @@ -63,8 +63,8 @@ class ManGenerator : public OutputGenerator void endIndexList() { newParagraph(); } void startIndexKey() {} void endIndexKey() {} - void startIndexValue() {} - void endIndexValue(const char *) {} + void startIndexValue(bool) {} + void endIndexValue(const char *,bool) {} void startItemList() {} void endItemList() { newParagraph(); } void startEnumList() {} diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp index 2722b23..72223f5 100644 --- a/src/namespacedef.cpp +++ b/src/namespacedef.cpp @@ -32,9 +32,9 @@ NamespaceDef::NamespaceDef(const char *df,int dl, Definition(df,dl,name) { fileName=(QCString)"namespace"+name; - classSDict = new ClassSDict(257); - namespaceSDict = new NamespaceSDict(257); - m_innerCompounds = new SDict(257); + classSDict = new ClassSDict(17); + namespaceSDict = new NamespaceSDict(17); + m_innerCompounds = new SDict(17); usingDirList = 0; usingDeclList = 0; setReference(lref); diff --git a/src/namespacedef.h b/src/namespacedef.h index 514d250..ab0393b 100644 --- a/src/namespacedef.h +++ b/src/namespacedef.h @@ -77,22 +77,8 @@ class NamespaceDef : public Definition //protected: // void addMemberListToGroup(MemberList *,bool (MemberDef::*)() const); - private: - //QCString reference; - QCString fileName; - QStrList files; - - /*! Classes inside this namespace */ - ClassSDict *classSDict; - /*! Namespaces inside this namespace */ - NamespaceSDict *namespaceSDict; - - NamespaceList *usingDirList; - ClassList *usingDeclList; - SDict *m_innerCompounds; - - MemberList allMemberList; - + public: + // members in the declaration part of the documentation MemberList decDefineMembers; MemberList decProtoMembers; @@ -110,6 +96,23 @@ class NamespaceDef : public Definition MemberList docFuncMembers; MemberList docVarMembers; + /*! Classes inside this namespace */ + ClassSDict *classSDict; + /*! Namespaces inside this namespace */ + NamespaceSDict *namespaceSDict; + + private: + //QCString reference; + QCString fileName; + QStrList files; + + + NamespaceList *usingDirList; + ClassList *usingDeclList; + SDict *m_innerCompounds; + + MemberList allMemberList; + /* user defined member groups */ MemberGroupList *memberGroupList; MemberGroupDict *memberGroupDict; diff --git a/src/outputgen.h b/src/outputgen.h index dbc2351..ed73543 100644 --- a/src/outputgen.h +++ b/src/outputgen.h @@ -316,8 +316,8 @@ class OutputGenerator : public BaseOutputDocInterface virtual void endIndexList() = 0; virtual void startIndexKey() = 0; virtual void endIndexKey() = 0; - virtual void startIndexValue() = 0; - virtual void endIndexValue(const char *) = 0; + virtual void startIndexValue(bool) = 0; + virtual void endIndexValue(const char *,bool) = 0; virtual void startAlphabeticalIndexList() = 0; virtual void endAlphabeticalIndexList() = 0; virtual void writeIndexHeading(const char *s) = 0; diff --git a/src/outputlist.h b/src/outputlist.h index 625c7a5..619792c 100644 --- a/src/outputlist.h +++ b/src/outputlist.h @@ -109,10 +109,10 @@ class OutputList : public OutputDocInterface { forall(&OutputGenerator::startIndexKey); } void endIndexKey() { forall(&OutputGenerator::endIndexKey); } - void startIndexValue() - { forall(&OutputGenerator::startIndexValue); } - void endIndexValue(const char *name) - { forall(&OutputGenerator::endIndexValue,name); } + void startIndexValue(bool b) + { forall(&OutputGenerator::startIndexValue,b); } + void endIndexValue(const char *name,bool b) + { forall(&OutputGenerator::endIndexValue,name,b); } void startItemList() { forall(&OutputGenerator::startItemList); } void endItemList() diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp index 5313f9b..338d889 100644 --- a/src/rtfgen.cpp +++ b/src/rtfgen.cpp @@ -985,16 +985,16 @@ void RTFGenerator::startIndexSection(IndexSections is) case isNamespaceDocumentation: { // Namespace Documentation - NamespaceDef *nd=Doxygen::namespaceList.first(); + NamespaceSDict::Iterator nli(Doxygen::namespaceSDict); + NamespaceDef *nd; bool found=FALSE; - while (nd && !found) + for (nli.toFirst();(nd=nli.current()) && !found;++nli) { if (nd->isLinkableInProject()) { beginRTFChapter(); found=TRUE; } - nd=Doxygen::namespaceList.next(); } } break; @@ -1202,9 +1202,10 @@ void RTFGenerator::endIndexSection(IndexSections is) break; case isNamespaceDocumentation: { - NamespaceDef *nd=Doxygen::namespaceList.first(); + NamespaceSDict::Iterator nli(Doxygen::namespaceSDict); + NamespaceDef *nd; bool found=FALSE; - while (nd && !found) + for (nli.toFirst();(nd=nli.current()) && !found;++nli) { if (nd->isLinkableInProject()) { @@ -1214,9 +1215,8 @@ void RTFGenerator::endIndexSection(IndexSections is) t << ".rtf\" \\\\*MERGEFORMAT}{\\fldrslt includedstuff}}\n"; found=TRUE; } - nd=Doxygen::namespaceList.next(); } - while (nd) + while ((nd=nli.current())) { if (nd->isLinkableInProject()) { @@ -1226,7 +1226,7 @@ void RTFGenerator::endIndexSection(IndexSections is) t << nd->getOutputFileBase(); t << ".rtf\" \\\\*MERGEFORMAT}{\\fldrslt includedstuff}}\n"; } - nd=Doxygen::namespaceList.next(); + ++nli; } } break; @@ -1578,15 +1578,16 @@ void RTFGenerator::endIndexKey() { } -void RTFGenerator::startIndexValue() +void RTFGenerator::startIndexValue(bool hasBrief) { - t << " ("; + t << " "; + if (hasBrief) t << "("; } -void RTFGenerator::endIndexValue(const char *name) +void RTFGenerator::endIndexValue(const char *name,bool hasBrief) { DBG_RTF(t << "{\\comment (endIndexKey)}" << endl) - t << ")"; + if (hasBrief) t << ")"; t << "} "; if (name) { @@ -1967,42 +1968,41 @@ void RTFGenerator::startDescList(SectionTypes) void RTFGenerator::endDescTitle() { DBG_RTF(t << "{\\comment (endDescTitle) }" << endl) - //endBold(); + endBold(); + t << "}"; newParagraph(); - //t << Rtf_Style_Reset << styleStack.top(); incrementIndentLevel(); t << Rtf_Style_Reset << Rtf_DList_DepthStyle(); } -void RTFGenerator::startParamList(ParamListTypes) -{ - DBG_RTF(t << "{\\comment (startParamList)}" << endl) - t << "{"; - incrementIndentLevel(); - newParagraph(); +void RTFGenerator::writeDescItem() +{ + DBG_RTF(t << "{\\comment (writeDescItem) }" << endl) + // incrementIndentLevel(); + //t << Rtf_Style_Reset << Rtf_CList_DepthStyle(); } -void RTFGenerator::endParamList() +void RTFGenerator::endDescList() { - DBG_RTF(t << "{\\comment (endParamList)}" << endl) + DBG_RTF(t << "{\\comment (endDescList)}" << endl) newParagraph(); - t << "}"; + //t << "}"; decrementIndentLevel(); m_omitParagraph = TRUE; //t << Rtf_Style_Reset << styleStack.top() << endl; + t << Rtf_Style_Reset << endl; } - -void RTFGenerator::writeDescItem() -{ - DBG_RTF(t << "{\\comment (writeDescItem) }" << endl) - // incrementIndentLevel(); - //t << Rtf_Style_Reset << Rtf_CList_DepthStyle(); +void RTFGenerator::startParamList(ParamListTypes) +{ + DBG_RTF(t << "{\\comment (startParamList)}" << endl) + t << "{"; + newParagraph(); } -void RTFGenerator::endDescList() +void RTFGenerator::endParamList() { - DBG_RTF(t << "{\\comment (endDescList)}" << endl) + DBG_RTF(t << "{\\comment (endParamList)}" << endl) newParagraph(); t << "}"; decrementIndentLevel(); @@ -2010,6 +2010,7 @@ void RTFGenerator::endDescList() //t << Rtf_Style_Reset << styleStack.top() << endl; } + void RTFGenerator::startSection(const char *,const char *title,bool sub) { DBG_RTF(t << "{\\comment (startSection)}" << endl) diff --git a/src/rtfgen.h b/src/rtfgen.h index b2971ad..a1a9f56 100644 --- a/src/rtfgen.h +++ b/src/rtfgen.h @@ -66,8 +66,8 @@ class RTFGenerator : public OutputGenerator void endIndexList(); void startIndexKey(); void endIndexKey(); - void startIndexValue(); - void endIndexValue(const char *); + void startIndexValue(bool); + void endIndexValue(const char *,bool); void startItemList(); void endItemList(); void startEnumList(); diff --git a/src/sortdict.h b/src/sortdict.h index 77991ea..e78d038 100644 --- a/src/sortdict.h +++ b/src/sortdict.h @@ -169,6 +169,12 @@ class SDict return m_dict->find(key); } + /*! Equavalent to find(). */ + T *operator[](const char *key) + { + return m_dict->find(key); + } + /*! Returns the item at position \a i in the sorted dictionary */ T *at(uint i) { diff --git a/src/translator_sk.h b/src/translator_sk.h index 5cb8621..05ad9d9 100644 --- a/src/translator_sk.h +++ b/src/translator_sk.h @@ -1,6 +1,6 @@ /****************************************************************************** * - * + * * * Copyright (C) 1997-2001 by Dimitri van Heesch. * @@ -13,1319 +13,1324 @@ * Documents produced by Doxygen are derivative works derived from the * input used in their production; they are not affected by this license. * + * ---------------------------------------------------------------------------- + * + * Slovak translation by Stanislav Kudlac (skudlac@pobox.sk) + * + * ---------------------------------------------------------------------------- */ #ifndef TRANSLATOR_SK_H #define TRANSLATOR_SK_H -class TranslatorSlovak : public TranslatorAdapter_1_2_7 +class TranslatorSlovak : public Translator { private: - /*! The Decode() inline assumes the source written in the - Windows encoding (maintainer only dependent). - */ - inline QCString Decode(const QCString & sInput) - { + /*! The Decode() inline assumes the source written in the + Windows encoding (maintainer only dependent). + */ + inline QCString Decode(const QCString & sInput) + { #ifdef _WIN32 - return sInput; + return sInput; #else - return Win1250ToISO88592(sInput); + return Win1250ToISO88592(sInput); #endif - } + } public: - // --- Language control methods ------------------- + // --- Language control methods ------------------- - virtual QCString idLanguage() - { return "slovak"; } + virtual QCString idLanguage() + { return "slovak"; } - virtual QCString latexLanguageSupportCommand() - { return "\\usepackage{slovak}\n"; } + virtual QCString latexLanguageSupportCommand() + { return "\\usepackage{slovak}\n"; } - /*! return the language charset. This will be used for the HTML output */ - virtual QCString idLanguageCharset() - { + /*! return the language charset. This will be used for the HTML output */ + virtual QCString idLanguageCharset() + { #ifdef _WIN32 - return "windows-1250"; + return "windows-1250"; #else - return "iso-8859-2"; + return "iso-8859-2"; #endif - } - - // --- Language translation methods ------------------- - - /*! used in the compound documentation before a list of related functions. */ - virtual QCString trRelatedFunctions() - { return Decode("Súvisiace funkcie"); } - - /*! subscript for the related functions. */ - virtual QCString trRelatedSubscript() - { return Decode("(Uvedené funkcie niesú členskými funkciami.)"); } - - /*! header that is put before the detailed description of files, classes and namespaces. */ - virtual QCString trDetailedDescription() - { return Decode("Detailný popis"); } - - /*! header that is put before the list of typedefs. */ - virtual QCString trMemberTypedefDocumentation() - { return Decode("Dokumentácia k členským typom"); } - - /*! header that is put before the list of enumerations. */ - virtual QCString trMemberEnumerationDocumentation() - { return Decode("Dokumentácia k členským enumeráciám"); } - - /*! header that is put before the list of member functions. */ - virtual QCString trMemberFunctionDocumentation() - { return Decode("Dokumentácia k metódam"); } - - /*! header that is put before the list of member attributes. */ - virtual QCString trMemberDataDocumentation() - { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) - { - return Decode("Dokumentácia k položkám"); - } - else - { - return Decode("Dokumentácia k dátovým členom"); - } - } - - /*! this is the text of a link put after brief descriptions. */ - virtual QCString trMore() - { return Decode("..."); } - - /*! put in the class documentation */ - virtual QCString trListOfAllMembers() - { return Decode("Zoznam všetkých členov."); } - - /*! used as the title of the "list of all members" page of a class */ - virtual QCString trMemberList() - { return Decode("Zoznam členov triedy"); } - - /*! this is the first part of a sentence that is followed by a class name */ - virtual QCString trThisIsTheListOfAllMembers() - { return Decode("Tu nájdete úplný zoznam členov triedy "); } - - /*! this is the remainder of the sentence after the class name */ - virtual QCString trIncludingInheritedMembers() - { return Decode(", vrátane všetkých zdedených členov."); } - - /*! this is put at the author sections at the bottom of man pages. - * parameter s is name of the project name. - */ - virtual QCString trGeneratedAutomatically(const char *s) - { QCString result="Generované automaticky programom Doxygen " - "zo zdrojových textov"; - if (s) result+=(QCString)" projektu "+s; - result+="."; - return Decode(result); - } - - /*! put after an enum name in the list of all members */ - virtual QCString trEnumName() - { return Decode("meno enumerácie"); } - - /*! put after an enum value in the list of all members */ - virtual QCString trEnumValue() - { return Decode("hodnota enumerácie"); } - - /*! put after an undocumented member in the list of all members */ - virtual QCString trDefinedIn() - { return Decode("definovaný v"); } - - // quick reference sections - - /*! This is put above each page as a link to the list of all groups of - * compounds or files (see the \\group command). - */ - virtual QCString trModules() - { return Decode("Moduly"); } - - /*! This is put above each page as a link to the class hierarchy */ - virtual QCString trClassHierarchy() - { return Decode("Hierarchia tried"); } - - /*! This is put above each page as a link to the list of annotated classes */ - virtual QCString trCompoundList() - { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) - { - return Decode("Dátové štruktúry"); - } - else - { - return Decode("Zoznam tried"); - } - } - - /*! This is put above each page as a link to the list of documented files */ - virtual QCString trFileList() - { return Decode("Zoznam súborov"); } - - /*! This is put above each page as a link to the list of all verbatim headers */ - virtual QCString trHeaderFiles() - { return Decode("Zoznam hlavičkových súborov"); } - - /*! This is put above each page as a link to all members of compounds. */ - virtual QCString trCompoundMembers() - { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) - { - return Decode("Dátové položky"); - } - else - { - return Decode("Zoznam členov tried"); - } - } - - /*! 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 Decode("Globálne symboly"); - } - else - { - return Decode("Symboly v súboroch"); - } - } - - /*! This is put above each page as a link to all related pages. */ - virtual QCString trRelatedPages() - { return Decode("Ostatné stránky"); } - - /*! This is put above each page as a link to all examples. */ - virtual QCString trExamples() - { return Decode("Príklady"); } - - /*! This is put above each page as a link to the search engine. */ - virtual QCString trSearch() - { return Decode("Hľadať"); } - - /*! This is an introduction to the class hierarchy. */ - virtual QCString trClassHierarchyDescription() - { return Decode("Tu nájdete zoznam, vyjadrujúci vzťah dedičnosti tried. " - "Je zoradený približne (ale nie úplne) podľa abecedy:"); - } - - /*! This is an introduction to the list with all files. */ - virtual QCString trFileListDescription(bool extractAll) - { - QCString result="Tu nájdete zoznam všetkých "; - if (!extractAll) result+="dokumentovaných "; - result+="súborov so stručnými popismi:"; - return Decode(result); - } - - /*! This is an introduction to the annotated compound list. */ - virtual QCString trCompoundListDescription() - { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) - { - return Decode("Nasledujúci zoznam obsahuje identifikáciu dátových " - "štruktúr a ich stručné popisy:"); - } - else - { - return Decode("Nasledujúci zoznam obsahuje predovšetkým identifikáciu " - "tried, ale nachádzajú sa tu i ďalšie netriviálne prvky, " - "ako sú štruktúry (struct), uniony (union) a rozhrania " - "(interface). V zozname sú uvedené ich stručné " - "popisy:"); - } - } - - /*! This is an introduction to the page with all class members. */ - virtual QCString trCompoundMembersDescription(bool extractAll) - { - QCString result= "Tu nájdete zoznam všetkých "; - if (!extractAll) - { - result += "dokumentovaných "; - } - - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) - { - result += "položiek štruktúr (struct) a unionov (union) "; - } - else - { - result += "členov tried "; - } - - result += "s odkazmi na "; - - if (extractAll) - { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) - { - result += "dokumentáciu štruktúr/unionov, ku ktorým prislúchajú:"; - } - else - { - result += "dokumentáciu tried, ku ktorým prislúchajú:"; - } - } - else - { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) - { - result+="štruktúry/uniony, ku ktorým prislúchajú:"; - } - else - { - result+="triedy, ku ktorým prislúchajú:"; - } - } - - return Decode(result); - } - - /*! This is an introduction to the page with all file members. */ - virtual QCString trFileMembersDescription(bool extractAll) - { - QCString result="Tu nájdete zoznam všetkých "; - if (!extractAll) result+="dokumentovaných "; - - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) - { - result+="funkcií, premenných, makier, enumerácií a definícií typov (typedef) " - "s odkazmi na "; - } - else - { - result+="symbolov, ktoré sú definované na úrovni svojich súborov. " - "Pre každý symbol je uvedený odkaz na "; - } - - if (extractAll) - result+="súbory, ku ktorým prislúchajú:"; - else - result+="dokumentáciu:"; - - return Decode(result); - } - - /*! This is an introduction to the page with the list of all header files. */ - virtual QCString trHeaderFilesDescription() - { return Decode("Tu nájdete hlavičkové súbory, ktoré tvoria " - "aplikačné programové rozhranie (API):"); } - - /*! This is an introduction to the page with the list of all examples */ - virtual QCString trExamplesDescription() - { return Decode("Tu nájdete zoznam všetkých príkladov:"); } - - /*! This is an introduction to the page with the list of related pages */ - virtual QCString trRelatedPagesDescription() - { return Decode("Nasledujúci zoznam odkazuje na ďalšie stránky projektu, " - "ktoré majú charakter usporiadaných zoznamov informácií, " - "pozbieraných z rôznych miest v zdrojových súboroch:"); } - - /*! This is an introduction to the page with the list of class/file groups */ - virtual QCString trModulesDescription() - { return Decode("Tu nájdete zoznam všetkých modulov:"); } - - /*! This sentences is used in the annotated class/file lists if no brief - * description is given. - */ - virtual QCString trNoDescriptionAvailable() - { return Decode("Popis nieje k dispozícii"); } - - // index titles (the project name is prepended for these) - - - /*! This is used in HTML as the title of index.html. */ - virtual QCString trDocumentation() - { return Decode("Dokumentácia"); } - - /*! This is used in LaTeX as the title of the chapter with the - * index of all groups. - */ - virtual QCString trModuleIndex() - { return Decode("Register modulov"); } - - /*! This is used in LaTeX as the title of the chapter with the - * class hierarchy. - */ - virtual QCString trHierarchicalIndex() - { return Decode("Register hierarchie tried"); } - - /*! This is used in LaTeX as the title of the chapter with the - * annotated compound index. - */ - virtual QCString trCompoundIndex() - { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) - { - return Decode("Register dátových štruktúr"); - } - else - { - return Decode("Register tried"); - } - } - - /*! This is used in LaTeX as the title of the chapter with the - * list of all files. - */ - virtual QCString trFileIndex() - { return Decode("Register súborov"); } - - /*! This is used in LaTeX as the title of the chapter containing - * the documentation of all groups. - */ - virtual QCString trModuleDocumentation() - { return Decode("Dokumentácia modulov"); } - - /*! This is used in LaTeX as the title of the chapter containing - * the documentation of all classes, structs and unions. - */ - virtual QCString trClassDocumentation() - { return Decode("Dokumentácia tried"); } - - /*! This is used in LaTeX as the title of the chapter containing - * the documentation of all files. - */ - virtual QCString trFileDocumentation() - { return Decode("Dokumentácia súborov"); } - - /*! This is used in LaTeX as the title of the chapter containing - * the documentation of all examples. - */ - virtual QCString trExampleDocumentation() - { return Decode("Dokumentácia príkladov"); } - - /*! This is used in LaTeX as the title of the chapter containing - * the documentation of all related pages. - */ - virtual QCString trPageDocumentation() - { return Decode("Dokumentácia súvisiacich stránok"); } - - /*! This is used in LaTeX as the title of the document */ - virtual QCString trReferenceManual() - { return Decode("Referenčná príručka"); } - - /*! This is used in the documentation of a file as a header before the - * list of defines - */ - virtual QCString trDefines() - { return Decode("Definícia makier"); } - - /*! This is used in the documentation of a file as a header before the - * list of function prototypes - */ - virtual QCString trFuncProtos() - { return Decode("Prototypy"); } - - /*! This is used in the documentation of a file as a header before the - * list of typedefs - */ - virtual QCString trTypedefs() - { return Decode("Definícia typov"); } - - /*! This is used in the documentation of a file as a header before the - * list of enumerations - */ - virtual QCString trEnumerations() - { return Decode("Enumerácie"); } - - /*! This is used in the documentation of a file as a header before the - * list of (global) functions - */ - virtual QCString trFunctions() - { return Decode("Funkcie"); } - - /*! This is used in the documentation of a file as a header before the - * list of (global) variables - */ - virtual QCString trVariables() - { return Decode("Premenné"); } - - /*! This is used in the documentation of a file as a header before the - * list of (global) variables - */ - virtual QCString trEnumerationValues() - { return Decode("Hodnoty enumerácií"); } - - /*! This is used in man pages as the author section. */ - virtual QCString trAuthor() - { return Decode("Autor"); } - - /*! This is used in the documentation of a file before the list of - * documentation blocks for defines - */ - virtual QCString trDefineDocumentation() - { return Decode("Dokumentácia k definíciám makier"); } - - /*! This is used in the documentation of a file/namespace before the list - * of documentation blocks for function prototypes - */ - virtual QCString trFunctionPrototypeDocumentation() - { return Decode("Dokumentácia prototypov"); } - - /*! This is used in the documentation of a file/namespace before the list - * of documentation blocks for typedefs - */ - virtual QCString trTypedefDocumentation() - { return Decode("Dokumentácia definícií typov"); } - - /*! This is used in the documentation of a file/namespace before the list - * of documentation blocks for enumeration types - */ - virtual QCString trEnumerationTypeDocumentation() - { return Decode("Dokumentácia enumeračných typov"); } - - /*! This is used in the documentation of a file/namespace before the list - * of documentation blocks for enumeration values - */ - virtual QCString trEnumerationValueDocumentation() - { return Decode("Dokumentácia enumeračných hodnôt"); } - - /*! This is used in the documentation of a file/namespace before the list - * of documentation blocks for functions - */ - virtual QCString trFunctionDocumentation() - { return Decode("Dokumentácia funkcií"); } - - /*! This is used in the documentation of a file/namespace before the list - * of documentation blocks for variables - */ - virtual QCString trVariableDocumentation() - { return Decode("Dokumentácia premenných"); } - - /*! This is used in the documentation of a file/namespace/group before - * the list of links to documented compounds - */ - virtual QCString trCompounds() - { - if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) - { - return Decode("Dátové štruktúry"); - } - else - { - return Decode("Triedy"); - } - } - - /*! This is used in the documentation of a group before the list of - * links to documented files - */ - virtual QCString trFiles() - { return Decode("Súbory"); } - - /*! This is used in the standard footer of each page and indicates when - * the page was generated - */ - virtual QCString trGeneratedAt(const char *date,const char *projName) - { - QCString result=(QCString)"Generované "+date; - if (projName) result+=(QCString)" pre projekt "+projName; - result+=(QCString)" programom"; - return Decode(result); - } - /*! This is part of the sentence used in the standard footer of each page. - */ - virtual QCString trWrittenBy() - { - return Decode(" -- autor "); - } - - /*! this text is put before a class diagram */ - virtual QCString trClassDiagram(const char *clName) - { - return Decode((QCString)"Diagram dedičnosti pre triedu "+clName); - } - - /*! this text is generated when the \\internal command is used. */ - virtual QCString trForInternalUseOnly() - { return Decode("Iba pre interné použitie."); } - - /*! this text is generated when the \\reimp command is used. */ - virtual QCString trReimplementedForInternalReasons() - { return Decode("Reimplementované z interných dôvodov; " - "aplikačné rozhranie zachované."); } - - /*! this text is generated when the \\warning command is used. */ - virtual QCString trWarning() - { return Decode("Pozor"); } - - /*! this text is generated when the \\bug command is used. */ - virtual QCString trBugsAndLimitations() - { return Decode("Chyby a obmedzenia"); } - - /*! this text is generated when the \\version command is used. */ - virtual QCString trVersion() - { return Decode("Verzia"); } - - /*! this text is generated when the \\date command is used. */ - virtual QCString trDate() - { return Decode("Dátum"); } - - /*! this text is generated when the \\author command is used. */ - virtual QCString trAuthors() - { return Decode("Autor/autori"); } - - /*! this text is generated when the \\return command is used. */ - virtual QCString trReturns() - { return Decode("Návratová hodnota"); } - - /*! this text is generated when the \\sa command is used. */ - virtual QCString trSeeAlso() - { return Decode("Viz tiež"); } - - /*! this text is generated when the \\param command is used. */ - virtual QCString trParameters() - { return Decode("Parametre"); } - - /*! this text is generated when the \\exception command is used. */ - virtual QCString trExceptions() - { return Decode("Výnimky"); } - - /*! this text is used in the title page of a LaTeX document. */ - virtual QCString trGeneratedBy() - { return Decode("Generované programom"); } - - // new since 0.49-990307 - - /*! used as the title of page containing all the index of all namespaces. */ - virtual QCString trNamespaceList() - { return Decode("Zoznam priestorov mien"); } - - /*! used as an introduction to the namespace list */ - virtual QCString trNamespaceListDescription(bool extractAll) - { - QCString result="Tu nájdete zoznam všetkých "; - if (!extractAll) result+="dokumentovaných "; - result+="priestorov mien so stručným popisom:"; - return Decode(result); - } - - /*! used in the class documentation as a header before the list of all - * friends of a class - */ - virtual QCString trFriends() - { return Decode("Priatelia (friends)"); } + } + + // --- Language translation methods ------------------- + + /*! used in the compound documentation before a list of related functions. */ + virtual QCString trRelatedFunctions() + { return Decode("Súvisiace funkcie"); } + + /*! subscript for the related functions. */ + virtual QCString trRelatedSubscript() + { return Decode("(Uvedené funkcie niesú členskými funkciami.)"); } + + /*! header that is put before the detailed description of files, classes and namespaces. */ + virtual QCString trDetailedDescription() + { return Decode("Detailný popis"); } + + /*! header that is put before the list of typedefs. */ + virtual QCString trMemberTypedefDocumentation() + { return Decode("Dokumentácia k členským typom"); } + + /*! header that is put before the list of enumerations. */ + virtual QCString trMemberEnumerationDocumentation() + { return Decode("Dokumentácia k členským enumeráciám"); } + + /*! header that is put before the list of member functions. */ + virtual QCString trMemberFunctionDocumentation() + { return Decode("Dokumentácia k metódam"); } + + /*! header that is put before the list of member attributes. */ + virtual QCString trMemberDataDocumentation() + { + if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + { + return Decode("Dokumentácia k položkám"); + } + else + { + return Decode("Dokumentácia k dátovým členom"); + } + } + + /*! this is the text of a link put after brief descriptions. */ + virtual QCString trMore() + { return Decode("..."); } + + /*! put in the class documentation */ + virtual QCString trListOfAllMembers() + { return Decode("Zoznam všetkých členov."); } + + /*! used as the title of the "list of all members" page of a class */ + virtual QCString trMemberList() + { return Decode("Zoznam členov triedy"); } + + /*! this is the first part of a sentence that is followed by a class name */ + virtual QCString trThisIsTheListOfAllMembers() + { return Decode("Tu nájdete úplný zoznam členov triedy "); } + + /*! this is the remainder of the sentence after the class name */ + virtual QCString trIncludingInheritedMembers() + { return Decode(", vrátane všetkých zdedených členov."); } + + /*! this is put at the author sections at the bottom of man pages. + * parameter s is name of the project name. + */ + virtual QCString trGeneratedAutomatically(const char *s) + { QCString result="Generované automaticky programom Doxygen " + "zo zdrojových textov"; + if (s) result+=(QCString)" projektu "+s; + result+="."; + return Decode(result); + } + + /*! put after an enum name in the list of all members */ + virtual QCString trEnumName() + { return Decode("meno enumerácie"); } + + /*! put after an enum value in the list of all members */ + virtual QCString trEnumValue() + { return Decode("hodnota enumerácie"); } + + /*! put after an undocumented member in the list of all members */ + virtual QCString trDefinedIn() + { return Decode("definovaný v"); } + + // quick reference sections + + /*! This is put above each page as a link to the list of all groups of + * compounds or files (see the \\group command). + */ + virtual QCString trModules() + { return Decode("Moduly"); } + + /*! This is put above each page as a link to the class hierarchy */ + virtual QCString trClassHierarchy() + { return Decode("Hierarchia tried"); } + + /*! This is put above each page as a link to the list of annotated classes */ + virtual QCString trCompoundList() + { + if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + { + return Decode("Dátové štruktúry"); + } + else + { + return Decode("Zoznam tried"); + } + } + + /*! This is put above each page as a link to the list of documented files */ + virtual QCString trFileList() + { return Decode("Zoznam súborov"); } + + /*! This is put above each page as a link to the list of all verbatim headers */ + virtual QCString trHeaderFiles() + { return Decode("Zoznam hlavičkových súborov"); } + + /*! This is put above each page as a link to all members of compounds. */ + virtual QCString trCompoundMembers() + { + if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + { + return Decode("Dátové položky"); + } + else + { + return Decode("Zoznam členov tried"); + } + } + + /*! 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 Decode("Globálne symboly"); + } + else + { + return Decode("Symboly v súboroch"); + } + } + + /*! This is put above each page as a link to all related pages. */ + virtual QCString trRelatedPages() + { return Decode("Ostatné stránky"); } + + /*! This is put above each page as a link to all examples. */ + virtual QCString trExamples() + { return Decode("Príklady"); } + + /*! This is put above each page as a link to the search engine. */ + virtual QCString trSearch() + { return Decode("Hľadať"); } + + /*! This is an introduction to the class hierarchy. */ + virtual QCString trClassHierarchyDescription() + { return Decode("Tu nájdete zoznam, vyjadrujúci vzťah dedičnosti tried. " + "Je zoradený približne (ale nie úplne) podľa abecedy:"); + } + + /*! This is an introduction to the list with all files. */ + virtual QCString trFileListDescription(bool extractAll) + { + QCString result="Tu nájdete zoznam všetkých "; + if (!extractAll) result+="dokumentovaných "; + result+="súborov so stručnými popismi:"; + return Decode(result); + } + + /*! This is an introduction to the annotated compound list. */ + virtual QCString trCompoundListDescription() + { + if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + { + return Decode("Nasledujúci zoznam obsahuje identifikáciu dátových " + "štruktúr a ich stručné popisy:"); + } + else + { + return Decode("Nasledujúci zoznam obsahuje predovšetkým identifikáciu " + "tried, ale nachádzajú sa tu i ďalšie netriviálne prvky, " + "ako sú štruktúry (struct), uniony (union) a rozhrania " + "(interface). V zozname sú uvedené ich stručné " + "popisy:"); + } + } + + /*! This is an introduction to the page with all class members. */ + virtual QCString trCompoundMembersDescription(bool extractAll) + { + QCString result= "Tu nájdete zoznam všetkých "; + if (!extractAll) + { + result += "dokumentovaných "; + } + + if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + { + result += "položiek štruktúr (struct) a unionov (union) "; + } + else + { + result += "členov tried "; + } + + result += "s odkazmi na "; + + if (extractAll) + { + if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + { + result += "dokumentáciu štruktúr/unionov, ku ktorým prislúchajú:"; + } + else + { + result += "dokumentáciu tried, ku ktorým prislúchajú:"; + } + } + else + { + if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + { + result+="štruktúry/uniony, ku ktorým prislúchajú:"; + } + else + { + result+="triedy, ku ktorým prislúchajú:"; + } + } + + return Decode(result); + } + + /*! This is an introduction to the page with all file members. */ + virtual QCString trFileMembersDescription(bool extractAll) + { + QCString result="Tu nájdete zoznam všetkých "; + if (!extractAll) result+="dokumentovaných "; + + if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + { + result+="funkcií, premenných, makier, enumerácií a definícií typov (typedef) " + "s odkazmi na "; + } + else + { + result+="symbolov, ktoré sú definované na úrovni svojich súborov. " + "Pre každý symbol je uvedený odkaz na "; + } + + if (extractAll) + result+="súbory, ku ktorým prislúchajú:"; + else + result+="dokumentáciu:"; + + return Decode(result); + } + + /*! This is an introduction to the page with the list of all header files. */ + virtual QCString trHeaderFilesDescription() + { return Decode("Tu nájdete hlavičkové súbory, ktoré tvoria " + "aplikačné programové rozhranie (API):"); } + + /*! This is an introduction to the page with the list of all examples */ + virtual QCString trExamplesDescription() + { return Decode("Tu nájdete zoznam všetkých príkladov:"); } + + /*! This is an introduction to the page with the list of related pages */ + virtual QCString trRelatedPagesDescription() + { return Decode("Nasledujúci zoznam odkazuje na ďalšie stránky projektu, " + "ktoré majú charakter usporiadaných zoznamov informácií, " + "pozbieraných z rôznych miest v zdrojových súboroch:"); } + + /*! This is an introduction to the page with the list of class/file groups */ + virtual QCString trModulesDescription() + { return Decode("Tu nájdete zoznam všetkých modulov:"); } + + /*! This sentences is used in the annotated class/file lists if no brief + * description is given. + */ + virtual QCString trNoDescriptionAvailable() + { return Decode("Popis nieje k dispozícii"); } + + // index titles (the project name is prepended for these) + + + /*! This is used in HTML as the title of index.html. */ + virtual QCString trDocumentation() + { return Decode("Dokumentácia"); } + + /*! This is used in LaTeX as the title of the chapter with the + * index of all groups. + */ + virtual QCString trModuleIndex() + { return Decode("Register modulov"); } + + /*! This is used in LaTeX as the title of the chapter with the + * class hierarchy. + */ + virtual QCString trHierarchicalIndex() + { return Decode("Register hierarchie tried"); } + + /*! This is used in LaTeX as the title of the chapter with the + * annotated compound index. + */ + virtual QCString trCompoundIndex() + { + if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + { + return Decode("Register dátových štruktúr"); + } + else + { + return Decode("Register tried"); + } + } + + /*! This is used in LaTeX as the title of the chapter with the + * list of all files. + */ + virtual QCString trFileIndex() + { return Decode("Register súborov"); } + + /*! This is used in LaTeX as the title of the chapter containing + * the documentation of all groups. + */ + virtual QCString trModuleDocumentation() + { return Decode("Dokumentácia modulov"); } + + /*! This is used in LaTeX as the title of the chapter containing + * the documentation of all classes, structs and unions. + */ + virtual QCString trClassDocumentation() + { return Decode("Dokumentácia tried"); } + + /*! This is used in LaTeX as the title of the chapter containing + * the documentation of all files. + */ + virtual QCString trFileDocumentation() + { return Decode("Dokumentácia súborov"); } + + /*! This is used in LaTeX as the title of the chapter containing + * the documentation of all examples. + */ + virtual QCString trExampleDocumentation() + { return Decode("Dokumentácia príkladov"); } + + /*! This is used in LaTeX as the title of the chapter containing + * the documentation of all related pages. + */ + virtual QCString trPageDocumentation() + { return Decode("Dokumentácia súvisiacich stránok"); } + + /*! This is used in LaTeX as the title of the document */ + virtual QCString trReferenceManual() + { return Decode("Referenčná príručka"); } + + /*! This is used in the documentation of a file as a header before the + * list of defines + */ + virtual QCString trDefines() + { return Decode("Definícia makier"); } + + /*! This is used in the documentation of a file as a header before the + * list of function prototypes + */ + virtual QCString trFuncProtos() + { return Decode("Prototypy"); } + + /*! This is used in the documentation of a file as a header before the + * list of typedefs + */ + virtual QCString trTypedefs() + { return Decode("Definícia typov"); } + + /*! This is used in the documentation of a file as a header before the + * list of enumerations + */ + virtual QCString trEnumerations() + { return Decode("Enumerácie"); } + + /*! This is used in the documentation of a file as a header before the + * list of (global) functions + */ + virtual QCString trFunctions() + { return Decode("Funkcie"); } + + /*! This is used in the documentation of a file as a header before the + * list of (global) variables + */ + virtual QCString trVariables() + { return Decode("Premenné"); } + + /*! This is used in the documentation of a file as a header before the + * list of (global) variables + */ + virtual QCString trEnumerationValues() + { return Decode("Hodnoty enumerácií"); } + + /*! This is used in the documentation of a file before the list of + * documentation blocks for defines + */ + virtual QCString trDefineDocumentation() + { return Decode("Dokumentácia k definíciám makier"); } + + /*! This is used in the documentation of a file/namespace before the list + * of documentation blocks for function prototypes + */ + virtual QCString trFunctionPrototypeDocumentation() + { return Decode("Dokumentácia prototypov"); } + + /*! This is used in the documentation of a file/namespace before the list + * of documentation blocks for typedefs + */ + virtual QCString trTypedefDocumentation() + { return Decode("Dokumentácia definícií typov"); } + + /*! This is used in the documentation of a file/namespace before the list + * of documentation blocks for enumeration types + */ + virtual QCString trEnumerationTypeDocumentation() + { return Decode("Dokumentácia enumeračných typov"); } + + /*! This is used in the documentation of a file/namespace before the list + * of documentation blocks for enumeration values + */ + virtual QCString trEnumerationValueDocumentation() + { return Decode("Dokumentácia enumeračných hodnôt"); } + + /*! This is used in the documentation of a file/namespace before the list + * of documentation blocks for functions + */ + virtual QCString trFunctionDocumentation() + { return Decode("Dokumentácia funkcií"); } + + /*! This is used in the documentation of a file/namespace before the list + * of documentation blocks for variables + */ + virtual QCString trVariableDocumentation() + { return Decode("Dokumentácia premenných"); } + + /*! This is used in the documentation of a file/namespace/group before + * the list of links to documented compounds + */ + virtual QCString trCompounds() + { + if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) + { + return Decode("Dátové štruktúry"); + } + else + { + return Decode("Triedy"); + } + } + + /*! This is used in the standard footer of each page and indicates when + * the page was generated + */ + virtual QCString trGeneratedAt(const char *date,const char *projName) + { + QCString result=(QCString)"Generované "+date; + if (projName) result+=(QCString)" pre projekt "+projName; + result+=(QCString)" programom"; + return Decode(result); + } + + /*! This is part of the sentence used in the standard footer of each page. + */ + virtual QCString trWrittenBy() + { + return Decode(" -- autor "); + } + + /*! this text is put before a class diagram */ + virtual QCString trClassDiagram(const char *clName) + { + return Decode((QCString)"Diagram dedičnosti pre triedu "+clName); + } + + /*! this text is generated when the \\internal command is used. */ + virtual QCString trForInternalUseOnly() + { return Decode("Iba pre interné použitie."); } + + /*! this text is generated when the \\reimp command is used. */ + virtual QCString trReimplementedForInternalReasons() + { return Decode("Reimplementované z interných dôvodov; " + "aplikačné rozhranie zachované."); } + + /*! this text is generated when the \\warning command is used. */ + virtual QCString trWarning() + { return Decode("Pozor"); } + + /*! this text is generated when the \\bug command is used. */ + virtual QCString trBugsAndLimitations() + { return Decode("Chyby a obmedzenia"); } + + /*! this text is generated when the \\version command is used. */ + virtual QCString trVersion() + { return Decode("Verzia"); } + + /*! this text is generated when the \\date command is used. */ + virtual QCString trDate() + { return Decode("Dátum"); } + + /*! this text is generated when the \\return command is used. */ + virtual QCString trReturns() + { return Decode("Návratová hodnota"); } + + /*! this text is generated when the \\sa command is used. */ + virtual QCString trSeeAlso() + { return Decode("Viz tiež"); } + + /*! this text is generated when the \\param command is used. */ + virtual QCString trParameters() + { return Decode("Parametre"); } + + /*! this text is generated when the \\exception command is used. */ + virtual QCString trExceptions() + { return Decode("Výnimky"); } + + /*! this text is used in the title page of a LaTeX document. */ + virtual QCString trGeneratedBy() + { return Decode("Generované programom"); } + + // new since 0.49-990307 + + /*! used as the title of page containing all the index of all namespaces. */ + virtual QCString trNamespaceList() + { return Decode("Zoznam priestorov mien"); } + + /*! used as an introduction to the namespace list */ + virtual QCString trNamespaceListDescription(bool extractAll) + { + QCString result="Tu nájdete zoznam všetkých "; + if (!extractAll) result+="dokumentovaných "; + result+="priestorov mien so stručným popisom:"; + return Decode(result); + } + + /*! used in the class documentation as a header before the list of all + * friends of a class + */ + virtual QCString trFriends() + { return Decode("Priatelia (friends)"); } ////////////////////////////////////////////////////////////////////////// // new since 0.49-990405 ////////////////////////////////////////////////////////////////////////// - /*! used in the class documentation as a header before the list of all - * related classes - */ - virtual QCString trRelatedFunctionDocumentation() - { return Decode("Dokumentácia k priateľom (friends)"); } + /*! used in the class documentation as a header before the list of all + * related classes + */ + virtual QCString trRelatedFunctionDocumentation() + { return Decode("Dokumentácia k priateľom (friends)"); } ////////////////////////////////////////////////////////////////////////// // new since 0.49-990425 ////////////////////////////////////////////////////////////////////////// - /*! used as the title of the HTML page of a class/struct/union */ - virtual QCString trCompoundReference(const char *clName, - ClassDef::CompoundType compType, - bool isTemplate) - { - QCString result("Dokumentácia "); - if (isTemplate) result+="šablóny "; - switch(compType) - { - case ClassDef::Class: result+="triedy "; break; - case ClassDef::Struct: result+="štruktúry "; break; - case ClassDef::Union: result+="unionu "; break; - case ClassDef::Interface: result+="rozhrania "; break; - case ClassDef::Exception: result+="výnimky "; break; - } - result+=clName; - return Decode(result); - } - - /*! used as the title of the HTML page of a file */ - virtual QCString trFileReference(const char *fileName) - { - QCString result("Dokumentácia súboru "); - result+=fileName; - return Decode(result); - } - - /*! used as the title of the HTML page of a namespace */ - virtual QCString trNamespaceReference(const char *namespaceName) - { - QCString result("Dokumentácia priestoru mien "); - result+=namespaceName; - return Decode(result); - } - - /* these are for the member sections of a class, struct or union */ - virtual QCString trPublicMembers() - { return Decode("Verejné metódy"); } - virtual QCString trPublicSlots() - { return Decode("Verejné sloty"); } - virtual QCString trSignals() - { return Decode("Signály"); } - virtual QCString trStaticPublicMembers() - { return Decode("Statické verejné metódy"); } - virtual QCString trProtectedMembers() - { return Decode("Chránené metódy"); } - virtual QCString trProtectedSlots() - { return Decode("Chránené sloty"); } - virtual QCString trStaticProtectedMembers() - { return Decode("Statické chránené metódy"); } - virtual QCString trPrivateMembers() - { return Decode("Privátne metódy"); } - virtual QCString trPrivateSlots() - { return Decode("Privátne sloty"); } - virtual QCString trStaticPrivateMembers() - { return Decode("Statické privátne metódy"); } - - /*! this function is used to produce a comma-separated list of items. - * use generateMarker(i) to indicate where item i should be put. - */ - virtual QCString trWriteList(int numEntries) - { - QCString result; - int i; - // the inherits list contain `numEntries' classes - for (i=0;i