Skip to content

Commit 6d6235d

Browse files
doxygendoxygen
committed
Merge branch 'albert-github-feature/bug_hide_compound_reference'
2 parents db86ee1 + b6beef9 commit 6d6235d

File tree

6 files changed

+124
-35
lines changed

6 files changed

+124
-35
lines changed

‎src/classdef.cpp‎

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2885,46 +2885,54 @@ QCString ClassDefImpl::title() const
28852885
QCString pageTitle;
28862886
SrcLangExt lang = getLanguage();
28872887

2888+
auto getReferenceTitle = [this](std::function<QCString()> translateFunc) -> QCString
2889+
{
2890+
return Config_getBool(HIDE_COMPOUND_REFERENCE) ? displayName() : translateFunc();
2891+
};
2892+
28882893
if (lang==SrcLangExt::Fortran)
28892894
{
2890-
pageTitle = theTranslator->trCompoundReferenceFortran(displayName(),
2891-
m_compType,
2892-
!m_tempArgs.empty());
2895+
pageTitle = getReferenceTitle([this](){
2896+
return theTranslator->trCompoundReferenceFortran(displayName(), m_compType, !m_tempArgs.empty());
2897+
});
28932898
}
28942899
else if (lang==SrcLangExt::Slice)
28952900
{
2896-
pageTitle = theTranslator->trCompoundReferenceSlice(displayName(),
2897-
m_compType,
2898-
isSliceLocal());
2901+
pageTitle = getReferenceTitle([this](){
2902+
return theTranslator->trCompoundReferenceSlice(displayName(), m_compType, isSliceLocal());
2903+
});
28992904
}
29002905
else if (lang==SrcLangExt::VHDL)
29012906
{
2902-
pageTitle = theTranslator->trCustomReference(VhdlDocGen::getClassTitle(this));
2907+
pageTitle = getReferenceTitle([this](){
2908+
return theTranslator->trCustomReference(VhdlDocGen::getClassTitle(this));
2909+
});
29032910
}
29042911
else if (isJavaEnum())
29052912
{
2906-
pageTitle = theTranslator->trEnumReference(displayName());
2913+
pageTitle = getReferenceTitle([this](){
2914+
return theTranslator->trEnumReference(displayName());
2915+
});
29072916
}
29082917
else if (m_compType==Service)
29092918
{
2910-
pageTitle = theTranslator->trServiceReference(displayName());
2919+
pageTitle = getReferenceTitle([this](){
2920+
return theTranslator->trServiceReference(displayName());
2921+
});
29112922
}
29122923
else if (m_compType==Singleton)
29132924
{
2914-
pageTitle = theTranslator->trSingletonReference(displayName());
2925+
pageTitle = getReferenceTitle([this](){
2926+
return theTranslator->trSingletonReference(displayName());
2927+
});
29152928
}
29162929
else
29172930
{
2918-
if (Config_getBool(HIDE_COMPOUND_REFERENCE))
2919-
{
2920-
pageTitle = displayName();
2921-
}
2922-
else
2923-
{
2924-
pageTitle = theTranslator->trCompoundReference(displayName(),
2925-
m_compType == Interface && getLanguage()==SrcLangExt::ObjC ? Class : m_compType,
2926-
!m_tempArgs.empty());
2927-
}
2931+
pageTitle = getReferenceTitle([this](){
2932+
return theTranslator->trCompoundReference(displayName(),
2933+
m_compType == Interface && getLanguage()==SrcLangExt::ObjC ? Class : m_compType,
2934+
!m_tempArgs.empty());
2935+
});
29282936
}
29292937
return pageTitle;
29302938
}

‎src/conceptdef.cpp‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,14 @@ const ModuleDef *ConceptDefImpl::getModuleDef() const
285285

286286
QCString ConceptDefImpl::title() const
287287
{
288-
return theTranslator->trConceptReference(displayName());
288+
if (Config_getBool(HIDE_COMPOUND_REFERENCE))
289+
{
290+
return displayName();
291+
}
292+
else
293+
{
294+
return theTranslator->trConceptReference(displayName());
295+
}
289296
}
290297

291298
int ConceptDefImpl::groupId() const
@@ -513,7 +520,15 @@ void ConceptDefImpl::addConceptAttributes(OutputList &ol) const
513520
void ConceptDefImpl::writeDocumentation(OutputList &ol)
514521
{
515522
bool generateTreeView = Config_getBool(GENERATE_TREEVIEW);
516-
QCString pageTitle = theTranslator->trConceptReference(displayName());
523+
QCString pageTitle;
524+
if (Config_getBool(HIDE_COMPOUND_REFERENCE))
525+
{
526+
pageTitle = displayName();
527+
}
528+
else
529+
{
530+
pageTitle = theTranslator->trConceptReference(displayName());
531+
}
517532
startFile(ol,getOutputFileBase(),name(),pageTitle,HighlightedItem::ConceptVisible,!generateTreeView);
518533

519534
// ---- navigation part

‎src/dirdef.cpp‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,14 @@ void DirDefImpl::endMemberDeclarations(OutputList &ol)
486486

487487
QCString DirDefImpl::shortTitle() const
488488
{
489-
return theTranslator->trDirReference(m_shortName);
489+
if (Config_getBool(HIDE_COMPOUND_REFERENCE))
490+
{
491+
return m_shortName;
492+
}
493+
else
494+
{
495+
return theTranslator->trDirReference(m_shortName);
496+
}
490497
}
491498

492499
bool DirDefImpl::hasDetailedDescription() const
@@ -539,7 +546,15 @@ void DirDefImpl::writeDocumentation(OutputList &ol)
539546
bool generateTreeView = Config_getBool(GENERATE_TREEVIEW);
540547
ol.pushGeneratorState();
541548

542-
QCString title=theTranslator->trDirReference(m_dispName);
549+
QCString title;
550+
if (Config_getBool(HIDE_COMPOUND_REFERENCE))
551+
{
552+
title=m_dispName;
553+
}
554+
else
555+
{
556+
title=theTranslator->trDirReference(m_dispName);
557+
}
543558
AUTO_TRACE("title={}",title);
544559
startFile(ol,getOutputFileBase(),name(),title,HighlightedItem::Files,!generateTreeView);
545560

‎src/filedef.cpp‎

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,15 @@ void FileDefImpl::writeDocumentation(OutputList &ol)
867867
versionTitle=("("+m_fileVersion+")");
868868
}
869869
QCString title = m_docname+versionTitle;
870-
QCString pageTitle=theTranslator->trFileReference(m_docname);
870+
QCString pageTitle;
871+
if (Config_getBool(HIDE_COMPOUND_REFERENCE))
872+
{
873+
pageTitle=m_docname;
874+
}
875+
else
876+
{
877+
pageTitle=theTranslator->trFileReference(m_docname);
878+
}
871879

872880
if (getDirDef())
873881
{
@@ -880,12 +888,28 @@ void FileDefImpl::writeDocumentation(OutputList &ol)
880888
startTitle(ol,getOutputFileBase(),this);
881889
ol.pushGeneratorState();
882890
ol.disableAllBut(OutputType::Html);
883-
ol.parseText(theTranslator->trFileReference(displayName())); // Html only
891+
if (Config_getBool(HIDE_COMPOUND_REFERENCE))
892+
{
893+
ol.parseText(displayName()); // Html only
894+
}
895+
else
896+
{
897+
ol.parseText(theTranslator->trFileReference(displayName())); // Html only
898+
}
884899
ol.enableAll();
885900
ol.disable(OutputType::Html);
886-
ol.parseText(Config_getBool(FULL_PATH_NAMES) ? // other output formats
887-
pageTitle :
888-
theTranslator->trFileReference(name()));
901+
if (Config_getBool(HIDE_COMPOUND_REFERENCE))
902+
{
903+
ol.parseText(Config_getBool(FULL_PATH_NAMES) ? // other output formats
904+
pageTitle :
905+
name());
906+
}
907+
else
908+
{
909+
ol.parseText(Config_getBool(FULL_PATH_NAMES) ? // other output formats
910+
pageTitle :
911+
theTranslator->trFileReference(name()));
912+
}
889913
ol.popGeneratorState();
890914
addGroupListToTitle(ol,this);
891915
endTitle(ol,getOutputFileBase(),title);
@@ -1819,7 +1843,14 @@ void FileDefImpl::getAllIncludeFilesRecursively(StringVector &incFiles) const
18191843

18201844
QCString FileDefImpl::title() const
18211845
{
1822-
return theTranslator->trFileReference(name());
1846+
if (Config_getBool(HIDE_COMPOUND_REFERENCE))
1847+
{
1848+
return name();
1849+
}
1850+
else
1851+
{
1852+
return theTranslator->trFileReference(name());
1853+
}
18231854
}
18241855

18251856
QCString FileDefImpl::fileVersion() const

‎src/moduledef.cpp‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,15 @@ void ModuleDefImpl::writeDocumentation(OutputList &ol)
342342
ol.pushGeneratorState();
343343
AUTO_TRACE("%s file=%s",name(),getDefFileName());
344344
SrcLangExt lang = getLanguage();
345-
QCString pageTitle = theTranslator->trModuleReference(displayName());
345+
QCString pageTitle;
346+
if (Config_getBool(HIDE_COMPOUND_REFERENCE))
347+
{
348+
pageTitle = displayName();
349+
}
350+
else
351+
{
352+
pageTitle = theTranslator->trModuleReference(displayName());
353+
}
346354
startFile(ol,getOutputFileBase(),name(),pageTitle,HighlightedItem::ModuleVisible,false,QCString(),0);
347355

348356
// ---- title part

‎src/namespacedef.cpp‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1558,25 +1558,37 @@ const MemberDef * NamespaceDefImpl::getMemberByName(const QCString &n) const
15581558

15591559
QCString NamespaceDefImpl::title() const
15601560
{
1561-
SrcLangExt lang = getLanguage();
15621561
QCString pageTitle;
1562+
SrcLangExt lang = getLanguage();
1563+
1564+
auto getReferenceTitle = [this](std::function<QCString()> translateFunc) -> QCString
1565+
{
1566+
return Config_getBool(HIDE_COMPOUND_REFERENCE) ? displayName() : translateFunc();
1567+
};
1568+
15631569
if (lang==SrcLangExt::Java)
15641570
{
15651571
pageTitle = theTranslator->trPackage(displayName());
15661572
}
15671573
else if (lang==SrcLangExt::Fortran || lang==SrcLangExt::Slice)
15681574
{
1569-
pageTitle = theTranslator->trModuleReference(displayName());
1575+
pageTitle = getReferenceTitle([this](){
1576+
return theTranslator->trModuleReference(displayName());
1577+
});
15701578
}
15711579
else if (lang==SrcLangExt::IDL)
15721580
{
1573-
pageTitle = isConstantGroup()
1581+
pageTitle = getReferenceTitle([this](){
1582+
return isConstantGroup()
15741583
? theTranslator->trConstantGroupReference(displayName())
15751584
: theTranslator->trModuleReference(displayName());
1585+
});
15761586
}
15771587
else
15781588
{
1579-
pageTitle = theTranslator->trNamespaceReference(displayName());
1589+
pageTitle = getReferenceTitle([this](){
1590+
return theTranslator->trNamespaceReference(displayName());
1591+
});
15801592
}
15811593
return pageTitle;
15821594
}

0 commit comments

Comments
 (0)