Permalink
Browse files

More work on the template and context mechanisms

  • Loading branch information...
Dimitri van Heesch
Dimitri van Heesch committed Dec 29, 2013
1 parent 2912829 commit 744d1ca52e25dfa9e3d656056d87ed7cb6320585
Showing with 1,284 additions and 306 deletions.
  1. +13 −9 src/classdef.cpp
  2. +6 −2 src/classdef.h
  3. +832 −96 src/context.cpp
  4. +41 −1 src/context.h
  5. +15 −5 src/filedef.cpp
  6. +4 −0 src/filedef.h
  7. +18 −9 src/memberdef.cpp
  8. +2 −1 src/memberdef.h
  9. +7 −2 src/message.cpp
  10. +2 −0 src/message.h
  11. +33 −23 src/namespacedef.cpp
  12. +1 −0 src/namespacedef.h
  13. +264 −124 src/template.cpp
  14. +46 −34 src/template.h
View
@@ -1767,20 +1767,24 @@ void ClassDef::writeMoreLink(OutputList &ol,const QCString &anchor)
}
}
bool ClassDef::visibleInParentsDeclList() const
{
static bool extractPrivate = Config_getBool("EXTRACT_PRIVATE");
static bool hideUndocClasses = Config_getBool("HIDE_UNDOC_CLASSES");
static bool extractLocalClasses = Config_getBool("EXTRACT_LOCAL_CLASSES");
bool linkable = isLinkable();
return (name().find('@')==-1 && !isExtension() &&
(protection()!=::Private || extractPrivate) &&
(linkable || (!hideUndocClasses && (!isLocal() || extractLocalClasses)))
);
}
void ClassDef::writeDeclarationLink(OutputList &ol,bool &found,const char *header,bool localNames)
{
//static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN");
//static bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL");
static bool hideUndocClasses = Config_getBool("HIDE_UNDOC_CLASSES");
static bool extractLocalClasses = Config_getBool("EXTRACT_LOCAL_CLASSES");
bool isLink = isLinkable();
SrcLangExt lang = getLanguage();
if (isLink ||
(!hideUndocClasses &&
(!isLocal() || extractLocalClasses)
)
)
if (visibleInParentsDeclList())
{
if (!found) // first class
{
@@ -1820,7 +1824,7 @@ void ClassDef::writeDeclarationLink(OutputList &ol,bool &found,const char *heade
ol.writeString(" ");
ol.insertMemberAlign();
}
if (isLink)
if (isLinkable())
{
ol.writeObjectLink(getReference(),
getOutputFileBase(),
View
@@ -168,6 +168,9 @@ class ClassDef : public Definition
/** the class is visible in a class diagram, or class hierarchy */
bool isVisibleInHierarchy();
/** show this class in the declaration section of its parent? */
bool visibleInParentsDeclList() const;
/** Returns the template arguments of this class
* Will return 0 if not applicable.
*/
@@ -310,14 +313,13 @@ class ClassDef : public Definition
QCString generatedFromFiles() const;
const FileList &usedFiles() const;
QCString includeStatement() const;
const ArgumentList *typeConstraints() const;
const ExampleSDict *exampleList() const;
bool hasExamples() const;
QCString getMemberListFileName() const;
bool subGrouping() const;
//-----------------------------------------------------------------------------------
// --- setters ----
//-----------------------------------------------------------------------------------
@@ -432,6 +434,8 @@ class ClassDef : public Definition
QPtrDict<void> *visitedClasses);
void getTitleForMemberListType(MemberListType type,
QCString &title,QCString &subtitle);
QCString includeStatement() const;
ClassDefImpl *m_impl;
Oops, something went wrong.

0 comments on commit 744d1ca

Please sign in to comment.