summaryrefslogtreecommitdiffstats
path: root/src/rtfdocvisitor.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2020-04-09 18:59:23 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2020-04-09 18:59:23 (GMT)
commitbc83eb68e2fd31faa4b1ca7bb6610b30c0a24659 (patch)
tree183fb375621cff88a1b15e2afadaf52e99f859fe /src/rtfdocvisitor.cpp
parent7464fdd7d4a3efd97dbc24c171556d7683648c8d (diff)
downloadDoxygen-bc83eb68e2fd31faa4b1ca7bb6610b30c0a24659.zip
Doxygen-bc83eb68e2fd31faa4b1ca7bb6610b30c0a24659.tar.gz
Doxygen-bc83eb68e2fd31faa4b1ca7bb6610b30c0a24659.tar.bz2
Fixed shadowing issue in getFortranDefs and other shadowing cases
Diffstat (limited to 'src/rtfdocvisitor.cpp')
-rw-r--r--src/rtfdocvisitor.cpp188
1 files changed, 94 insertions, 94 deletions
diff --git a/src/rtfdocvisitor.cpp b/src/rtfdocvisitor.cpp
index f9b30f7..fbe7cc1 100644
--- a/src/rtfdocvisitor.cpp
+++ b/src/rtfdocvisitor.cpp
@@ -1,13 +1,13 @@
/******************************************************************************
*
- *
+ *
*
*
* Copyright (C) 1997-2015 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
- * granted. No representations are made about the suitability of this software
+ * documentation under the terms of the GNU General Public License is hereby
+ * granted. No representations are made about the suitability of this software
* for any purpose. It is provided "as is" without express or implied warranty.
* See the GNU General Public License for more details.
*
@@ -44,13 +44,13 @@ static QCString align(DocHtmlCell *cell)
{
HtmlAttribList attrs = cell->attribs();
uint i;
- for (i=0; i<attrs.count(); ++i)
+ for (i=0; i<attrs.count(); ++i)
{
if (attrs.at(i)->name.lower()=="align")
{
- if (attrs.at(i)->value.lower()=="center")
+ if (attrs.at(i)->value.lower()=="center")
return "\\qc ";
- else if (attrs.at(i)->value.lower()=="right")
+ else if (attrs.at(i)->value.lower()=="right")
return "\\qr ";
else return "";
}
@@ -59,8 +59,8 @@ static QCString align(DocHtmlCell *cell)
}
RTFDocVisitor::RTFDocVisitor(FTextStream &t,CodeOutputInterface &ci,
- const char *langExt)
- : DocVisitor(DocVisitor_RTF), m_t(t), m_ci(ci), m_insidePre(FALSE),
+ const char *langExt)
+ : DocVisitor(DocVisitor_RTF), m_t(t), m_ci(ci), m_insidePre(FALSE),
m_hide(FALSE), m_indentLevel(0), m_lastIsPara(FALSE), m_langExt(langExt)
{
}
@@ -71,7 +71,7 @@ QCString RTFDocVisitor::getStyle(const char *name)
n.sprintf("%s%d",name,m_indentLevel);
StyleData *sd = rtf_Style[n];
ASSERT(sd!=0);
- return sd->reference;
+ return sd->reference();
}
void RTFDocVisitor::incIndentLevel()
@@ -213,7 +213,7 @@ void RTFDocVisitor::visit(DocLineBreak *)
{
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visit(DocLineBreak)}\n");
- m_t << "\\par" << endl;
+ m_t << "\\par" << endl;
m_lastIsPara=TRUE;
}
@@ -309,34 +309,34 @@ void RTFDocVisitor::visit(DocVerbatim *s)
Doxygen::parserManager->getCodeParser(lang)
.parseCode(m_ci,s->context(),s->text(),langExt,
s->isExample(),s->exampleFile());
- //m_t << "\\par" << endl;
+ //m_t << "\\par" << endl;
m_t << "}" << endl;
break;
- case DocVerbatim::Verbatim:
+ case DocVerbatim::Verbatim:
m_t << "{" << endl;
m_t << "\\par" << endl;
m_t << rtf_Style_Reset << getStyle("CodeExample");
filter(s->text(),TRUE);
- //m_t << "\\par" << endl;
+ //m_t << "\\par" << endl;
m_t << "}" << endl;
break;
- case DocVerbatim::RtfOnly:
- m_t << s->text();
+ case DocVerbatim::RtfOnly:
+ m_t << s->text();
break;
- case DocVerbatim::HtmlOnly:
- case DocVerbatim::LatexOnly:
- case DocVerbatim::XmlOnly:
+ case DocVerbatim::HtmlOnly:
+ case DocVerbatim::LatexOnly:
+ case DocVerbatim::XmlOnly:
case DocVerbatim::ManOnly:
case DocVerbatim::DocbookOnly:
/* nothing */
break;
- case DocVerbatim::Dot:
+ case DocVerbatim::Dot:
{
static int dotindex = 1;
QCString fileName(4096);
- fileName.sprintf("%s%d%s",
- (Config_getString(RTF_OUTPUT)+"/inline_dotgraph_").data(),
+ fileName.sprintf("%s%d%s",
+ (Config_getString(RTF_OUTPUT)+"/inline_dotgraph_").data(),
dotindex++,
".dot"
);
@@ -355,13 +355,13 @@ void RTFDocVisitor::visit(DocVerbatim *s)
if (Config_getBool(DOT_CLEANUP)) file.remove();
}
break;
- case DocVerbatim::Msc:
+ case DocVerbatim::Msc:
{
static int mscindex = 1;
QCString baseName(4096);
baseName.sprintf("%s%d%s",
- (Config_getString(RTF_OUTPUT)+"/inline_mscgraph_").data(),
+ (Config_getString(RTF_OUTPUT)+"/inline_mscgraph_").data(),
mscindex++,
".msc"
);
@@ -427,7 +427,7 @@ void RTFDocVisitor::visit(DocInclude *inc)
switch(inc->type())
{
case DocInclude::IncWithLines:
- {
+ {
m_t << "{" << endl;
m_t << "\\par" << endl;
m_t << rtf_Style_Reset << getStyle("CodeExample");
@@ -451,7 +451,7 @@ void RTFDocVisitor::visit(DocInclude *inc)
m_t << "}" << endl;
}
break;
- case DocInclude::Include:
+ case DocInclude::Include:
m_t << "{" << endl;
m_t << "\\par" << endl;
m_t << rtf_Style_Reset << getStyle("CodeExample");
@@ -480,7 +480,7 @@ void RTFDocVisitor::visit(DocInclude *inc)
case DocInclude::RtfInclude:
m_t << inc->text();
break;
- case DocInclude::VerbInclude:
+ case DocInclude::VerbInclude:
m_t << "{" << endl;
m_t << "\\par" << endl;
m_t << rtf_Style_Reset << getStyle("CodeExample");
@@ -515,7 +515,7 @@ void RTFDocVisitor::visit(DocInclude *inc)
extractBlock(inc->text(),inc->blockId()),
langExt,
inc->isExample(),
- inc->exampleFile(),
+ inc->exampleFile(),
fd,
lineBlock(inc->text(),inc->blockId()),
-1, // endLine
@@ -527,8 +527,8 @@ void RTFDocVisitor::visit(DocInclude *inc)
m_t << "}";
}
break;
- case DocInclude::SnippetDoc:
- case DocInclude::IncludeDoc:
+ case DocInclude::SnippetDoc:
+ case DocInclude::IncludeDoc:
err("Internal inconsistency: found switch SnippetDoc / IncludeDoc in file: %s"
"Please create a bug report\n",__FILE__);
break;
@@ -544,7 +544,7 @@ void RTFDocVisitor::visit(DocIncOperator *op)
QCString locLangExt = getFileNameExtension(op->includeFileName());
if (locLangExt.isEmpty()) locLangExt = m_langExt;
SrcLangExt langExt = getLanguageFromFileName(locLangExt);
- if (op->isFirst())
+ if (op->isFirst())
{
if (!m_hide)
{
@@ -555,10 +555,10 @@ void RTFDocVisitor::visit(DocIncOperator *op)
pushEnabled();
m_hide = TRUE;
}
- if (op->type()!=DocIncOperator::Skip)
+ if (op->type()!=DocIncOperator::Skip)
{
popEnabled();
- if (!m_hide)
+ if (!m_hide)
{
FileDef *fd = 0;
if (!op->includeFileName().isEmpty())
@@ -582,7 +582,7 @@ void RTFDocVisitor::visit(DocIncOperator *op)
pushEnabled();
m_hide=TRUE;
}
- if (op->isLast())
+ if (op->isLast())
{
popEnabled();
if (!m_hide)
@@ -604,7 +604,7 @@ void RTFDocVisitor::visit(DocFormula *f)
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visit(DocFormula)}\n");
bool bDisplay = !f->isInline();
- if (bDisplay)
+ if (bDisplay)
{
m_t << "\\par";
m_t << "{";
@@ -613,7 +613,7 @@ void RTFDocVisitor::visit(DocFormula *f)
m_t << "\\qc";
}
m_t << "{ \\field\\flddirty {\\*\\fldinst INCLUDEPICTURE \"" << f->relPath() << f->name() << ".png\" \\\\d \\\\*MERGEFORMAT}{\\fldrslt Image}}";
- if (bDisplay)
+ if (bDisplay)
{
m_t << "\\par}";
}
@@ -636,7 +636,7 @@ void RTFDocVisitor::visit(DocCite *cite)
{
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visitPre(DocCite)}\n");
- if (!cite->file().isEmpty())
+ if (!cite->file().isEmpty())
{
startLink(cite->ref(),cite->file(),cite->anchor());
}
@@ -645,7 +645,7 @@ void RTFDocVisitor::visit(DocCite *cite)
m_t << "{\\b ";
}
filter(cite->text());
- if (!cite->file().isEmpty())
+ if (!cite->file().isEmpty())
{
endLink(cite->ref());
}
@@ -700,13 +700,13 @@ void RTFDocVisitor::visitPre(DocAutoListItem *)
m_lastIsPara=FALSE;
}
-void RTFDocVisitor::visitPost(DocAutoListItem *)
+void RTFDocVisitor::visitPost(DocAutoListItem *)
{
decIndentLevel();
DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocAutoListItem)}\n");
}
-void RTFDocVisitor::visitPre(DocPara *)
+void RTFDocVisitor::visitPre(DocPara *)
{
DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocPara)}\n");
}
@@ -720,7 +720,7 @@ void RTFDocVisitor::visitPost(DocPara *p)
!(p->parent() && // and for parameters & sections
p->parent()->kind()==DocNode::Kind_ParamSect
)
- )
+ )
{
m_t << "\\par" << endl;
m_lastIsPara=TRUE;
@@ -732,7 +732,7 @@ void RTFDocVisitor::visitPre(DocRoot *r)
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visitPre(DocRoot)}\n");
if (r->indent()) incIndentLevel();
- m_t << "{" << rtf_Style["BodyText"]->reference << endl;
+ m_t << "{" << rtf_Style["BodyText"]->reference() << endl;
}
void RTFDocVisitor::visitPost(DocRoot *r)
@@ -752,24 +752,24 @@ void RTFDocVisitor::visitPre(DocSimpleSect *s)
if (!m_lastIsPara) m_t << "\\par" << endl;
m_t << "{"; // start desc
//m_t << "{\\b "; // start bold
- m_t << "{" << rtf_Style["Heading5"]->reference << endl;
+ m_t << "{" << rtf_Style["Heading5"]->reference() << endl;
switch(s->type())
{
- case DocSimpleSect::See:
+ case DocSimpleSect::See:
m_t << theTranslator->trSeeAlso(); break;
- case DocSimpleSect::Return:
+ case DocSimpleSect::Return:
m_t << theTranslator->trReturns(); break;
- case DocSimpleSect::Author:
+ case DocSimpleSect::Author:
m_t << theTranslator->trAuthor(TRUE,TRUE); break;
- case DocSimpleSect::Authors:
+ case DocSimpleSect::Authors:
m_t << theTranslator->trAuthor(TRUE,FALSE); break;
- case DocSimpleSect::Version:
+ case DocSimpleSect::Version:
m_t << theTranslator->trVersion(); break;
- case DocSimpleSect::Since:
+ case DocSimpleSect::Since:
m_t << theTranslator->trSince(); break;
- case DocSimpleSect::Date:
+ case DocSimpleSect::Date:
m_t << theTranslator->trDate(); break;
- case DocSimpleSect::Note:
+ case DocSimpleSect::Note:
m_t << theTranslator->trNote(); break;
case DocSimpleSect::Warning:
m_t << theTranslator->trWarning(); break;
@@ -856,7 +856,7 @@ void RTFDocVisitor::visitPre(DocSimpleListItem *)
incIndentLevel();
}
-void RTFDocVisitor::visitPost(DocSimpleListItem *)
+void RTFDocVisitor::visitPost(DocSimpleListItem *)
{
decIndentLevel();
DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocSimpleListItem)}\n");
@@ -875,7 +875,7 @@ void RTFDocVisitor::visitPre(DocSection *s)
int level = QMIN(s->level()+1,4);
heading.sprintf("Heading%d",level);
// set style
- m_t << rtf_Style[heading]->reference << endl;
+ m_t << rtf_Style[heading]->reference() << endl;
// make table of contents entry
filter(s->title());
m_t << endl << "\\par" << "}" << endl;
@@ -885,7 +885,7 @@ void RTFDocVisitor::visitPre(DocSection *s)
m_lastIsPara=TRUE;
}
-void RTFDocVisitor::visitPost(DocSection *)
+void RTFDocVisitor::visitPost(DocSection *)
{
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocSection)}\n");
@@ -898,12 +898,12 @@ void RTFDocVisitor::visitPre(DocHtmlList *l)
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visitPre(DocHtmlList)}\n");
m_t << "{" << endl;
- rtf_listItemInfo[m_indentLevel].isEnum = l->type()==DocHtmlList::Ordered;
+ rtf_listItemInfo[m_indentLevel].isEnum = l->type()==DocHtmlList::Ordered;
rtf_listItemInfo[m_indentLevel].number = 1;
m_lastIsPara=FALSE;
}
-void RTFDocVisitor::visitPost(DocHtmlList *)
+void RTFDocVisitor::visitPost(DocHtmlList *)
{
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocHtmlList)}\n");
@@ -931,7 +931,7 @@ void RTFDocVisitor::visitPre(DocHtmlListItem *)
m_lastIsPara=FALSE;
}
-void RTFDocVisitor::visitPost(DocHtmlListItem *)
+void RTFDocVisitor::visitPost(DocHtmlListItem *)
{
decIndentLevel();
DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocHtmlListItem)}\n");
@@ -946,7 +946,7 @@ void RTFDocVisitor::visitPre(DocHtmlDescList *)
//m_lastIsPara=FALSE;
}
-void RTFDocVisitor::visitPost(DocHtmlDescList *)
+void RTFDocVisitor::visitPost(DocHtmlDescList *)
{
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocHtmlDescList)}\n");
@@ -961,11 +961,11 @@ void RTFDocVisitor::visitPre(DocHtmlDescTitle *)
DBG_RTF("{\\comment RTFDocVisitor::visitPre(DocHtmlDescTitle)}\n");
//m_t << "\\par" << endl;
//m_t << "{\\b ";
- m_t << "{" << rtf_Style["Heading5"]->reference << endl;
+ m_t << "{" << rtf_Style["Heading5"]->reference() << endl;
m_lastIsPara=FALSE;
}
-void RTFDocVisitor::visitPost(DocHtmlDescTitle *)
+void RTFDocVisitor::visitPost(DocHtmlDescTitle *)
{
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocHtmlDescTitle)}\n");
@@ -982,7 +982,7 @@ void RTFDocVisitor::visitPre(DocHtmlDescData *)
m_t << "{" << rtf_Style_Reset << getStyle("DescContinue");
}
-void RTFDocVisitor::visitPost(DocHtmlDescData *)
+void RTFDocVisitor::visitPost(DocHtmlDescData *)
{
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocHtmlDescData)}\n");
@@ -1000,7 +1000,7 @@ void RTFDocVisitor::visitPre(DocHtmlTable *)
m_lastIsPara=TRUE;
}
-void RTFDocVisitor::visitPost(DocHtmlTable *)
+void RTFDocVisitor::visitPost(DocHtmlTable *)
{
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocHtmlTable)}\n");
@@ -1016,7 +1016,7 @@ void RTFDocVisitor::visitPre(DocHtmlCaption *)
m_t << "{Table \\field\\flddirty{\\*\\fldinst { SEQ Table \\\\*Arabic }}{\\fldrslt {\\noproof 1}} ";
}
-void RTFDocVisitor::visitPost(DocHtmlCaption *)
+void RTFDocVisitor::visitPost(DocHtmlCaption *)
{
DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocHtmlCaption)}\n");
m_t << "}\n\\par" << endl;
@@ -1051,7 +1051,7 @@ void RTFDocVisitor::visitPre(DocHtmlRow *r)
m_lastIsPara=FALSE;
}
-void RTFDocVisitor::visitPost(DocHtmlRow *)
+void RTFDocVisitor::visitPost(DocHtmlRow *)
{
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocHtmlRow)}\n");
@@ -1069,7 +1069,7 @@ void RTFDocVisitor::visitPre(DocHtmlCell *c)
m_lastIsPara=FALSE;
}
-void RTFDocVisitor::visitPost(DocHtmlCell *)
+void RTFDocVisitor::visitPost(DocHtmlCell *)
{
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocHtmlCell)}\n");
@@ -1091,7 +1091,7 @@ void RTFDocVisitor::visitPre(DocInternal *)
//m_lastIsPara=FALSE;
}
-void RTFDocVisitor::visitPost(DocInternal *)
+void RTFDocVisitor::visitPost(DocInternal *)
{
if (m_hide) return;
//DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocInternal)}\n");
@@ -1139,12 +1139,12 @@ void RTFDocVisitor::visitPre(DocHRef *href)
m_lastIsPara=FALSE;
}
-void RTFDocVisitor::visitPost(DocHRef *)
+void RTFDocVisitor::visitPost(DocHRef *)
{
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocHRef)}\n");
if (Config_getBool(RTF_HYPERLINKS))
- {
+ {
m_t << "}"
"}"
"}";
@@ -1166,13 +1166,13 @@ void RTFDocVisitor::visitPre(DocHtmlHeader *header)
int level = QMIN(header->level(),5);
heading.sprintf("Heading%d",level);
// set style
- m_t << rtf_Style[heading]->reference;
+ m_t << rtf_Style[heading]->reference();
// make open table of contents entry that will be closed in visitPost method
m_t << "{\\tc\\tcl" << level << " ";
m_lastIsPara=FALSE;
}
-void RTFDocVisitor::visitPost(DocHtmlHeader *)
+void RTFDocVisitor::visitPost(DocHtmlHeader *)
{
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocHtmlHeader)}\n");
@@ -1264,7 +1264,7 @@ void RTFDocVisitor::visitPre(DocDotFile *df)
writeDotFile(df);
}
-void RTFDocVisitor::visitPost(DocDotFile *df)
+void RTFDocVisitor::visitPost(DocDotFile *df)
{
DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocDotFile)}\n");
includePicturePostRTF(true, df->hasCaption());
@@ -1275,7 +1275,7 @@ void RTFDocVisitor::visitPre(DocMscFile *df)
writeMscFile(df);
}
-void RTFDocVisitor::visitPost(DocMscFile *df)
+void RTFDocVisitor::visitPost(DocMscFile *df)
{
DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocMscFile)}\n");
includePicturePostRTF(true, df->hasCaption());
@@ -1300,7 +1300,7 @@ void RTFDocVisitor::visitPre(DocLink *lnk)
startLink(lnk->ref(),lnk->file(),lnk->anchor());
}
-void RTFDocVisitor::visitPost(DocLink *lnk)
+void RTFDocVisitor::visitPost(DocLink *lnk)
{
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocLink)}\n");
@@ -1324,7 +1324,7 @@ void RTFDocVisitor::visitPre(DocRef *ref)
if (!ref->hasLinkText()) filter(ref->targetTitle());
}
-void RTFDocVisitor::visitPost(DocRef *ref)
+void RTFDocVisitor::visitPost(DocRef *ref)
{
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocRef)}\n");
@@ -1338,7 +1338,7 @@ void RTFDocVisitor::visitPre(DocSecRefItem *)
DBG_RTF("{\\comment RTFDocVisitor::visitPre(DocSecRefItem)}\n");
}
-void RTFDocVisitor::visitPost(DocSecRefItem *)
+void RTFDocVisitor::visitPost(DocSecRefItem *)
{
DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocSecRefItem)}\n");
}
@@ -1354,7 +1354,7 @@ void RTFDocVisitor::visitPre(DocSecRefList *)
m_lastIsPara=TRUE;
}
-void RTFDocVisitor::visitPost(DocSecRefList *)
+void RTFDocVisitor::visitPost(DocSecRefList *)
{
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocSecRefList)}\n");
@@ -1375,7 +1375,7 @@ void RTFDocVisitor::visitPost(DocSecRefList *)
// }
//}
//
-//void RTFDocVisitor::visitPost(DocLanguage *l)
+//void RTFDocVisitor::visitPost(DocLanguage *l)
//{
// DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocLanguage)}\n");
// QCString langId = Config_getEnum(OUTPUT_LANGUAGE);
@@ -1392,16 +1392,16 @@ void RTFDocVisitor::visitPre(DocParamSect *s)
m_t << "{"; // start param list
if (!m_lastIsPara) m_t << "\\par" << endl;
//m_t << "{\\b "; // start bold
- m_t << "{" << rtf_Style["Heading5"]->reference << endl;
+ m_t << "{" << rtf_Style["Heading5"]->reference() << endl;
switch(s->type())
{
- case DocParamSect::Param:
+ case DocParamSect::Param:
m_t << theTranslator->trParameters(); break;
- case DocParamSect::RetVal:
+ case DocParamSect::RetVal:
m_t << theTranslator->trReturnValues(); break;
- case DocParamSect::Exception:
+ case DocParamSect::Exception:
m_t << theTranslator->trExceptions(); break;
- case DocParamSect::TemplateParam:
+ case DocParamSect::TemplateParam:
m_t << theTranslator->trTemplateParameters(); break;
default:
ASSERT(0);
@@ -1438,7 +1438,7 @@ void RTFDocVisitor::visitPost(DocParamSect *s)
void RTFDocVisitor::visitPre(DocParamList *pl)
{
- static int columnPos[4][5] =
+ static int columnPos[4][5] =
{ { 2, 25, 100, 100, 100 }, // no inout, no type
{ 3, 14, 35, 100, 100 }, // inout, no type
{ 3, 25, 50, 100, 100 }, // no inout, type
@@ -1525,11 +1525,11 @@ void RTFDocVisitor::visitPre(DocParamList *pl)
{
if (type->kind()==DocNode::Kind_Word)
{
- visit((DocWord*)type);
+ visit((DocWord*)type);
}
else if (type->kind()==DocNode::Kind_LinkedWord)
{
- visit((DocLinkedWord*)type);
+ visit((DocLinkedWord*)type);
}
else if (type->kind()==DocNode::Kind_Sep)
{
@@ -1541,7 +1541,7 @@ void RTFDocVisitor::visitPre(DocParamList *pl)
m_t << "\\cell }";
}
}
-
+
if (useTable)
{
@@ -1559,11 +1559,11 @@ void RTFDocVisitor::visitPre(DocParamList *pl)
if (!first) m_t << ","; else first=FALSE;
if (param->kind()==DocNode::Kind_Word)
{
- visit((DocWord*)param);
+ visit((DocWord*)param);
}
else if (param->kind()==DocNode::Kind_LinkedWord)
{
- visit((DocLinkedWord*)param);
+ visit((DocLinkedWord*)param);
}
}
m_t << "} ";
@@ -1618,7 +1618,7 @@ void RTFDocVisitor::visitPre(DocXRefItem *x)
}
m_t << "{"; // start param list
//m_t << "{\\b "; // start bold
- m_t << "{" << rtf_Style["Heading5"]->reference << endl;
+ m_t << "{" << rtf_Style["Heading5"]->reference() << endl;
if (Config_getBool(RTF_HYPERLINKS) && !anonymousEnum)
{
QCString refName;
@@ -1677,7 +1677,7 @@ void RTFDocVisitor::visitPre(DocInternalRef *ref)
startLink("",ref->file(),ref->anchor());
}
-void RTFDocVisitor::visitPost(DocInternalRef *)
+void RTFDocVisitor::visitPost(DocInternalRef *)
{
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visitPost(DocInternalRef)}\n");
@@ -1704,7 +1704,7 @@ void RTFDocVisitor::visitPre(DocHtmlBlockQuote *)
if (!m_lastIsPara) m_t << "\\par" << endl;
m_t << "{"; // start desc
incIndentLevel();
- m_t << rtf_Style_Reset << getStyle("DescContinue");
+ m_t << rtf_Style_Reset << getStyle("DescContinue");
}
void RTFDocVisitor::visitPost(DocHtmlBlockQuote *)
@@ -1746,7 +1746,7 @@ void RTFDocVisitor::visitPost(DocParBlock *)
//}
void RTFDocVisitor::filter(const char *str,bool verbatim)
-{
+{
if (str)
{
const unsigned char *p=(const unsigned char *)str;
@@ -1777,7 +1777,7 @@ void RTFDocVisitor::filter(const char *str,bool verbatim)
case '\\': m_t << "\\\\"; break;
case '\n': if (verbatim)
{
- m_t << "\\par" << endl;
+ m_t << "\\par" << endl;
}
else
{
@@ -1858,7 +1858,7 @@ void RTFDocVisitor::writeDotFile(const QCString &filename, bool hasCaption)
if ((i=baseName.findRev('/'))!=-1)
{
baseName=baseName.right(baseName.length()-i-1);
- }
+ }
QCString outDir = Config_getString(RTF_OUTPUT);
writeDotGraphFromFile(filename,outDir,baseName,GOF_BITMAP);
QCString imgExt = getDotImageExtension();
@@ -1876,7 +1876,7 @@ void RTFDocVisitor::writeMscFile(const QCString &fileName, bool hasCaption)
if ((i=baseName.findRev('/'))!=-1)
{
baseName=baseName.right(baseName.length()-i-1);
- }
+ }
QCString outDir = Config_getString(RTF_OUTPUT);
writeMscGraphFromFile(fileName,outDir,baseName,MSC_BITMAP);
includePicturePreRTF(baseName + ".png", true, hasCaption);