diff options
-rw-r--r-- | src/classdef.cpp | 2 | ||||
-rw-r--r-- | src/config.xml | 4 | ||||
-rw-r--r-- | src/memberdef.cpp | 16 | ||||
-rw-r--r-- | testing/080/class_interface.xml (renamed from testing/081/class_interface.xml) | 12 | ||||
-rw-r--r-- | testing/080_extract_private_virtual.cpp (renamed from testing/081_extract_private_virtual.cpp) | 2 |
5 files changed, 19 insertions, 17 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp index f275d1d..a48df76 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -620,7 +620,7 @@ void ClassDef::internalInsertMember(MemberDef *md, { addMemberToList(MemberListType_relatedMembers,md,FALSE); } - else if (md->isFunction() && md->protection()==Private && md->virtualness()!=Normal && Config_getBool(EXTRACT_PRIVATE_VIRTUAL)) + else if (md->isFunction() && md->protection()==Private && md->virtualness()!=Normal && Config_getBool(EXTRACT_PRIV_VIRTUAL)) { addMemberToList(MemberListType_functionMembers,md,FALSE); } diff --git a/src/config.xml b/src/config.xml index d47b0a4..a62040b 100644 --- a/src/config.xml +++ b/src/config.xml @@ -838,10 +838,10 @@ Go to the <a href="commands.html">next</a> section or return to the ]]> </docs> </option> - <option type='bool' id='EXTRACT_PRIVATE_VIRTUAL' defval='0'> + <option type='bool' id='EXTRACT_PRIV_VIRTUAL' defval='0'> <docs> <![CDATA[ - If the \c EXTRACT_PRIVATE_VIRTUAL tag is set to \c YES, documented private + If the \c EXTRACT_PRIV_VIRTUAL tag is set to \c YES, documented private virtual methods of a class will be included in the documentation. ]]> </docs> diff --git a/src/memberdef.cpp b/src/memberdef.cpp index 58a2b12..bcef5ac 100644 --- a/src/memberdef.cpp +++ b/src/memberdef.cpp @@ -1080,7 +1080,7 @@ QCString MemberDef::anchor() const void MemberDef::_computeLinkableInProject() { static bool extractStatic = Config_getBool(EXTRACT_STATIC); - static bool extractPrivateVirtual = Config_getBool(EXTRACT_PRIVATE_VIRTUAL); + static bool extractPrivateVirtual = Config_getBool(EXTRACT_PRIV_VIRTUAL); m_isLinkableCached = 2; // linkable //printf("MemberDef::isLinkableInProject(name=%s)\n",name().data()); if (isHidden()) @@ -1134,7 +1134,8 @@ void MemberDef::_computeLinkableInProject() m_isLinkableCached = 1; // in file (and not in namespace) but file not linkable return; } - if ((!protectionLevelVisible(m_impl->prot) && m_impl->mtype!=MemberType_Friend) && !(m_impl->prot==Private && m_impl->virt!=Normal && extractPrivateVirtual)) + if ((!protectionLevelVisible(m_impl->prot) && m_impl->mtype!=MemberType_Friend) && + !(m_impl->prot==Private && m_impl->virt!=Normal && extractPrivateVirtual)) { //printf("private and invisible!\n"); m_isLinkableCached = 1; // hidden due to protection @@ -1316,7 +1317,7 @@ ClassDef *MemberDef::getClassDefOfAnonymousType() bool MemberDef::isBriefSectionVisible() const { static bool extractStatic = Config_getBool(EXTRACT_STATIC); - static bool extractPrivateVirtual = Config_getBool(EXTRACT_PRIVATE_VIRTUAL); + static bool extractPrivateVirtual = Config_getBool(EXTRACT_PRIV_VIRTUAL); static bool hideUndocMembers = Config_getBool(HIDE_UNDOC_MEMBERS); static bool briefMemberDesc = Config_getBool(BRIEF_MEMBER_DESC); static bool repeatBrief = Config_getBool(REPEAT_BRIEF); @@ -1368,7 +1369,7 @@ bool MemberDef::isBriefSectionVisible() const // only include members that are non-private unless EXTRACT_PRIVATE is // set to YES or the member is part of a group. And as a special case, - // private *documented* virtual members are shown if EXTRACT_PRIVATE_VIRTUAL + // private *documented* virtual members are shown if EXTRACT_PRIV_VIRTUAL // is set to YES bool visibleIfPrivate = (protectionLevelVisible(protection()) || m_impl->mtype==MemberType_Friend || @@ -1644,7 +1645,7 @@ void MemberDef::writeDeclaration(OutputList &ol, if (!name().isEmpty() && name().at(0)!='@') // hide anonymous stuff { static bool extractPrivate = Config_getBool(EXTRACT_PRIVATE); - static bool extractPrivateVirtual = Config_getBool(EXTRACT_PRIVATE_VIRTUAL); + static bool extractPrivateVirtual = Config_getBool(EXTRACT_PRIV_VIRTUAL); static bool extractStatic = Config_getBool(EXTRACT_STATIC); //printf("Member name=`%s gd=%p md->groupDef=%p inGroup=%d isLinkable()=%d hasDocumentation=%d\n",name().data(),gd,getGroupDef(),inGroup,isLinkable(),hasDocumentation()); if (!(name().isEmpty() || name().at(0)=='@') && // name valid @@ -1902,7 +1903,7 @@ bool MemberDef::isDetailedSectionLinkable() const static bool briefMemberDesc = Config_getBool(BRIEF_MEMBER_DESC); static bool hideUndocMembers = Config_getBool(HIDE_UNDOC_MEMBERS); static bool extractStatic = Config_getBool(EXTRACT_STATIC); - static bool extractPrivateVirtual = Config_getBool(EXTRACT_PRIVATE_VIRTUAL); + static bool extractPrivateVirtual = Config_getBool(EXTRACT_PRIV_VIRTUAL); // the member has details documentation for any of the following reasons bool docFilter = @@ -1940,7 +1941,8 @@ bool MemberDef::isDetailedSectionLinkable() const // only include members that are non-private unless EXTRACT_PRIVATE is // set to YES or the member is part of a group - bool privateFilter = protectionLevelVisible(protection()) || m_impl->mtype==MemberType_Friend || (m_impl->prot==Private && m_impl->virt!=Normal && extractPrivateVirtual); + bool privateFilter = protectionLevelVisible(protection()) || m_impl->mtype==MemberType_Friend || + (m_impl->prot==Private && m_impl->virt!=Normal && extractPrivateVirtual); // member is part of an anonymous scope that is the type of // another member in the list. diff --git a/testing/081/class_interface.xml b/testing/080/class_interface.xml index 2385b86..06e0bb5 100644 --- a/testing/081/class_interface.xml +++ b/testing/080/class_interface.xml @@ -16,7 +16,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="081_extract_private_virtual.cpp" line="13" column="1"/> + <location file="080_extract_private_virtual.cpp" line="13" column="1"/> </memberdef> </sectiondef> <sectiondef kind="private-func"> @@ -33,7 +33,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="081_extract_private_virtual.cpp" line="21" column="1"/> + <location file="080_extract_private_virtual.cpp" line="21" column="1"/> </memberdef> <memberdef kind="function" id="class_interface_1ad13fffb1181ab0da1f8fbb586eff9afe" prot="private" static="no" const="no" explicit="no" inline="no" virt="virtual"> <type>void</type> @@ -48,7 +48,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="081_extract_private_virtual.cpp" line="28" column="1"/> + <location file="080_extract_private_virtual.cpp" line="28" column="1"/> </memberdef> <memberdef kind="function" id="class_interface_1a46062977049a7c2c2c141e4487e954b8" prot="private" static="no" const="no" explicit="no" inline="no" virt="virtual"> <type>void</type> @@ -61,7 +61,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="081_extract_private_virtual.cpp" line="31" column="1"/> + <location file="080_extract_private_virtual.cpp" line="31" column="1"/> </memberdef> <memberdef kind="function" id="class_interface_1a108dce1debd0596b57e7985bbb0f63a1" prot="private" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> <type>void</type> @@ -75,7 +75,7 @@ </detaileddescription> <inbodydescription> </inbodydescription> - <location file="081_extract_private_virtual.cpp" line="34" column="1"/> + <location file="080_extract_private_virtual.cpp" line="34" column="1"/> </memberdef> </sectiondef> <briefdescription> @@ -83,7 +83,7 @@ </briefdescription> <detaileddescription> </detaileddescription> - <location file="081_extract_private_virtual.cpp" line="6" column="1" bodyfile="081_extract_private_virtual.cpp" bodystart="6" bodyend="35"/> + <location file="080_extract_private_virtual.cpp" line="6" column="1" bodyfile="080_extract_private_virtual.cpp" bodystart="6" bodyend="35"/> <listofallmembers> <member refid="class_interface_1a328e0a16ccee5d796ca93801a055d27d" prot="private" virt="pure-virtual"> <scope>Interface</scope> diff --git a/testing/081_extract_private_virtual.cpp b/testing/080_extract_private_virtual.cpp index ce4ed30..1f06b4e 100644 --- a/testing/081_extract_private_virtual.cpp +++ b/testing/080_extract_private_virtual.cpp @@ -1,6 +1,6 @@ // objective: allow linking to private virtual functions // check: class_interface.xml -// config: EXTRACT_PRIVATE_VIRTUAL = YES +// config: EXTRACT_PRIV_VIRTUAL = YES /** @brief An interface */ class Interface { |