1 files changed, 17 insertions, 23 deletions

diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp
index dff4cdd..17ed794 100644
--- a/src/rtfgen.cpp
+++ b/src/rtfgen.cpp
@@ -48,8 +48,6 @@
 #include "filename.h"
 #include "namespacedef.h"
 
-static bool DoxyCodeLineOpen = FALSE;
-
 //#define DBG_RTF(x) x;
 #define DBG_RTF(x)
 
@@ -374,7 +372,7 @@ void RTFGenerator::beginRTFSection()
   t << rtf_Style["Heading2"]->reference() << "\n";
 }
 
-void RTFGenerator::startFile(const char *name,const char *,const char *)
+void RTFGenerator::startFile(const char *name,const char *,const char *,int)
 {
   //setEncoding(QCString().sprintf("CP%s",theTranslator->trRTFansicp()));
   QCString fileName=name;
@@ -528,7 +526,8 @@ void RTFGenerator::startIndexSection(IndexSections is)
         {
           if (cd->isLinkableInProject() &&
               cd->templateMaster()==0 &&
-             !cd->isEmbeddedInOuterScope()
+             !cd->isEmbeddedInOuterScope() &&
+             !cd->isAlias()
              )
           {
             beginRTFChapter();
@@ -630,7 +629,7 @@ void RTFGenerator::endIndexSection(IndexSections is)
         {
           DocText *root = validatingParseText(projectName);
           t << "{\\field\\fldedit {\\*\\fldinst TITLE \\\\*MERGEFORMAT}{\\fldrslt ";
-          writeDoc(root,0,0);
+          writeDoc(root,0,0,0);
           t << "}}\\par" << endl;
 
         }
@@ -785,7 +784,7 @@ void RTFGenerator::endIndexSection(IndexSections is)
         bool found=FALSE;
         for (nli.toFirst();(nd=nli.current()) && !found;++nli)
         {
-          if (nd->isLinkableInProject())
+          if (nd->isLinkableInProject() && !nd->isAlias())
           {
             t << "\\par " << rtf_Style_Reset << endl;
             t << "{\\field\\fldedit{\\*\\fldinst INCLUDETEXT \"";
@@ -796,7 +795,7 @@ void RTFGenerator::endIndexSection(IndexSections is)
         }
         while ((nd=nli.current()))
         {
-          if (nd->isLinkableInProject())
+          if (nd->isLinkableInProject() && !nd->isAlias())
           {
             t << "\\par " << rtf_Style_Reset << endl;
             beginRTFSection();
@@ -825,7 +824,8 @@ void RTFGenerator::endIndexSection(IndexSections is)
         {
           if (cd->isLinkableInProject() &&
               cd->templateMaster()==0 &&
-             !cd->isEmbeddedInOuterScope()
+             !cd->isEmbeddedInOuterScope() &&
+             !cd->isAlias()
              )
           {
             t << "\\par " << rtf_Style_Reset << endl;
@@ -839,7 +839,8 @@ void RTFGenerator::endIndexSection(IndexSections is)
         {
           if (cd->isLinkableInProject() &&
               cd->templateMaster()==0 &&
-             !cd->isEmbeddedInOuterScope()
+             !cd->isEmbeddedInOuterScope() &&
+             !cd->isAlias()
              )
           {
             t << "\\par " << rtf_Style_Reset << endl;
@@ -1935,22 +1936,15 @@ void RTFGenerator::writeRTFReference(const char *label)
   t << " \\\\*MERGEFORMAT}{\\fldrslt pagenum}}";
 }
 
-void RTFGenerator::startCodeFragment()
+void RTFGenerator::startCodeFragment(const char *)
 {
   DBG_RTF(t << "{\\comment (startCodeFragment) }"    << endl)
   t << "{" << endl;
-  //newParagraph();
   t << rtf_Style_Reset << rtf_Code_DepthStyle();
-  //styleStack.push(rtf_Style_CodeExample);
 }
 
-void RTFGenerator::endCodeFragment()
+void RTFGenerator::endCodeFragment(const char *)
 {
-  //newParagraph();
-  //styleStack.pop();
-  //printf("RTFGenerator::endCodeFragment() top=%s\n",styleStack.top());
-  //t << rtf_Style_Reset << styleStack.top() << endl;
-  //endCodeLine checks is there is still an open code line, if so closes it.
   endCodeLine();
 
   DBG_RTF(t << "{\\comment (endCodeFragment) }"    << endl)
@@ -2805,7 +2799,7 @@ void RTFGenerator::exceptionEntry(const char* prefix,bool closeBracket)
   t << " ";
 }
 
-void RTFGenerator::writeDoc(DocNode *n,const Definition *ctx,const MemberDef *)
+void RTFGenerator::writeDoc(DocNode *n,const Definition *ctx,const MemberDef *,int)
 {
   RTFDocVisitor *visitor = new RTFDocVisitor(t,*this,ctx?ctx->getDefFileExtension():QCString(""));
   n->accept(visitor);
@@ -3043,7 +3037,7 @@ void RTFGenerator::writeLineNumber(const char *ref,const char *fileName,const ch
 {
   bool rtfHyperlinks = Config_getBool(RTF_HYPERLINKS);
 
-  DoxyCodeLineOpen = TRUE;
+  m_doxyCodeLineOpen = true;
   QCString lineNumber;
   lineNumber.sprintf("%05d",l);
   if (m_prettyCode)
@@ -3070,13 +3064,13 @@ void RTFGenerator::writeLineNumber(const char *ref,const char *fileName,const ch
 }
 void RTFGenerator::startCodeLine(bool)
 {
-  DoxyCodeLineOpen = TRUE;
+  m_doxyCodeLineOpen = true;
   m_col=0;
 }
 void RTFGenerator::endCodeLine()
 {
-  if (DoxyCodeLineOpen) lineBreak();
-  DoxyCodeLineOpen = FALSE;
+  if (m_doxyCodeLineOpen) lineBreak();
+  m_doxyCodeLineOpen = false;
 }
 
 void RTFGenerator::startLabels()