summaryrefslogtreecommitdiff
path: root/src/groupdef.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/groupdef.cpp')
-rw-r--r--src/groupdef.cpp67
1 files changed, 30 insertions, 37 deletions
diff --git a/src/groupdef.cpp b/src/groupdef.cpp
index 7a74c65..6b6d659 100644
--- a/src/groupdef.cpp
+++ b/src/groupdef.cpp
@@ -61,7 +61,7 @@ GroupDef::GroupDef(const char *df,int dl,const char *na,const char *t,
}
else
{
- fileName = (QCString)"group_"+na;
+ fileName = convertNameToFile(QCString("group_")+na);
}
setGroupTitle( t );
memberGroupSDict = new MemberGroupSDict;
@@ -71,7 +71,7 @@ GroupDef::GroupDef(const char *df,int dl,const char *na,const char *t,
visited = 0;
groupScope = 0;
- m_subGrouping=Config_getBool("SUBGROUPING");
+ m_subGrouping=Config_getBool(SUBGROUPING);
}
GroupDef::~GroupDef()
@@ -137,7 +137,7 @@ void GroupDef::findSectionsInDocumentation()
void GroupDef::addFile(const FileDef *def)
{
- static bool sortBriefDocs = Config_getBool("SORT_BRIEF_DOCS");
+ static bool sortBriefDocs = Config_getBool(SORT_BRIEF_DOCS);
if (def->isHidden()) return;
updateLanguage(def);
if (sortBriefDocs)
@@ -148,7 +148,7 @@ void GroupDef::addFile(const FileDef *def)
bool GroupDef::addClass(const ClassDef *cd)
{
- static bool sortBriefDocs = Config_getBool("SORT_BRIEF_DOCS");
+ static bool sortBriefDocs = Config_getBool(SORT_BRIEF_DOCS);
if (cd->isHidden()) return FALSE;
updateLanguage(cd);
QCString qn = cd->name();
@@ -196,7 +196,7 @@ bool GroupDef::addClass(const ClassDef *cd)
bool GroupDef::addNamespace(const NamespaceDef *def)
{
- static bool sortBriefDocs = Config_getBool("SORT_BRIEF_DOCS");
+ static bool sortBriefDocs = Config_getBool(SORT_BRIEF_DOCS);
if (def->isHidden()) return FALSE;
updateLanguage(def);
if (namespaceSDict->find(def->name())==0)
@@ -213,7 +213,7 @@ bool GroupDef::addNamespace(const NamespaceDef *def)
void GroupDef::addDir(const DirDef *def)
{
if (def->isHidden()) return;
- if (Config_getBool("SORT_BRIEF_DOCS"))
+ if (Config_getBool(SORT_BRIEF_DOCS))
dirList->inSort(def);
else
dirList->append(def);
@@ -532,7 +532,7 @@ bool GroupDef::findGroup(const GroupDef *def) const
void GroupDef::addGroup(const GroupDef *def)
{
//printf("adding group `%s' to group `%s'\n",def->name().data(),name().data());
- //if (Config_getBool("SORT_MEMBER_DOCS"))
+ //if (Config_getBool(SORT_MEMBER_DOCS))
// groupList->inSort(def);
//else
groupList->append(def);
@@ -707,7 +707,7 @@ void GroupDef::writeTagFile(FTextStream &tagFile)
void GroupDef::writeDetailedDescription(OutputList &ol,const QCString &title)
{
- if ((!briefDescription().isEmpty() && Config_getBool("REPEAT_BRIEF"))
+ if ((!briefDescription().isEmpty() && Config_getBool(REPEAT_BRIEF))
|| !documentation().isEmpty() || !inbodyDocumentation().isEmpty()
)
{
@@ -727,12 +727,12 @@ void GroupDef::writeDetailedDescription(OutputList &ol,const QCString &title)
}
// repeat brief description
- if (!briefDescription().isEmpty() && Config_getBool("REPEAT_BRIEF"))
+ if (!briefDescription().isEmpty() && Config_getBool(REPEAT_BRIEF))
{
ol.generateDoc(briefFile(),briefLine(),this,0,briefDescription(),FALSE,FALSE);
}
// write separator between brief and details
- if (!briefDescription().isEmpty() && Config_getBool("REPEAT_BRIEF") &&
+ if (!briefDescription().isEmpty() && Config_getBool(REPEAT_BRIEF) &&
!documentation().isEmpty())
{
ol.pushGeneratorState();
@@ -762,7 +762,7 @@ void GroupDef::writeDetailedDescription(OutputList &ol,const QCString &title)
void GroupDef::writeBriefDescription(OutputList &ol)
{
- if (!briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC"))
+ if (!briefDescription().isEmpty() && Config_getBool(BRIEF_MEMBER_DESC))
{
DocRoot *rootNode = validatingParseDoc(briefFile(),briefLine(),this,0,
briefDescription(),TRUE,FALSE,0,TRUE,FALSE);
@@ -775,7 +775,7 @@ void GroupDef::writeBriefDescription(OutputList &ol)
ol.writeString(" \n");
ol.enable(OutputGenerator::RTF);
- if (Config_getBool("REPEAT_BRIEF") ||
+ if (Config_getBool(REPEAT_BRIEF) ||
!documentation().isEmpty()
)
{
@@ -793,7 +793,7 @@ void GroupDef::writeBriefDescription(OutputList &ol)
void GroupDef::writeGroupGraph(OutputList &ol)
{
- if (Config_getBool("HAVE_DOT") /*&& Config_getBool("GROUP_GRAPHS")*/ )
+ if (Config_getBool(HAVE_DOT) /*&& Config_getBool(GROUP_GRAPHS)*/ )
{
DotGroupCollaboration graph(this);
if (!graph.isTrivial())
@@ -831,7 +831,7 @@ void GroupDef::writeFiles(OutputList &ol,const QCString &title)
ol.insertMemberAlign();
ol.writeObjectLink(fd->getReference(),fd->getOutputFileBase(),0,fd->name());
ol.endMemberItem();
- if (!fd->briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC"))
+ if (!fd->briefDescription().isEmpty() && Config_getBool(BRIEF_MEMBER_DESC))
{
ol.startMemberDescription(fd->getOutputFileBase());
ol.generateDoc(briefFile(),briefLine(),fd,0,fd->briefDescription(),FALSE,FALSE,0,TRUE,FALSE);
@@ -868,7 +868,7 @@ void GroupDef::writeNestedGroups(OutputList &ol,const QCString &title)
ol.parseText(title);
ol.endMemberHeader();
ol.startMemberList();
- if (Config_getBool("SORT_GROUP_NAMES"))
+ if (Config_getBool(SORT_GROUP_NAMES))
{
groupList->sort();
}
@@ -886,7 +886,7 @@ void GroupDef::writeNestedGroups(OutputList &ol,const QCString &title)
ol.insertMemberAlign();
ol.writeObjectLink(gd->getReference(),gd->getOutputFileBase(),0,gd->groupTitle());
ol.endMemberItem();
- if (!gd->briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC"))
+ if (!gd->briefDescription().isEmpty() && Config_getBool(BRIEF_MEMBER_DESC))
{
ol.startMemberDescription(gd->getOutputFileBase());
ol.generateDoc(briefFile(),briefLine(),gd,0,gd->briefDescription(),FALSE,FALSE,0,TRUE,FALSE);
@@ -919,7 +919,7 @@ void GroupDef::writeDirs(OutputList &ol,const QCString &title)
ol.insertMemberAlign();
ol.writeObjectLink(dd->getReference(),dd->getOutputFileBase(),0,dd->shortName());
ol.endMemberItem();
- if (!dd->briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC"))
+ if (!dd->briefDescription().isEmpty() && Config_getBool(BRIEF_MEMBER_DESC))
{
ol.startMemberDescription(dd->getOutputFileBase());
ol.generateDoc(briefFile(),briefLine(),dd,0,dd->briefDescription(),FALSE,FALSE,0,TRUE,FALSE);
@@ -995,7 +995,7 @@ void GroupDef::endMemberDeclarations(OutputList &ol)
void GroupDef::startMemberDocumentation(OutputList &ol)
{
//printf("** GroupDef::startMemberDocumentation()\n");
- if (Config_getBool("SEPARATE_MEMBER_PAGES"))
+ if (Config_getBool(SEPARATE_MEMBER_PAGES))
{
ol.pushGeneratorState();
ol.disable(OutputGenerator::Html);
@@ -1006,7 +1006,7 @@ void GroupDef::startMemberDocumentation(OutputList &ol)
void GroupDef::endMemberDocumentation(OutputList &ol)
{
//printf("** GroupDef::endMemberDocumentation()\n");
- if (Config_getBool("SEPARATE_MEMBER_PAGES"))
+ if (Config_getBool(SEPARATE_MEMBER_PAGES))
{
ol.popGeneratorState();
Doxygen::suppressDocWarnings = FALSE;
@@ -1021,7 +1021,7 @@ void GroupDef::writeAuthorSection(OutputList &ol)
ol.startGroupHeader();
ol.parseText(theTranslator->trAuthor(TRUE,TRUE));
ol.endGroupHeader();
- ol.parseText(theTranslator->trGeneratedAutomatically(Config_getString("PROJECT_NAME")));
+ ol.parseText(theTranslator->trGeneratedAutomatically(Config_getString(PROJECT_NAME)));
ol.popGeneratorState();
}
@@ -1072,7 +1072,7 @@ void GroupDef::writeSummaryLinks(OutputList &ol)
void GroupDef::writeDocumentation(OutputList &ol)
{
- //static bool generateTreeView = Config_getBool("GENERATE_TREEVIEW");
+ //static bool generateTreeView = Config_getBool(GENERATE_TREEVIEW);
ol.pushGeneratorState();
startFile(ol,getOutputFileBase(),name(),title,HLI_Modules);
@@ -1234,7 +1234,7 @@ void GroupDef::writeDocumentation(OutputList &ol)
ol.popGeneratorState();
- if (Config_getBool("SEPARATE_MEMBER_PAGES"))
+ if (Config_getBool(SEPARATE_MEMBER_PAGES))
{
allMemberList->sort();
writeMemberPages(ol);
@@ -1262,7 +1262,7 @@ void GroupDef::writeMemberPages(OutputList &ol)
void GroupDef::writeQuickMemberLinks(OutputList &ol,MemberDef *currentMd) const
{
- static bool createSubDirs=Config_getBool("CREATE_SUBDIRS");
+ static bool createSubDirs=Config_getBool(CREATE_SUBDIRS);
ol.writeString(" <div class=\"navtab\">\n");
ol.writeString(" <table>\n");
@@ -1509,16 +1509,9 @@ void addExampleToGroups(Entry *root,PageDef *eg)
}
}
-QCString GroupDef::getOutputFileBase() const
-{
- if (isReference())
- {
- return fileName;
- }
- else
- {
- return convertNameToFile(fileName);
- }
+QCString GroupDef::getOutputFileBase() const
+{
+ return fileName;
}
void GroupDef::addListReferences()
@@ -1571,8 +1564,8 @@ MemberList *GroupDef::createMemberList(MemberListType lt)
void GroupDef::addMemberToList(MemberListType lt,MemberDef *md)
{
- static bool sortBriefDocs = Config_getBool("SORT_BRIEF_DOCS");
- static bool sortMemberDocs = Config_getBool("SORT_MEMBER_DOCS");
+ static bool sortBriefDocs = Config_getBool(SORT_BRIEF_DOCS);
+ static bool sortMemberDocs = Config_getBool(SORT_MEMBER_DOCS);
MemberList *ml = createMemberList(lt);
ml->setNeedsSorting(
((ml->listType()&MemberListType_declarationLists) && sortBriefDocs) ||
@@ -1606,7 +1599,7 @@ MemberList *GroupDef::getMemberList(MemberListType lt) const
void GroupDef::writeMemberDeclarations(OutputList &ol,MemberListType lt,const QCString &title)
{
- static bool optimizeVhdl = Config_getBool("OPTIMIZE_OUTPUT_VHDL");
+ static bool optimizeVhdl = Config_getBool(OPTIMIZE_OUTPUT_VHDL);
MemberList * ml = getMemberList(lt);
if (optimizeVhdl && ml)
@@ -1659,7 +1652,7 @@ void GroupDef::updateLanguage(const Definition *d)
bool GroupDef::hasDetailedDescription() const
{
- static bool repeatBrief = Config_getBool("REPEAT_BRIEF");
+ static bool repeatBrief = Config_getBool(REPEAT_BRIEF);
return ((!briefDescription().isEmpty() && repeatBrief) ||
!documentation().isEmpty());
}