diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/classdef.cpp | 12 | ||||
| -rw-r--r-- | src/classdef.h | 12 | ||||
| -rw-r--r-- | src/code.l | 16 | ||||
| -rw-r--r-- | src/memberdef.cpp | 11 | ||||
| -rw-r--r-- | src/memberdef.h | 5 | ||||
| -rw-r--r-- | src/namespacedef.h | 4 |
6 files changed, 16 insertions, 44 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp index a48df76..621b98c 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -2924,7 +2924,7 @@ void ClassDef::setTemplateArguments(ArgumentList *al) /*! Returns \c TRUE iff this class or a class inheriting from this class * is \e not defined in an external tag file. */ -bool ClassDef::hasNonReferenceSuperClass() +bool ClassDef::hasNonReferenceSuperClass() const { bool found=!isReference() && isLinkableInProject() && !isHidden(); if (found) @@ -3047,7 +3047,7 @@ bool ClassDef::isLinkable() const /*! the class is visible in a class diagram, or class hierarchy */ -bool ClassDef::isVisibleInHierarchy() +bool ClassDef::isVisibleInHierarchy() const { static bool allExternals = Config_getBool(ALLEXTERNALS); static bool hideUndocClasses = Config_getBool(HIDE_UNDOC_CLASSES); @@ -3081,7 +3081,7 @@ bool ClassDef::hasDocumentation() const // returns TRUE iff class definition `bcd' represents an (in)direct base // class of class definition `cd'. -bool ClassDef::isBaseClass(ClassDef *bcd, bool followInstances,int level) +bool ClassDef::isBaseClass(ClassDef *bcd, bool followInstances,int level) const { bool found=FALSE; //printf("isBaseClass(cd=%s) looking for %s\n",name().data(),bcd->name().data()); @@ -3111,7 +3111,7 @@ bool ClassDef::isBaseClass(ClassDef *bcd, bool followInstances,int level) //---------------------------------------------------------------------- -bool ClassDef::isSubClass(ClassDef *cd,int level) +bool ClassDef::isSubClass(ClassDef *cd,int level) const { bool found=FALSE; if (level>256) @@ -4274,7 +4274,7 @@ MemberDef *ClassDef::getMemberByName(const QCString &name) const return xmd; } -bool ClassDef::isAccessibleMember(MemberDef *md) +bool ClassDef::isAccessibleMember(MemberDef *md) const { return md->getClassDef() && isBaseClass(md->getClassDef(),TRUE); } @@ -4297,7 +4297,7 @@ MemberList *ClassDef::createMemberList(MemberListType lt) return ml; } -MemberList *ClassDef::getMemberList(MemberListType lt) +MemberList *ClassDef::getMemberList(MemberListType lt) const { QListIterator<MemberList> mli(m_impl->memberLists); MemberList *ml; diff --git a/src/classdef.h b/src/classdef.h index 14f9fc8..1360612 100644 --- a/src/classdef.h +++ b/src/classdef.h @@ -174,7 +174,7 @@ class ClassDef : public Definition bool isLinkable() const; /** the class is visible in a class diagram, or class hierarchy */ - bool isVisibleInHierarchy(); + bool isVisibleInHierarchy() const; /** show this class in the declaration section of its parent? */ bool visibleInParentsDeclList() const; @@ -203,17 +203,17 @@ class ClassDef : public Definition * class. This function will recursively traverse all branches of the * inheritance tree. */ - bool isBaseClass(ClassDef *bcd,bool followInstances,int level=0); + bool isBaseClass(ClassDef *bcd,bool followInstances,int level=0) const; /** Returns TRUE iff \a bcd is a direct or indirect sub class of this * class. */ - bool isSubClass(ClassDef *bcd,int level=0); + bool isSubClass(ClassDef *bcd,int level=0) const; /** returns TRUE iff \a md is a member of this class or of the * the public/protected members of a base class */ - bool isAccessibleMember(MemberDef *md); + bool isAccessibleMember(MemberDef *md) const; /** Returns a sorted dictionary with all template instances found for * this template class. Returns 0 if not a template or no instances. @@ -296,7 +296,7 @@ class ClassDef : public Definition QCString className() const; /** Returns the members in the list identified by \a lt */ - MemberList *getMemberList(MemberListType lt); + MemberList *getMemberList(MemberListType lt) const; /** Returns the list containing the list of members sorted per type */ const QList<MemberList> &getMemberLists() const; @@ -414,7 +414,7 @@ class ClassDef : public Definition protected: void addUsedInterfaceClasses(MemberDef *md,const char *typeStr); - bool hasNonReferenceSuperClass(); + bool hasNonReferenceSuperClass() const; void showUsedFiles(OutputList &ol); private: @@ -2473,10 +2473,6 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" BEGIN(FuncCall); } <Body>{FLOWCONDITION}/{BN}*"(" { - if (g_currentMemberDef && g_currentMemberDef->isFunction()) - { - g_currentMemberDef->addFlowKeyWord(); - } startFontClass("keywordflow"); codifyLines(yytext); endFontClass(); @@ -2494,10 +2490,6 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" } } <Body>{FLOWCONDITION}/([^a-z_A-Z0-9]) { - if (g_currentMemberDef && g_currentMemberDef->isFunction()) - { - g_currentMemberDef->addFlowKeyWord(); - } startFontClass("keywordflow"); codifyLines(yytext); endFontClass(); @@ -2512,10 +2504,6 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" endFontClass(); } <Body>{FLOWCONDITION}/{B}* { - if (g_currentMemberDef && g_currentMemberDef->isFunction()) - { - g_currentMemberDef->addFlowKeyWord(); - } startFontClass("keywordflow"); codifyLines(yytext); endFontClass(); @@ -3051,10 +3039,6 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" endFontClass(); } <MemberCall2,FuncCall>{FLOWCONDITION}/([^a-z_A-Z0-9]) { - if (g_currentMemberDef && g_currentMemberDef->isFunction()) - { - g_currentMemberDef->addFlowKeyWord(); - } addParmType(); g_parmName=yytext; startFontClass("keywordflow"); diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 6f449d5..793a56b 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -772,7 +772,6 @@ MemberDef::MemberDef(const char *df,int dl,int dc, //printf("MemberDef::MemberDef(%s)\n",na); m_impl = new MemberDefImpl; m_impl->init(this,t,a,e,p,v,s,r,mt,tal,al,meta); - number_of_flowkw = 1; m_isLinkableCached = 0; m_isConstructorCached = 0; m_isDestructorCached = 0; @@ -5065,16 +5064,6 @@ void MemberDef::invalidateCachedArgumentTypes() invalidateCachedTypesInArgumentList(m_impl->declArgList); } -void MemberDef::addFlowKeyWord() -{ - number_of_flowkw++; -} - -int MemberDef::numberOfFlowKeyWords() -{ - return number_of_flowkw; -} - //---------------- QCString MemberDef::displayName(bool) const diff --git a/src/memberdef.h b/src/memberdef.h index ac54307..d96b9c9 100644 --- a/src/memberdef.h +++ b/src/memberdef.h @@ -182,7 +182,6 @@ class MemberDef : public Definition bool isSliceLocal() const; bool isConstExpr() const; - int numberOfFlowKeyWords(); // derived getters bool isFriendToHide() const; bool isNotFriend() const; @@ -283,8 +282,6 @@ class MemberDef : public Definition // ---- setters ----- //----------------------------------------------------------------------------------- - void addFlowKeyWord(); - // set functions void setMemberType(MemberType t); void setDefinition(const char *d); @@ -442,8 +439,6 @@ class MemberDef : public Definition static int s_indentLevel; - int number_of_flowkw; - // disable copying of member defs MemberDef(const MemberDef &); MemberDef &operator=(const MemberDef &); diff --git a/src/namespacedef.h b/src/namespacedef.h index b46d074..6f406d8 100644 --- a/src/namespacedef.h +++ b/src/namespacedef.h @@ -67,10 +67,12 @@ class NamespaceDef : public Definition void combineUsingRelations(); QCString displayName(bool=TRUE) const; QCString localName() const; + void setInline(bool isInline) { m_inline = isInline; } bool isConstantGroup() const { return CONSTANT_GROUP == m_type; } bool isModule() const { return MODULE == m_type; } bool isLibrary() const { return LIBRARY == m_type; } + bool isInline() const { return m_inline; } bool isLinkableInProject() const; bool isLinkable() const; @@ -109,6 +111,7 @@ class NamespaceDef : public Definition /*! Returns the namespaces contained in this namespace */ NamespaceSDict *getNamespaceSDict() const { return namespaceSDict; } + QCString title() const; QCString compoundTypeString() const; @@ -156,6 +159,7 @@ class NamespaceDef : public Definition enum { NAMESPACE, MODULE, CONSTANT_GROUP, LIBRARY } m_type; bool m_isPublished; QCString metaData; + bool m_inline; }; /** A list of NamespaceDef objects. */ |