Refactoring: removed macros used for getting the value of settings

doxygen · doxygen · commit d3ffd31e89c0 · 2020-11-15T12:57:40.000+01:00
diff --git a/src/dotcallgraph.cpp b/src/dotcallgraph.cpp
@@ -20,10 +20,6 @@
 #include "config.h"
 #include "util.h"
 
-#define HIDE_SCOPE_NAMES      Config_getBool(HIDE_SCOPE_NAMES)
-#define DOT_GRAPH_MAX_NODES   Config_getInt(DOT_GRAPH_MAX_NODES)
-#define MAX_DOT_GRAPH_DEPTH   Config_getInt(MAX_DOT_GRAPH_DEPTH)
-
 static QCString getUniqueId(const MemberDef *md)
 {
   QCString result = md->getReference()+"$"+
@@ -50,7 +46,7 @@ void DotCallGraph::buildGraph(DotNode *n,const MemberDef *md,int distance)
       else
       {
         QCString name;
-        if (HIDE_SCOPE_NAMES)
+        if (Config_getBool(HIDE_SCOPE_NAMES))
         {
           name  = rmd->getOuterScope()==m_scope ?
             rmd->name() : rmd->qualifiedName();
@@ -83,7 +79,7 @@ void DotCallGraph::determineVisibleNodes(QList<DotNode> &queue, int &maxNodes)
   while (queue.count()>0 && maxNodes>0)
   {
     DotNode *n = queue.take(0);
-    if (!n->isVisible() && n->distance()<=MAX_DOT_GRAPH_DEPTH) // not yet processed
+    if (!n->isVisible() && n->distance()<=Config_getInt(MAX_DOT_GRAPH_DEPTH)) // not yet processed
     {
       n->markAsVisible();
       maxNodes--;
@@ -133,7 +129,7 @@ DotCallGraph::DotCallGraph(const MemberDef *md,bool inverse)
   m_scope    = md->getOuterScope();
   QCString uniqueId = getUniqueId(md);
   QCString name;
-  if (HIDE_SCOPE_NAMES)
+  if (Config_getBool(HIDE_SCOPE_NAMES))
   {
     name = md->name();
   }
@@ -153,7 +149,7 @@ DotCallGraph::DotCallGraph(const MemberDef *md,bool inverse)
   m_usedNodes->insert(uniqueId,m_startNode);
   buildGraph(m_startNode,md,1);
 
-  int maxNodes = DOT_GRAPH_MAX_NODES;
+  int maxNodes = Config_getInt(DOT_GRAPH_MAX_NODES);
   QList<DotNode> openNodeQueue;
   openNodeQueue.append(m_startNode);
   determineVisibleNodes(openNodeQueue,maxNodes);
@@ -210,7 +206,7 @@ bool DotCallGraph::isTrivial() const
 
 bool DotCallGraph::isTooBig() const
 {
-  return numNodes()>=DOT_GRAPH_MAX_NODES;
+  return numNodes()>=Config_getInt(DOT_GRAPH_MAX_NODES);
 }
 
 int DotCallGraph::numNodes() const
diff --git a/src/dotclassgraph.cpp b/src/dotclassgraph.cpp
@@ -20,12 +20,6 @@
 #include "config.h"
 #include "util.h"
 
-#define HIDE_SCOPE_NAMES      Config_getBool(HIDE_SCOPE_NAMES)
-#define MAX_DOT_GRAPH_DEPTH   Config_getInt(MAX_DOT_GRAPH_DEPTH)
-#define UML_LOOK              Config_getBool(UML_LOOK)
-#define TEMPLATE_RELATIONS    Config_getBool(TEMPLATE_RELATIONS)
-#define DOT_GRAPH_MAX_NODES   Config_getInt(DOT_GRAPH_MAX_NODES)
-
 void DotClassGraph::addClass(const ClassDef *cd,DotNode *n,int prot,
   const char *label,const char *usedName,const char *templSpec,bool base,int distance)
 {
@@ -71,7 +65,7 @@ void DotClassGraph::addClass(const ClassDef *cd,DotNode *n,int prot,
   else // new class
   {
     QCString displayName=className;
-    if (HIDE_SCOPE_NAMES) displayName=stripScope(displayName);
+    if (Config_getBool(HIDE_SCOPE_NAMES)) displayName=stripScope(displayName);
     QCString tmp_url;
     if (cd->isLinkable() && !cd->isHidden())
     {
@@ -162,7 +156,7 @@ bool DotClassGraph::determineVisibleNodes(DotNode *rootNode,
     {
       DotNode *n = childQueue.take(0);
       int distance = n->distance();
-      if (!n->isVisible() && distance<=MAX_DOT_GRAPH_DEPTH) // not yet processed
+      if (!n->isVisible() && distance<=Config_getInt(MAX_DOT_GRAPH_DEPTH)) // not yet processed
       {
         if (distance>0)
         {
@@ -191,7 +185,7 @@ bool DotClassGraph::determineVisibleNodes(DotNode *rootNode,
     if (includeParents && parentQueue.count()>0)
     {
       DotNode *n = parentQueue.take(0);
-      if ((!n->isVisible() || firstNode) && n->distance()<=MAX_DOT_GRAPH_DEPTH) // not yet processed
+      if ((!n->isVisible() || firstNode) && n->distance()<=Config_getInt(MAX_DOT_GRAPH_DEPTH)) // not yet processed
       {
         firstNode=FALSE;
         int distance = n->distance();
@@ -220,7 +214,7 @@ bool DotClassGraph::determineVisibleNodes(DotNode *rootNode,
       }
     }
   }
-  if (UML_LOOK) return FALSE; // UML graph are always top to bottom
+  if (Config_getBool(UML_LOOK)) return FALSE; // UML graph are always top to bottom
   int maxWidth=0;
   int maxHeight=(int)QMAX(childTreeWidth.size(),parentTreeWidth.size());
   uint i;
@@ -293,7 +287,7 @@ void DotClassGraph::buildGraph(const ClassDef *cd,DotNode *n,bool base,int dista
       }
     }
   }
-  if (TEMPLATE_RELATIONS && base)
+  if (Config_getBool(TEMPLATE_RELATIONS) && base)
   {
     ConstraintClassDict *dict = cd->templateTypeConstraints();
     if (dict)
@@ -311,7 +305,7 @@ void DotClassGraph::buildGraph(const ClassDef *cd,DotNode *n,bool base,int dista
 
   // ---- Add template instantiation relations
 
-  if (TEMPLATE_RELATIONS)
+  if (Config_getBool(TEMPLATE_RELATIONS))
   {
     if (base) // template relations for base classes
     {
@@ -376,7 +370,7 @@ DotClassGraph::DotClassGraph(const ClassDef *cd,GraphType t)
   buildGraph(cd,m_startNode,TRUE,1);
   if (t==Inheritance) buildGraph(cd,m_startNode,FALSE,1);
 
-  m_lrRank = determineVisibleNodes(m_startNode,DOT_GRAPH_MAX_NODES,t==Inheritance);
+  m_lrRank = determineVisibleNodes(m_startNode,Config_getInt(DOT_GRAPH_MAX_NODES),t==Inheritance);
   QList<DotNode> openNodeQueue;
   openNodeQueue.append(m_startNode);
   determineTruncatedNodes(openNodeQueue,t==Inheritance);
@@ -390,12 +384,12 @@ bool DotClassGraph::isTrivial() const
   if (m_graphType==Inheritance)
     return m_startNode->children()==0 && m_startNode->parents()==0;
   else
-    return !UML_LOOK && m_startNode->children()==0;
+    return !Config_getBool(UML_LOOK) && m_startNode->children()==0;
 }
 
 bool DotClassGraph::isTooBig() const
 {
-  return numNodes()>=DOT_GRAPH_MAX_NODES;
+  return numNodes()>=Config_getInt(DOT_GRAPH_MAX_NODES);
 }
 
 int DotClassGraph::numNodes() const
diff --git a/src/dotgroupcollaboration.cpp b/src/dotgroupcollaboration.cpp
@@ -23,8 +23,6 @@
 #include "util.h"
 #include "config.h"
 
-#define DOT_TRANSPARENT       Config_getBool(DOT_TRANSPARENT)
-
 DotGroupCollaboration::DotGroupCollaboration(const GroupDef* gd)
 {
   QCString tmp_url = gd->getReference()+"$"+gd->getOutputFileBase();
@@ -379,7 +377,7 @@ void DotGroupCollaboration::writeGraphHeader(FTextStream &t,const QCString &titl
   }
   t << endl;
   t << "{" << endl;
-  if (DOT_TRANSPARENT)
+  if (Config_getBool(DOT_TRANSPARENT))
   {
     t << "  bgcolor=\"transparent\";" << endl;
   }

Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,6 @@`
`20`	`20`	`#include "config.h"`
`21`	`21`	`#include "util.h"`
`22`	`22`
`23`		`-#define HIDE_SCOPE_NAMES Config_getBool(HIDE_SCOPE_NAMES)`
`24`		`-#define DOT_GRAPH_MAX_NODES Config_getInt(DOT_GRAPH_MAX_NODES)`
`25`		`-#define MAX_DOT_GRAPH_DEPTH Config_getInt(MAX_DOT_GRAPH_DEPTH)`
`26`		`-`
`27`	`23`	`static QCString getUniqueId(const MemberDef *md)`
`28`	`24`	`{`
`29`	`25`	`QCString result = md->getReference()+"$"+`
`@@ -50,7 +46,7 @@ void DotCallGraph::buildGraph(DotNode n,const MemberDef md,int distance)`
`50`	`46`	`else`
`51`	`47`	`{`
`52`	`48`	`QCString name;`
`53`		`- if (HIDE_SCOPE_NAMES)`
	`49`	`+ if (Config_getBool(HIDE_SCOPE_NAMES))`
`54`	`50`	`{`
`55`	`51`	`name = rmd->getOuterScope()==m_scope ?`
`56`	`52`	`rmd->name() : rmd->qualifiedName();`
`@@ -83,7 +79,7 @@ void DotCallGraph::determineVisibleNodes(QList<DotNode> &queue, int &maxNodes)`
`83`	`79`	`while (queue.count()>0 && maxNodes>0)`
`84`	`80`	`{`
`85`	`81`	`DotNode *n = queue.take(0);`
`86`		`- if (!n->isVisible() && n->distance()<=MAX_DOT_GRAPH_DEPTH) // not yet processed`
	`82`	`+ if (!n->isVisible() && n->distance()<=Config_getInt(MAX_DOT_GRAPH_DEPTH)) // not yet processed`
`87`	`83`	`{`
`88`	`84`	`n->markAsVisible();`
`89`	`85`	`maxNodes--;`
`@@ -133,7 +129,7 @@ DotCallGraph::DotCallGraph(const MemberDef *md,bool inverse)`
`133`	`129`	`m_scope = md->getOuterScope();`
`134`	`130`	`QCString uniqueId = getUniqueId(md);`
`135`	`131`	`QCString name;`
`136`		`- if (HIDE_SCOPE_NAMES)`
	`132`	`+ if (Config_getBool(HIDE_SCOPE_NAMES))`
`137`	`133`	`{`
`138`	`134`	`name = md->name();`
`139`	`135`	`}`
`@@ -153,7 +149,7 @@ DotCallGraph::DotCallGraph(const MemberDef *md,bool inverse)`
`153`	`149`	`m_usedNodes->insert(uniqueId,m_startNode);`
`154`	`150`	`buildGraph(m_startNode,md,1);`
`155`	`151`
`156`		`- int maxNodes = DOT_GRAPH_MAX_NODES;`
	`152`	`+ int maxNodes = Config_getInt(DOT_GRAPH_MAX_NODES);`
`157`	`153`	`QList<DotNode> openNodeQueue;`
`158`	`154`	`openNodeQueue.append(m_startNode);`
`159`	`155`	`determineVisibleNodes(openNodeQueue,maxNodes);`
`@@ -210,7 +206,7 @@ bool DotCallGraph::isTrivial() const`
`210`	`206`
`211`	`207`	`bool DotCallGraph::isTooBig() const`
`212`	`208`	`{`
`213`		`- return numNodes()>=DOT_GRAPH_MAX_NODES;`
	`209`	`+ return numNodes()>=Config_getInt(DOT_GRAPH_MAX_NODES);`
`214`	`210`	`}`
`215`	`211`
`216`	`212`	`int DotCallGraph::numNodes() const`
Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,6 @@`
`20`	`20`	`#include "config.h"`
`21`	`21`	`#include "util.h"`
`22`	`22`
`23`		`-#define HIDE_SCOPE_NAMES Config_getBool(HIDE_SCOPE_NAMES)`
`24`		`-#define MAX_DOT_GRAPH_DEPTH Config_getInt(MAX_DOT_GRAPH_DEPTH)`
`25`		`-#define UML_LOOK Config_getBool(UML_LOOK)`
`26`		`-#define TEMPLATE_RELATIONS Config_getBool(TEMPLATE_RELATIONS)`
`27`		`-#define DOT_GRAPH_MAX_NODES Config_getInt(DOT_GRAPH_MAX_NODES)`
`28`		`-`
`29`	`23`	`void DotClassGraph::addClass(const ClassDef cd,DotNode n,int prot,`
`30`	`24`	`const char label,const char usedName,const char *templSpec,bool base,int distance)`
`31`	`25`	`{`
`@@ -71,7 +65,7 @@ void DotClassGraph::addClass(const ClassDef cd,DotNode n,int prot,`
`71`	`65`	`else // new class`
`72`	`66`	`{`
`73`	`67`	`QCString displayName=className;`
`74`		`- if (HIDE_SCOPE_NAMES) displayName=stripScope(displayName);`
	`68`	`+ if (Config_getBool(HIDE_SCOPE_NAMES)) displayName=stripScope(displayName);`
`75`	`69`	`QCString tmp_url;`
`76`	`70`	`if (cd->isLinkable() && !cd->isHidden())`
`77`	`71`	`{`
`@@ -162,7 +156,7 @@ bool DotClassGraph::determineVisibleNodes(DotNode *rootNode,`
`162`	`156`	`{`
`163`	`157`	`DotNode *n = childQueue.take(0);`
`164`	`158`	`int distance = n->distance();`
`165`		`- if (!n->isVisible() && distance<=MAX_DOT_GRAPH_DEPTH) // not yet processed`
	`159`	`+ if (!n->isVisible() && distance<=Config_getInt(MAX_DOT_GRAPH_DEPTH)) // not yet processed`
`166`	`160`	`{`
`167`	`161`	`if (distance>0)`
`168`	`162`	`{`
`@@ -191,7 +185,7 @@ bool DotClassGraph::determineVisibleNodes(DotNode *rootNode,`
`191`	`185`	`if (includeParents && parentQueue.count()>0)`
`192`	`186`	`{`
`193`	`187`	`DotNode *n = parentQueue.take(0);`
`194`		`- if ((!n->isVisible() \|\| firstNode) && n->distance()<=MAX_DOT_GRAPH_DEPTH) // not yet processed`
	`188`	`+ if ((!n->isVisible() \|\| firstNode) && n->distance()<=Config_getInt(MAX_DOT_GRAPH_DEPTH)) // not yet processed`
`195`	`189`	`{`
`196`	`190`	`firstNode=FALSE;`
`197`	`191`	`int distance = n->distance();`
`@@ -220,7 +214,7 @@ bool DotClassGraph::determineVisibleNodes(DotNode *rootNode,`
`220`	`214`	`}`
`221`	`215`	`}`
`222`	`216`	`}`
`223`		`- if (UML_LOOK) return FALSE; // UML graph are always top to bottom`
	`217`	`+ if (Config_getBool(UML_LOOK)) return FALSE; // UML graph are always top to bottom`
`224`	`218`	`int maxWidth=0;`
`225`	`219`	`int maxHeight=(int)QMAX(childTreeWidth.size(),parentTreeWidth.size());`
`226`	`220`	`uint i;`
`@@ -293,7 +287,7 @@ void DotClassGraph::buildGraph(const ClassDef cd,DotNode n,bool base,int dista`
`293`	`287`	`}`
`294`	`288`	`}`
`295`	`289`	`}`
`296`		`- if (TEMPLATE_RELATIONS && base)`
	`290`	`+ if (Config_getBool(TEMPLATE_RELATIONS) && base)`
`297`	`291`	`{`
`298`	`292`	`ConstraintClassDict *dict = cd->templateTypeConstraints();`
`299`	`293`	`if (dict)`
`@@ -311,7 +305,7 @@ void DotClassGraph::buildGraph(const ClassDef cd,DotNode n,bool base,int dista`
`311`	`305`
`312`	`306`	`// ---- Add template instantiation relations`
`313`	`307`
`314`		`- if (TEMPLATE_RELATIONS)`
	`308`	`+ if (Config_getBool(TEMPLATE_RELATIONS))`
`315`	`309`	`{`
`316`	`310`	`if (base) // template relations for base classes`
`317`	`311`	`{`
`@@ -376,7 +370,7 @@ DotClassGraph::DotClassGraph(const ClassDef *cd,GraphType t)`
`376`	`370`	`buildGraph(cd,m_startNode,TRUE,1);`
`377`	`371`	`if (t==Inheritance) buildGraph(cd,m_startNode,FALSE,1);`
`378`	`372`
`379`		`- m_lrRank = determineVisibleNodes(m_startNode,DOT_GRAPH_MAX_NODES,t==Inheritance);`
	`373`	`+ m_lrRank = determineVisibleNodes(m_startNode,Config_getInt(DOT_GRAPH_MAX_NODES),t==Inheritance);`
`380`	`374`	`QList<DotNode> openNodeQueue;`
`381`	`375`	`openNodeQueue.append(m_startNode);`
`382`	`376`	`determineTruncatedNodes(openNodeQueue,t==Inheritance);`
`@@ -390,12 +384,12 @@ bool DotClassGraph::isTrivial() const`
`390`	`384`	`if (m_graphType==Inheritance)`
`391`	`385`	`return m_startNode->children()==0 && m_startNode->parents()==0;`
`392`	`386`	`else`
`393`		`- return !UML_LOOK && m_startNode->children()==0;`
	`387`	`+ return !Config_getBool(UML_LOOK) && m_startNode->children()==0;`
`394`	`388`	`}`
`395`	`389`
`396`	`390`	`bool DotClassGraph::isTooBig() const`
`397`	`391`	`{`
`398`		`- return numNodes()>=DOT_GRAPH_MAX_NODES;`
	`392`	`+ return numNodes()>=Config_getInt(DOT_GRAPH_MAX_NODES);`
`399`	`393`	`}`
`400`	`394`
`401`	`395`	`int DotClassGraph::numNodes() const`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@`
`23`	`23`	`#include "util.h"`
`24`	`24`	`#include "config.h"`
`25`	`25`
`26`		`-#define DOT_TRANSPARENT Config_getBool(DOT_TRANSPARENT)`
`27`		`-`
`28`	`26`	`DotGroupCollaboration::DotGroupCollaboration(const GroupDef* gd)`
`29`	`27`	`{`
`30`	`28`	`QCString tmp_url = gd->getReference()+"$"+gd->getOutputFileBase();`
`@@ -379,7 +377,7 @@ void DotGroupCollaboration::writeGraphHeader(FTextStream &t,const QCString &titl`
`379`	`377`	`}`
`380`	`378`	`t << endl;`
`381`	`379`	`t << "{" << endl;`
`382`		`- if (DOT_TRANSPARENT)`
	`380`	`+ if (Config_getBool(DOT_TRANSPARENT))`
`383`	`381`	`{`
`384`	`382`	`t << " bgcolor=\"transparent\";" << endl;`
`385`	`383`	`}`