Commit 93d1c462 authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

Bug 709803 - Generated hhc file contains an error for a section of a mainpage

parent 9631035b

src/doxygen.cpp

+2 −2
Original line number Diff line number Diff line
@@ -8592,7 +8592,7 @@ static void findMainPage(EntryNav *rootNav) 
                              indexName, root->brief+root->doc+root->inbodyDocs,title);

      //setFileNameForSections(root->anchors,"index",Doxygen::mainPage);

      Doxygen::mainPage->setBriefDescription(root->brief,root->briefFile,root->briefLine);

      Doxygen::mainPage->setFileName(indexName);

      Doxygen::mainPage->setFileName(indexName,TRUE);

      Doxygen::mainPage->setShowToc(root->stat);

      addPageToContext(Doxygen::mainPage,rootNav);
@@ -8790,7 +8790,7 @@ static void buildExampleList(EntryNav *rootNav) 
      PageDef *pd=new PageDef(root->fileName,root->startLine,

          root->name,root->brief+root->doc+root->inbodyDocs,root->args);

      pd->setBriefDescription(root->brief,root->briefFile,root->briefLine);

      pd->setFileName(convertNameToFile(pd->name()+"-example",FALSE,TRUE));

      pd->setFileName(convertNameToFile(pd->name()+"-example",FALSE,TRUE),FALSE);

      pd->addSectionsToDefinition(root->anchors);

      pd->setLanguage(root->lang);

      //pi->addSections(root->anchors);

src/pagedef.cpp

+2 −2
Original line number Diff line number Diff line
@@ -61,10 +61,10 @@ QCString PageDef::getOutputFileBase() const 
    return m_fileName; 

}



void PageDef::setFileName(const char *name) 

void PageDef::setFileName(const char *name,bool dontEscape) 

{ 

  static bool shortNames = Config_getBool("SHORT_NAMES");

  if (shortNames)

  if (shortNames && !dontEscape)

  {

    m_fileName = convertNameToFile(name);

  }

src/pagedef.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ class PageDef : public Definition 
   ~PageDef();



    // setters

    void setFileName(const char *name);

    void setFileName(const char *name,bool dontEscape);

    void setShowToc(bool b);



    // getters

src/util.cpp

+2 −2
Original line number Diff line number Diff line
@@ -6316,11 +6316,11 @@ PageDef *addRelatedPage(const char *name,const QCString &ptitle, 
    if (tagInfo)

    {

      pd->setReference(tagInfo->tagName);

      pd->setFileName(tagInfo->fileName);

      pd->setFileName(tagInfo->fileName,TRUE);

    }

    else

    {

      pd->setFileName(convertNameToFile(pd->name(),FALSE,TRUE));

      pd->setFileName(convertNameToFile(pd->name(),FALSE,TRUE),FALSE);

    }



    //printf("Appending page `%s'\n",baseName.data());