issue #9094: Wrong QHP index structure

doxygen · Feb 20, 2022 · 427e0a4 · 427e0a4
1 parent d280c60
commit 427e0a4
Show file tree

Hide file tree

Showing 12 changed files with 233 additions and 467 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -289,7 +289,6 @@ add_library(doxymain STATIC
     plantuml.cpp
     qcstring.cpp
     qhp.cpp
-    qhpxmlwriter.cpp
     reflist.cpp
     regex.cpp
     resourcemgr.cpp

diff --git a/src/docsets.h b/src/docsets.h
@@ -48,7 +48,6 @@ class DocSets  : public IndexIntf
                          bool addToNavIndex,
                          const Definition *def
                         );
-    void closeContentsItem() {}
     void addIndexItem(const Definition *context,const MemberDef *md,
                       const QCString &sectionAnchor,const QCString &title);
     void addIndexFile(const QCString &name);

diff --git a/src/doxygen.cpp b/src/doxygen.cpp
@@ -12532,7 +12532,7 @@ void generateOutput()
       !Config_getString(QHG_LOCATION).isEmpty())
   {
     g_s.begin("Running qhelpgenerator...\n");
-    QCString qhpFileName = Qhp::getQhpFileName();
+    QCString qhpFileName = "index.qhp";
     QCString qchFileName = getQchFileName();
 
     QCString args = QCString().sprintf("%s -o \"%s\"", qPrint(qhpFileName), qPrint(qchFileName));

diff --git a/src/eclipsehelp.h b/src/eclipsehelp.h
@@ -51,7 +51,6 @@ class EclipseHelp : public IndexIntf
     virtual void addContentsItem(bool isDir, const QCString &name, const QCString &ref,
                                  const QCString &file, const QCString &anchor,bool separateIndex,bool addToNavIndex,
                                  const Definition *def);
-    virtual void closeContentsItem() {}
     virtual void addIndexItem(const Definition *context,const MemberDef *md,
                               const QCString &sectionAnchor,const QCString &title);
     virtual void addIndexFile(const QCString &name);

diff --git a/src/ftvhelp.h b/src/ftvhelp.h
@@ -50,7 +50,6 @@ class FTVHelp : public IndexIntf
                          bool separateIndex,
                          bool addToNavIndex,
                          const Definition *def);
-    void closeContentsItem() {}
     void addIndexItem(const Definition *,const MemberDef *,const QCString &,const QCString &) {}
     void addIndexFile(const QCString &) {}
     void addImageFile(const QCString &) {}

diff --git a/src/htmlhelp.h b/src/htmlhelp.h
@@ -73,7 +73,6 @@ class HtmlHelp  : public IndexIntf
                          bool separateIndex,
                          bool addToNavIndex,
                          const Definition *def);
-    void closeContentsItem() {}
     void addIndexItem(const Definition *context,const MemberDef *md,
                       const QCString &sectionAnchor, const QCString &title);
     void addIndexFile(const QCString &name);

diff --git a/src/index.cpp b/src/index.cpp
@@ -331,7 +331,6 @@ static void writeMemberToIndex(const Definition *def,const MemberDef *md,bool ad
       Doxygen::indexList->decContentsDepth();
     }
   }
-  Doxygen::indexList->closeContentsItem();
 }
 
 //----------------------------------------------------------------------
@@ -3846,10 +3845,6 @@ static void writeGroupTreeNode(OutputList &ol, const GroupDef *gd, int level, FT
                 }
                 Doxygen::indexList->decContentsDepth();
               }
-              if (md->isVisible() && !md->isAnonymous())
-              {
-                Doxygen::indexList->closeContentsItem();
-              }
             }
           }
         }

diff --git a/src/index.h b/src/index.h
@@ -40,7 +40,6 @@ class IndexIntf
     virtual void addContentsItem(bool isDir, const QCString &name, const QCString &ref,
                                  const QCString &file, const QCString &anchor, bool separateIndex,
                                  bool addToNavIndex,const Definition *def) = 0;
-    virtual void closeContentsItem() = 0;
     virtual void addIndexItem(const Definition *context,const MemberDef *md,
                               const QCString &sectionAnchor,const QCString &title) = 0;
     virtual void addIndexFile(const QCString &name) = 0;
@@ -99,8 +98,6 @@ class IndexList : public IndexIntf
                          const QCString &file, const QCString &anchor,bool separateIndex=FALSE,bool addToNavIndex=FALSE,
                          const Definition *def=0)
     { if (m_enabled) foreach(&IndexIntf::addContentsItem,isDir,name,ref,file,anchor,separateIndex,addToNavIndex,def); }
-    void closeContentsItem()
-    { if (m_enabled) foreach(&IndexIntf::closeContentsItem); }
     void addIndexItem(const Definition *context,const MemberDef *md,const QCString &sectionAnchor=QCString(),const QCString &title=QCString())
     { if (m_enabled) foreach(&IndexIntf::addIndexItem,context,md,sectionAnchor,title); }
     void addIndexFile(const QCString &name)