Imported Upstream version 1.8.18upstream/1.8.18

1 files changed, 25 insertions, 30 deletions

diff --git a/src/docbookgen.cpp b/src/docbookgen.cpp
index fff9728..53b2957 100644
--- a/src/docbookgen.cpp
+++ b/src/docbookgen.cpp
@@ -132,15 +132,13 @@ void writeDocbookLink(FTextStream &t,const char * /*extRef*/,const char *compoun
   t << "</link>";
 }
 
-DocbookCodeGenerator::DocbookCodeGenerator(FTextStream &t) : m_lineNumber(-1), m_col(0),
-  m_insideCodeLine(FALSE), m_insideSpecialHL(FALSE)
+DocbookCodeGenerator::DocbookCodeGenerator(FTextStream &t)
 {
   m_prettyCode=Config_getBool(DOCBOOK_PROGRAMLISTING);
   setTextStream(t);
 }
 
-DocbookCodeGenerator::DocbookCodeGenerator() : m_lineNumber(-1), m_col(0),
-  m_insideCodeLine(FALSE), m_insideSpecialHL(FALSE),  m_streamSet(FALSE)
+DocbookCodeGenerator::DocbookCodeGenerator()
 {
   m_prettyCode=Config_getBool(DOCBOOK_PROGRAMLISTING);
 }
@@ -160,9 +158,9 @@ void DocbookCodeGenerator::writeCodeLink(const char *ref,const char *file,
   writeDocbookLink(m_t,ref,file,anchor,name,tooltip);
   m_col+=(int)strlen(name);
 }
-void DocbookCodeGenerator::writeCodeLinkLine(const char *ref,const char *file,
-    const char *anchor,const char *name,
-    const char *tooltip)
+void DocbookCodeGenerator::writeCodeLinkLine(const char *,const char *file,
+    const char *,const char *name,
+    const char *)
 {
   Docbook_DB(("(writeCodeLinkLine)\n"));
   m_t << "<anchor xml:id=\"_" << stripExtensionGeneral(stripPath(file),".xml");
@@ -274,8 +272,8 @@ DB_GEN_C
   m_descTable = FALSE;
   m_inLevel = -1;
   m_firstMember = FALSE;
-  for (int i = 0 ; i < sizeof(m_inListItem) / sizeof(*m_inListItem) ; i++) m_inListItem[i] = FALSE;
-  for (int i = 0 ; i < sizeof(m_inSimpleSect) / sizeof(*m_inSimpleSect) ; i++) m_inSimpleSect[i] = FALSE;
+  for (size_t i = 0 ; i < sizeof(m_inListItem) / sizeof(*m_inListItem) ; i++) m_inListItem[i] = FALSE;
+  for (size_t i = 0 ; i < sizeof(m_inSimpleSect) / sizeof(*m_inSimpleSect) ; i++) m_inSimpleSect[i] = FALSE;
 }
 
 DocbookGenerator::~DocbookGenerator()
@@ -574,13 +572,9 @@ DB_GEN_C2("IndexSections " << is)
       {
         t << "</title>" << endl;
         bool isFirst=TRUE;
-        FileNameListIterator fnli(*Doxygen::inputNameList);
-        FileName *fn;
-        for (fnli.toFirst();(fn=fnli.current());++fnli)
+        for (const auto &fn : *Doxygen::inputNameLinkedMap)
         {
-          FileNameIterator fni(*fn);
-          const FileDef *fd;
-          for (;(fd=fni.current());++fni)
+          for (const auto &fd : *fn)
           {
             if (fd->isLinkableInProject())
             {
@@ -655,7 +649,8 @@ DB_GEN_C
     }
   }
 }
-void DocbookGenerator::writeDoc(DocNode *n,const Definition *ctx,const MemberDef *)
+
+void DocbookGenerator::writeDoc(DocNode *n,const Definition *,const MemberDef *)
 {
 DB_GEN_C
   DocbookDocVisitor *visitor =
@@ -680,7 +675,7 @@ void DocbookGenerator::writeString(const char *text)
 DB_GEN_C
   t << text;
 }
-void DocbookGenerator::startMemberHeader(const char *name,int)
+void DocbookGenerator::startMemberHeader(const char *,int)
 {
 DB_GEN_C
   t << "<simplesect>" << endl;
@@ -698,7 +693,7 @@ void DocbookGenerator::docify(const char *str)
 DB_GEN_C
   t << convertToDocBook(str);
 }
-void DocbookGenerator::writeObjectLink(const char *ref, const char *f,
+void DocbookGenerator::writeObjectLink(const char *, const char *f,
                                      const char *anchor, const char *text)
 {
 DB_GEN_C
@@ -813,7 +808,7 @@ DB_GEN_C
     t << "<programlisting>";
   }
 }
-void DocbookGenerator::endTextBlock(bool dense)
+void DocbookGenerator::endTextBlock(bool)
 {
 DB_GEN_C
   if (m_denseText)
@@ -822,8 +817,8 @@ DB_GEN_C
     t << "</programlisting>";
   }
 }
-void DocbookGenerator::startMemberDoc(const char *clname, const char *memname, const char *anchor, const char *title,
-                                      int memCount, int memTotal, bool showInline)
+void DocbookGenerator::startMemberDoc(const char *clname, const char *memname, const char *, const char *title,
+                                      int memCount, int memTotal, bool)
 {
 DB_GEN_C2("m_inLevel " << m_inLevel)
   t << "    <section>" << endl;
@@ -849,15 +844,15 @@ void DocbookGenerator::startTitleHead(const char *)
 DB_GEN_C
   t << "<title>";
 }
-void DocbookGenerator::endTitleHead(const char *fileName,const char *name)
+void DocbookGenerator::endTitleHead(const char *,const char *name)
 {
 DB_GEN_C
   t << "</title>" << endl;
   if (name) addIndexTerm(t, name);
 }
-void DocbookGenerator::startDoxyAnchor(const char *fName,const char *manName,
-                                 const char *anchor,const char *name,
-                                 const char *args)
+void DocbookGenerator::startDoxyAnchor(const char *fName,const char *,
+                                 const char *anchor,const char *,
+                                 const char *)
 {
 DB_GEN_C
   if (!m_inListItem[m_levelListItem] && !m_descTable)
@@ -870,7 +865,7 @@ DB_GEN_C
     t << "<anchor xml:id=\"_" << stripPath(fName) << "_1" << anchor << "\"/>";
   }
 }
-void DocbookGenerator::endDoxyAnchor(const char *fileName,const char *anchor)
+void DocbookGenerator::endDoxyAnchor(const char *,const char *)
 {
 DB_GEN_C
 }
@@ -883,7 +878,7 @@ void DocbookGenerator::endMemberDocName()
 {
 DB_GEN_C
 }
-void DocbookGenerator::startMemberGroupHeader(bool hasHeader)
+void DocbookGenerator::startMemberGroupHeader(bool)
 {
 DB_GEN_C
   t << "<simplesect><title>";
@@ -914,7 +909,7 @@ DB_GEN_C
   t << "    <informalfigure>" << endl;
   t << "        <mediaobject>" << endl;
   t << "            <imageobject>" << endl;
-  t << "                <imagedata width=\"50%\" align=\"center\" valign=\"middle\" scalefit=\"0\" fileref=\"" 
+  t << "                <imagedata width=\"50%\" align=\"center\" valign=\"middle\" scalefit=\"0\" fileref=\""
                          << relPath << fileName << ".png\">" << "</imagedata>" << endl;
   t << "            </imageobject>" << endl;
   d.writeImage(t,m_dir,relPath,fileName,FALSE);
@@ -1025,13 +1020,13 @@ DB_GEN_C
   t << "</para>";
   t << "<para>";
 }
-void DocbookGenerator::startSection(const char *lab,const char *,SectionInfo::SectionType type)
+void DocbookGenerator::startSection(const char *lab,const char *,SectionType)
 {
 DB_GEN_C
   t << "    <section xml:id=\"_" << stripPath(lab) << "\">";
   t << "<title>";
 }
-void DocbookGenerator::endSection(const char *lab,SectionInfo::SectionType)
+void DocbookGenerator::endSection(const char *,SectionType)
 {
 DB_GEN_C
   t << "</title>";