Commit 21d9bf2b authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

Merge branch 'master' of github.com:doxygen/doxygen

parents 836af2f9 a6083348

src/htmlgen.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -1683,7 +1683,7 @@ void HtmlGenerator::startFile(const char *name,const char *, 
  Doxygen::indexList->addIndexFile(fileName);

  Doxygen::indexList->addIndexFile(fileName);

  

  

  lastFile = fileName;

  lastFile = fileName;

  t << substituteHtmlKeywords(g_header,convertToHtml(title),relPath);

  t << substituteHtmlKeywords(g_header,convertToHtml(filterTitle(title)),relPath);





  t << "<!-- " << theTranslator->trGeneratedBy() << " Doxygen " 

  t << "<!-- " << theTranslator->trGeneratedBy() << " Doxygen " 

    << versionString << " -->" << endl;

    << versionString << " -->" << endl;

src/index.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -3102,7 +3102,7 @@ static void writePages(PageDef *pd,FTVHelp *ftv) 
    if (pd->title().isEmpty())

    if (pd->title().isEmpty())

      pageTitle=pd->name();

      pageTitle=pd->name();

    else

    else

      pageTitle=pd->title();

      pageTitle=filterTitle(pd->title());





    if (ftv)

    if (ftv)

    {

    {

src/namespacedef.cpp

+9 −1
Original line number Original line Diff line number Diff line
@@ -68,6 +68,10 @@ NamespaceDef::NamespaceDef(const char *df,int dl,int dc, 
  {

  {

    m_type = CONSTANT_GROUP;

    m_type = CONSTANT_GROUP;

  }

  }

  else if (type && !strcmp("library", type))

  {

    m_type = LIBRARY;

  }

  else

  else

  {

  {

    m_type = NAMESPACE;

    m_type = NAMESPACE;
@@ -1117,9 +1121,13 @@ QCString NamespaceDef::compoundTypeString() const 
    {

    {

      return "constants";

      return "constants";

    }

    }

    else if (isLibrary())

    {

      return "library";

    }

    else

    else

    {

    {

      err("Internal inconsistency: namespace in IDL not module or constant group\n");

      err("Internal inconsistency: namespace in IDL not module, library or constant group\n");

    }

    }

  }

  }

  return "";

  return "";

src/namespacedef.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -68,6 +68,7 @@ class NamespaceDef : public Definition 




    bool isConstantGroup() const { return CONSTANT_GROUP == m_type; }

    bool isConstantGroup() const { return CONSTANT_GROUP == m_type; }

    bool isModule()        const { return MODULE == m_type; }

    bool isModule()        const { return MODULE == m_type; }

    bool isLibrary() const { return LIBRARY == m_type; }





    bool isLinkableInProject() const;

    bool isLinkableInProject() const;

    bool isLinkable() const;

    bool isLinkable() const;
@@ -132,7 +133,7 @@ class NamespaceDef : public Definition 
    ClassSDict           *classSDict;

    ClassSDict           *classSDict;

    NamespaceSDict       *namespaceSDict;

    NamespaceSDict       *namespaceSDict;

    bool                  m_subGrouping;

    bool                  m_subGrouping;

    enum { NAMESPACE, MODULE, CONSTANT_GROUP } m_type;

    enum { NAMESPACE, MODULE, CONSTANT_GROUP, LIBRARY } m_type;

    bool m_isPublished;

    bool m_isPublished;

};

};

src/perlmodgen.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -2125,7 +2125,7 @@ void PerlModGenerator::generatePerlModForPage(PageDef *pd) 
    

    

  SectionInfo *si = Doxygen::sectionDict->find(pd->name());

  SectionInfo *si = Doxygen::sectionDict->find(pd->name());

  if (si)

  if (si)

    m_output.addFieldQuotedString("title", si->title);

    m_output.addFieldQuotedString("title4", filterTitle(si->title));





  addPerlModDocBlock(m_output,"detailed",pd->docFile(),pd->docLine(),0,0,pd->documentation());

  addPerlModDocBlock(m_output,"detailed",pd->docFile(),pd->docLine(),0,0,pd->documentation());

  m_output.closeHash();

  m_output.closeHash();