Skip to content

Commit b6beef9

Browse files
committed
PR doxygen#11482 Reduce code duplication
1 parent 8e8257f commit b6beef9

File tree

2 files changed

+46
-89
lines changed

2 files changed

+46
-89
lines changed

src/classdef.cpp

Lines changed: 28 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -2885,88 +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-
if (Config_getBool(HIDE_COMPOUND_REFERENCE))
2891-
{
2892-
pageTitle = displayName();
2893-
}
2894-
else
2895-
{
2896-
pageTitle = theTranslator->trCompoundReferenceFortran(displayName(),
2897-
m_compType,
2898-
!m_tempArgs.empty());
2899-
}
2895+
pageTitle = getReferenceTitle([this](){
2896+
return theTranslator->trCompoundReferenceFortran(displayName(), m_compType, !m_tempArgs.empty());
2897+
});
29002898
}
29012899
else if (lang==SrcLangExt::Slice)
29022900
{
2903-
if (Config_getBool(HIDE_COMPOUND_REFERENCE))
2904-
{
2905-
pageTitle = displayName();
2906-
}
2907-
else
2908-
{
2909-
pageTitle = theTranslator->trCompoundReferenceSlice(displayName(),
2910-
m_compType,
2911-
isSliceLocal());
2912-
}
2901+
pageTitle = getReferenceTitle([this](){
2902+
return theTranslator->trCompoundReferenceSlice(displayName(), m_compType, isSliceLocal());
2903+
});
29132904
}
29142905
else if (lang==SrcLangExt::VHDL)
29152906
{
2916-
if (Config_getBool(HIDE_COMPOUND_REFERENCE))
2917-
{
2918-
pageTitle = VhdlDocGen::getClassName(this);
2919-
}
2920-
else
2921-
{
2922-
pageTitle = theTranslator->trCustomReference(VhdlDocGen::getClassTitle(this));
2923-
}
2907+
pageTitle = getReferenceTitle([this](){
2908+
return theTranslator->trCustomReference(VhdlDocGen::getClassTitle(this));
2909+
});
29242910
}
29252911
else if (isJavaEnum())
29262912
{
2927-
if (Config_getBool(HIDE_COMPOUND_REFERENCE))
2928-
{
2929-
pageTitle = displayName();
2930-
}
2931-
else
2932-
{
2933-
pageTitle = theTranslator->trEnumReference(displayName());
2934-
}
2913+
pageTitle = getReferenceTitle([this](){
2914+
return theTranslator->trEnumReference(displayName());
2915+
});
29352916
}
29362917
else if (m_compType==Service)
29372918
{
2938-
if (Config_getBool(HIDE_COMPOUND_REFERENCE))
2939-
{
2940-
pageTitle = displayName();
2941-
}
2942-
else
2943-
{
2944-
pageTitle = theTranslator->trServiceReference(displayName());
2945-
}
2919+
pageTitle = getReferenceTitle([this](){
2920+
return theTranslator->trServiceReference(displayName());
2921+
});
29462922
}
29472923
else if (m_compType==Singleton)
29482924
{
2949-
if (Config_getBool(HIDE_COMPOUND_REFERENCE))
2950-
{
2951-
pageTitle = displayName();
2952-
}
2953-
else
2954-
{
2955-
pageTitle = theTranslator->trSingletonReference(displayName());
2956-
}
2925+
pageTitle = getReferenceTitle([this](){
2926+
return theTranslator->trSingletonReference(displayName());
2927+
});
29572928
}
29582929
else
29592930
{
2960-
if (Config_getBool(HIDE_COMPOUND_REFERENCE))
2961-
{
2962-
pageTitle = displayName();
2963-
}
2964-
else
2965-
{
2966-
pageTitle = theTranslator->trCompoundReference(displayName(),
2967-
m_compType == Interface && getLanguage()==SrcLangExt::ObjC ? Class : m_compType,
2968-
!m_tempArgs.empty());
2969-
}
2931+
pageTitle = getReferenceTitle([this](){
2932+
return theTranslator->trCompoundReference(displayName(),
2933+
m_compType == Interface && getLanguage()==SrcLangExt::ObjC ? Class : m_compType,
2934+
!m_tempArgs.empty());
2935+
});
29702936
}
29712937
return pageTitle;
29722938
}

src/namespacedef.cpp

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1558,46 +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-
if (Config_getBool(HIDE_COMPOUND_REFERENCE))
1570-
{
1571-
pageTitle = displayName();
1572-
}
1573-
else
1574-
{
1575-
pageTitle = theTranslator->trModuleReference(displayName());
1576-
}
1575+
pageTitle = getReferenceTitle([this](){
1576+
return theTranslator->trModuleReference(displayName());
1577+
});
15771578
}
15781579
else if (lang==SrcLangExt::IDL)
15791580
{
1580-
if (Config_getBool(HIDE_COMPOUND_REFERENCE))
1581-
{
1582-
pageTitle = displayName();
1583-
}
1584-
else
1585-
{
1586-
pageTitle = isConstantGroup()
1587-
? theTranslator->trConstantGroupReference(displayName())
1588-
: theTranslator->trModuleReference(displayName());
1589-
}
1581+
pageTitle = getReferenceTitle([this](){
1582+
return isConstantGroup()
1583+
? theTranslator->trConstantGroupReference(displayName())
1584+
: theTranslator->trModuleReference(displayName());
1585+
});
15901586
}
15911587
else
15921588
{
1593-
if (Config_getBool(HIDE_COMPOUND_REFERENCE))
1594-
{
1595-
pageTitle = displayName();
1596-
}
1597-
else
1598-
{
1599-
pageTitle = theTranslator->trNamespaceReference(displayName());
1600-
}
1589+
pageTitle = getReferenceTitle([this](){
1590+
return theTranslator->trNamespaceReference(displayName());
1591+
});
16011592
}
16021593
return pageTitle;
16031594
}

0 commit comments

Comments
 (0)