Skip to content

Commit 0d4551b

Browse files
albert-githubalbert-github
committed
Make SrcLangExt an enum class
Make `SrcLangExt` an `enum class` so no no numbers can be used..
1 parent 48a3670 commit 0d4551b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+446
-446
lines changed

‎src/clangparser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ void ClangTUParser::parse()
180180
// we use the source file to detected the language. Detection will fail if you
181181
// pass a bunch of .h files containing ObjC code, and no sources :-(
182182
SrcLangExt lang = getLanguageFromFileName(fileName);
183-
if (lang==SrcLangExt_ObjC || p->detectedLang!=DetectedLang::Cpp)
183+
if (lang==SrcLangExt::ObjC || p->detectedLang!=DetectedLang::Cpp)
184184
{
185185
QCString fn = fileName.lower();
186186
if (p->detectedLang!=DetectedLang::Cpp &&

‎src/classdef.cpp

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static QCString makeDisplayName(const ClassDef *cd,bool includeScope)
112112
SrcLangExt lang = cd->getLanguage();
113113
//bool vhdlOpt = Config_getBool(OPTIMIZE_OUTPUT_VHDL);
114114
QCString n;
115-
if (lang==SrcLangExt_VHDL)
115+
if (lang==SrcLangExt::VHDL)
116116
{
117117
n = VhdlDocGen::getClassName(cd);
118118
}
@@ -147,7 +147,7 @@ static QCString makeDisplayName(const ClassDef *cd,bool includeScope)
147147

148148
static QCString getCompoundTypeString(SrcLangExt lang,ClassDef::CompoundType compType,bool isJavaEnum)
149149
{
150-
if (lang==SrcLangExt_Fortran)
150+
if (lang==SrcLangExt::Fortran)
151151
{
152152
switch (compType)
153153
{
@@ -168,7 +168,7 @@ static QCString getCompoundTypeString(SrcLangExt lang,ClassDef::CompoundType com
168168
case ClassDef::Class: return isJavaEnum ? "enum" : "class";
169169
case ClassDef::Struct: return "struct";
170170
case ClassDef::Union: return "union";
171-
case ClassDef::Interface: return lang==SrcLangExt_ObjC ? "class" : "interface";
171+
case ClassDef::Interface: return lang==SrcLangExt::ObjC ? "class" : "interface";
172172
case ClassDef::Protocol: return "protocol";
173173
case ClassDef::Category: return "category";
174174
case ClassDef::Exception: return "exception";
@@ -826,7 +826,7 @@ void ClassDefImpl::IMPL::init(const QCString &defFileName, const QCString &name,
826826

827827
// we cannot use getLanguage at this point, as setLanguage has not been called.
828828
SrcLangExt lang = getLanguageFromFileName(defFileName);
829-
if ((lang==SrcLangExt_Cpp || lang==SrcLangExt_ObjC) && guessSection(defFileName).isSource())
829+
if ((lang==SrcLangExt::Cpp || lang==SrcLangExt::ObjC) && guessSection(defFileName).isSource())
830830
{
831831
isLocal=TRUE;
832832
}
@@ -923,7 +923,7 @@ void ClassDefImpl::internalInsertMember(MemberDef *md,
923923
//printf("%s:insertInternalMember(%s) isHidden()=%d\n",qPrint(name()),qPrint(md->name()),md->isHidden());
924924
if (md->isHidden()) return;
925925

926-
if (getLanguage()==SrcLangExt_VHDL)
926+
if (getLanguage()==SrcLangExt::VHDL)
927927
{
928928
QCString title=theTranslator->trVhdlType(md->getVhdlSpecifiers(),FALSE);
929929
m_impl->vhdlSummaryTitles.insert(title.str());
@@ -1457,7 +1457,7 @@ void ClassDefImpl::writeDetailedDocumentationBody(OutputList &ol) const
14571457

14581458
ol.startTextBlock();
14591459

1460-
if (getLanguage()==SrcLangExt_Cpp)
1460+
if (getLanguage()==SrcLangExt::Cpp)
14611461
{
14621462
writeTemplateSpec(ol,this,compoundTypeString(),getLanguage());
14631463
}
@@ -1549,10 +1549,10 @@ QCString ClassDefImpl::generatedFromFiles() const
15491549
QCString result;
15501550
SrcLangExt lang = getLanguage();
15511551
size_t numFiles = m_impl->files.size();
1552-
if (lang==SrcLangExt_Fortran)
1552+
if (lang==SrcLangExt::Fortran)
15531553
{
15541554
result = theTranslator->trGeneratedFromFilesFortran(
1555-
getLanguage()==SrcLangExt_ObjC && m_impl->compType==Interface ? Class : m_impl->compType,
1555+
getLanguage()==SrcLangExt::ObjC && m_impl->compType==Interface ? Class : m_impl->compType,
15561556
numFiles==1);
15571557
}
15581558
else if (isJavaEnum())
@@ -1570,7 +1570,7 @@ QCString ClassDefImpl::generatedFromFiles() const
15701570
else
15711571
{
15721572
result = theTranslator->trGeneratedFromFiles(
1573-
getLanguage()==SrcLangExt_ObjC && m_impl->compType==Interface ? Class : m_impl->compType,
1573+
getLanguage()==SrcLangExt::ObjC && m_impl->compType==Interface ? Class : m_impl->compType,
15741574
numFiles==1);
15751575
}
15761576
return result;
@@ -2074,7 +2074,7 @@ void ClassDefImpl::writeSummaryLinks(OutputList &ol) const
20742074
bool first=TRUE;
20752075
SrcLangExt lang = getLanguage();
20762076

2077-
if (lang!=SrcLangExt_VHDL)
2077+
if (lang!=SrcLangExt::VHDL)
20782078
{
20792079
for (const auto &lde : LayoutDocManager::instance().docEntries(LayoutDocManager::Class))
20802080
{
@@ -2454,13 +2454,13 @@ void ClassDefImpl::writeDeclarationLink(OutputList &ol,bool &found,const QCStrin
24542454
{
24552455
ol.parseText(header);
24562456
}
2457-
else if (lang==SrcLangExt_VHDL)
2457+
else if (lang==SrcLangExt::VHDL)
24582458
{
24592459
ol.parseText(theTranslator->trVhdlType(VhdlSpecifier::ARCHITECTURE,FALSE));
24602460
}
24612461
else
24622462
{
2463-
ol.parseText(lang==SrcLangExt_Fortran ?
2463+
ol.parseText(lang==SrcLangExt::Fortran ?
24642464
theTranslator->trDataTypes() :
24652465
theTranslator->trCompounds());
24662466
}
@@ -2473,7 +2473,7 @@ void ClassDefImpl::writeDeclarationLink(OutputList &ol,bool &found,const QCStrin
24732473
QCString ctype = compoundTypeString();
24742474
QCString cname = displayName(!localNames);
24752475

2476-
if (lang!=SrcLangExt_VHDL) // for VHDL we swap the name and the type
2476+
if (lang!=SrcLangExt::VHDL) // for VHDL we swap the name and the type
24772477
{
24782478
if (isSliceLocal())
24792479
{
@@ -2497,7 +2497,7 @@ void ClassDefImpl::writeDeclarationLink(OutputList &ol,bool &found,const QCStrin
24972497
ol.docify(cname);
24982498
ol.endBold();
24992499
}
2500-
if (lang==SrcLangExt_VHDL) // now write the type
2500+
if (lang==SrcLangExt::VHDL) // now write the type
25012501
{
25022502
ol.writeString(" ");
25032503
ol.insertMemberAlign();
@@ -2535,7 +2535,7 @@ void ClassDefImpl::addClassAttributes(OutputList &ol) const
25352535
if (isSealed()) sl.push_back("sealed");
25362536
if (isAbstract()) sl.push_back("abstract");
25372537
if (isExported()) sl.push_back("export");
2538-
if (getLanguage()==SrcLangExt_IDL && isPublished()) sl.push_back("published");
2538+
if (getLanguage()==SrcLangExt::IDL && isPublished()) sl.push_back("published");
25392539

25402540
for (const auto &sx : m_impl->qualifiers)
25412541
{
@@ -2583,7 +2583,7 @@ void ClassDefImpl::writeDocumentationContents(OutputList &ol,const QCString & /*
25832583
writeBriefDescription(ol,exampleFlag);
25842584
break;
25852585
case LayoutDocEntry::ClassIncludes:
2586-
if (lang==SrcLangExt_Slice)
2586+
if (lang==SrcLangExt::Slice)
25872587
{
25882588
writeIncludeFilesForSlice(ol);
25892589
}
@@ -2714,19 +2714,19 @@ QCString ClassDefImpl::title() const
27142714
QCString pageTitle;
27152715
SrcLangExt lang = getLanguage();
27162716

2717-
if (lang==SrcLangExt_Fortran)
2717+
if (lang==SrcLangExt::Fortran)
27182718
{
27192719
pageTitle = theTranslator->trCompoundReferenceFortran(displayName(),
27202720
m_impl->compType,
27212721
!m_impl->tempArgs.empty());
27222722
}
2723-
else if (lang==SrcLangExt_Slice)
2723+
else if (lang==SrcLangExt::Slice)
27242724
{
27252725
pageTitle = theTranslator->trCompoundReferenceSlice(displayName(),
27262726
m_impl->compType,
27272727
isSliceLocal());
27282728
}
2729-
else if (lang==SrcLangExt_VHDL)
2729+
else if (lang==SrcLangExt::VHDL)
27302730
{
27312731
pageTitle = theTranslator->trCustomReference(VhdlDocGen::getClassTitle(this));
27322732
}
@@ -2751,7 +2751,7 @@ QCString ClassDefImpl::title() const
27512751
else
27522752
{
27532753
pageTitle = theTranslator->trCompoundReference(displayName(),
2754-
m_impl->compType == Interface && getLanguage()==SrcLangExt_ObjC ? Class : m_impl->compType,
2754+
m_impl->compType == Interface && getLanguage()==SrcLangExt::ObjC ? Class : m_impl->compType,
27552755
!m_impl->tempArgs.empty());
27562756
}
27572757
}
@@ -3110,18 +3110,18 @@ void ClassDefImpl::writeMemberList(OutputList &ol) const
31103110
}
31113111
SrcLangExt lang = md->getLanguage();
31123112
if (
3113-
(prot!=Protection::Public || (virt!=Specifier::Normal && getLanguage()!=SrcLangExt_ObjC) ||
3113+
(prot!=Protection::Public || (virt!=Specifier::Normal && getLanguage()!=SrcLangExt::ObjC) ||
31143114
md->isFriend() || md->isRelated() || md->isExplicit() ||
31153115
md->isMutable() || (md->isInline() && Config_getBool(INLINE_INFO)) ||
31163116
md->isSignal() || md->isSlot() ||
3117-
(getLanguage()==SrcLangExt_IDL &&
3117+
(getLanguage()==SrcLangExt::IDL &&
31183118
(md->isOptional() || md->isAttribute() || md->isUNOProperty())) ||
3119-
md->isStatic() || lang==SrcLangExt_VHDL
3119+
md->isStatic() || lang==SrcLangExt::VHDL
31203120
)
31213121
&& memberWritten)
31223122
{
31233123
StringVector sl;
3124-
if (lang==SrcLangExt_VHDL)
3124+
if (lang==SrcLangExt::VHDL)
31253125
{
31263126
sl.push_back(theTranslator->trVhdlType(md->getVhdlSpecifiers(),TRUE).str()); //append vhdl type
31273127
}
@@ -3136,7 +3136,7 @@ void ClassDefImpl::writeMemberList(OutputList &ol) const
31363136
if (prot==Protection::Protected) sl.push_back("protected");
31373137
else if (prot==Protection::Private) sl.push_back("private");
31383138
else if (prot==Protection::Package) sl.push_back("package");
3139-
if (virt==Specifier::Virtual && getLanguage()!=SrcLangExt_ObjC)
3139+
if (virt==Specifier::Virtual && getLanguage()!=SrcLangExt::ObjC)
31403140
sl.push_back("virtual");
31413141
else if (virt==Specifier::Pure) sl.push_back("pure virtual");
31423142
if (md->isStatic()) sl.push_back("static");
@@ -3542,7 +3542,7 @@ void ClassDefImpl::mergeMembers()
35423542
{
35433543
// merge the members in the base class of this inheritance branch first
35443544
bClass->mergeMembers();
3545-
if (bClass->getLanguage()==SrcLangExt_Python) continue; // python does not have member overloading, see issue 8480
3545+
if (bClass->getLanguage()==SrcLangExt::Python) continue; // python does not have member overloading, see issue 8480
35463546

35473547
const MemberNameInfoLinkedMap &srcMnd = bClass->memberNameInfoLinkedMap();
35483548
MemberNameInfoLinkedMap &dstMnd = m_impl->allMemberNameInfoLinkedMap;
@@ -4311,7 +4311,7 @@ int ClassDefImpl::countMemberDeclarations(MemberListType lt,const ClassDef *inhe
43114311
int count=0;
43124312
MemberList * ml = getMemberList(lt);
43134313
MemberList * ml2 = getMemberList(static_cast<MemberListType>(lt2));
4314-
if (getLanguage()!=SrcLangExt_VHDL) // use specific declarations function
4314+
if (getLanguage()!=SrcLangExt::VHDL) // use specific declarations function
43154315
{
43164316
if (ml)
43174317
{
@@ -4546,7 +4546,7 @@ void ClassDefImpl::writeMemberDeclarations(OutputList &ol,ClassDefSet &visitedCl
45464546
//printf("%s: ClassDefImpl::writeMemberDeclarations lt=%d lt2=%d\n",qPrint(name()),lt,lt2);
45474547
MemberList * ml = getMemberList(lt);
45484548
MemberList * ml2 = getMemberList(static_cast<MemberListType>(lt2));
4549-
if (getLanguage()==SrcLangExt_VHDL) // use specific declarations function
4549+
if (getLanguage()==SrcLangExt::VHDL) // use specific declarations function
45504550
{
45514551
static const ClassDef *cdef;
45524552
if (cdef!=this)
@@ -4771,17 +4771,17 @@ bool ClassDefImpl::isInterface() const
47714771

47724772
bool ClassDefImpl::isObjectiveC() const
47734773
{
4774-
return getLanguage()==SrcLangExt_ObjC;
4774+
return getLanguage()==SrcLangExt::ObjC;
47754775
}
47764776

47774777
bool ClassDefImpl::isFortran() const
47784778
{
4779-
return getLanguage()==SrcLangExt_Fortran;
4779+
return getLanguage()==SrcLangExt::Fortran;
47804780
}
47814781

47824782
bool ClassDefImpl::isCSharp() const
47834783
{
4784-
return getLanguage()==SrcLangExt_CSharp;
4784+
return getLanguage()==SrcLangExt::CSharp;
47854785
}
47864786

47874787
ClassDef *ClassDefImpl::categoryOf() const
@@ -4817,7 +4817,7 @@ void ClassDefImpl::setSubGrouping(bool enabled)
48174817
void ClassDefImpl::setProtection(Protection p)
48184818
{
48194819
m_impl->prot=p;
4820-
if (getLanguage()==SrcLangExt_VHDL && VhdlDocGen::convert(p)==VhdlDocGen::ARCHITECTURECLASS)
4820+
if (getLanguage()==SrcLangExt::VHDL && VhdlDocGen::convert(p)==VhdlDocGen::ARCHITECTURECLASS)
48214821
{
48224822
m_impl->className = name();
48234823
}
@@ -5135,7 +5135,7 @@ bool classHasVisibleChildren(const ClassDef *cd)
51355135
{
51365136
BaseClassList bcl;
51375137

5138-
if (cd->getLanguage()==SrcLangExt_VHDL) // reverse baseClass/subClass relation
5138+
if (cd->getLanguage()==SrcLangExt::VHDL) // reverse baseClass/subClass relation
51395139
{
51405140
if (cd->baseClasses().empty()) return FALSE;
51415141
bcl=cd->baseClasses();

0 commit comments

Comments
 (0)