diff options
author | albert-github <albert.tests@gmail.com> | 2015-02-22 14:51:10 (GMT) |
---|---|---|
committer | albert-github <albert.tests@gmail.com> | 2015-02-22 14:51:10 (GMT) |
commit | 073e9482a516c24a3d045da049941bfd432f3354 (patch) | |
tree | 776f53379a49df60f594b424cd64391ca53d96d2 /src/context.cpp | |
parent | 051f878cbe83746a2e4604e889bb2d333d600b07 (diff) | |
download | Doxygen-073e9482a516c24a3d045da049941bfd432f3354.zip Doxygen-073e9482a516c24a3d045da049941bfd432f3354.tar.gz Doxygen-073e9482a516c24a3d045da049941bfd432f3354.tar.bz2 |
Adding commands \hidecallgraph and \hidecallergraph
With the new commands \hidecallgraph and \hidecallergraph it is possible to suppress a call or caller graph even though the corresponding option CALL_GRAPH or CALLER_GRAPH is set.
commands.doc
config.xml
diagrams.doc
- updating documentation to support new commands
entry.cpp
- initialize callgraph and callergraph with the value from the config file
commentscan.l
- add handling for the new commands
context.cpp
memberdef.cpp
util.cpp
- getting the option for CALL_GRAPH and CALLER_GRAPH is not necessary anymore as it is incorporated in the initialization of an Entry item
dbusxmlscanner.cpp
- initialization is done in the Entry item
vhdljjparser.cpp
- gBlock was a static variable and therefore initialized before the doxygen main routine started. A Entry element sets now the default for callgraph and callergraph based on the config file and as the config file is not yet known at that moment the value for CALL_GRAPH and CALLER_GRAPH were set to False. By making a pointer of gBlock and doing an appropriate new Entry call this problem is overcome.
Diffstat (limited to 'src/context.cpp')
-rw-r--r-- | src/context.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/context.cpp b/src/context.cpp index 551db1a..2946cdd 100644 --- a/src/context.cpp +++ b/src/context.cpp @@ -4056,8 +4056,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private> TemplateVariant hasCallGraph() const { static bool haveDot = Config_getBool("HAVE_DOT"); - static bool callGraph = Config_getBool("CALL_GRAPH"); - if ((callGraph || m_memberDef->hasCallGraph()) && haveDot && + if (m_memberDef->hasCallGraph() && haveDot && (m_memberDef->isFunction() || m_memberDef->isSlot() || m_memberDef->isSignal())) { DotCallGraph *cg = getCallGraph(); @@ -4096,8 +4095,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private> TemplateVariant hasCallerGraph() const { static bool haveDot = Config_getBool("HAVE_DOT"); - static bool callerGraph = Config_getBool("CALLER_GRAPH"); - if ((callerGraph || m_memberDef->hasCallerGraph()) && haveDot && + if (m_memberDef->hasCallerGraph() && haveDot && (m_memberDef->isFunction() || m_memberDef->isSlot() || m_memberDef->isSignal())) { DotCallGraph *cg = getCallerGraph(); |