Skip to content

Commit debe26c

Browse files
committed
Variables were shown with () in the client side search results
1 parent 06f6edf commit debe26c

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

src/dotcallgraph.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void DotCallGraph::buildGraph(DotNode *n,const MemberDef *md,int distance)
3535
auto refs = m_inverse ? md->getReferencedByMembers() : md->getReferencesMembers();
3636
for (const auto &rmd : refs)
3737
{
38-
if (rmd->showInCallGraph())
38+
if (rmd->isCallable())
3939
{
4040
QCString uniqueId = getUniqueId(rmd);
4141
auto it = m_usedNodes.find(uniqueId.str());
@@ -214,7 +214,7 @@ bool DotCallGraph::isTrivial(const MemberDef *md,bool inverse)
214214
auto refs = inverse ? md->getReferencedByMembers() : md->getReferencesMembers();
215215
for (const auto &rmd : refs)
216216
{
217-
if (rmd->showInCallGraph())
217+
if (rmd->isCallable())
218218
{
219219
return FALSE;
220220
}

src/memberdef.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ class MemberDefImpl : public DefinitionMixin<MemberDefMutable>
172172
virtual bool isDestructor() const;
173173
virtual bool hasOneLineInitializer() const;
174174
virtual bool hasMultiLineInitializer() const;
175-
virtual bool showInCallGraph() const;
175+
virtual bool isCallable() const;
176176
virtual bool isStrongEnumValue() const;
177177
virtual bool livesInsideEnum() const;
178178
virtual bool isSliceLocal() const;
@@ -627,8 +627,8 @@ class MemberDefAliasImpl : public DefinitionAliasMixin<MemberDef>
627627
{ return getMdAlias()->hasOneLineInitializer(); }
628628
virtual bool hasMultiLineInitializer() const
629629
{ return getMdAlias()->hasMultiLineInitializer(); }
630-
virtual bool showInCallGraph() const
631-
{ return getMdAlias()->showInCallGraph(); }
630+
virtual bool isCallable() const
631+
{ return getMdAlias()->isCallable(); }
632632
virtual bool isStrongEnumValue() const
633633
{ return getMdAlias()->isStrongEnumValue(); }
634634
virtual bool livesInsideEnum() const
@@ -5253,7 +5253,7 @@ bool MemberDefImpl::isTemplateSpecialization() const
52535253
return m_impl->tspec;
52545254
}
52555255

5256-
bool MemberDefImpl::showInCallGraph() const
5256+
bool MemberDefImpl::isCallable() const
52575257
{
52585258
return isFunction() ||
52595259
isSlot() ||
@@ -6116,7 +6116,7 @@ void addDocCrossReference(const MemberDef *s,const MemberDef *d)
61166116
//printf("--> addDocCrossReference src=%s,dst=%s\n",qPrint(src->name()),qPrint(dst->name()));
61176117
if (dst->isTypedef() || dst->isEnumerate()) return; // don't add types
61186118
if ((dst->hasReferencedByRelation() || dst->hasCallerGraph()) &&
6119-
src->showInCallGraph()
6119+
src->isCallable()
61206120
)
61216121
{
61226122
dst->addSourceReferencedBy(src);
@@ -6132,7 +6132,7 @@ void addDocCrossReference(const MemberDef *s,const MemberDef *d)
61326132
}
61336133
}
61346134
if ((src->hasReferencesRelation() || src->hasCallGraph()) &&
6135-
src->showInCallGraph()
6135+
src->isCallable()
61366136
)
61376137
{
61386138
src->addSourceReferences(dst);

src/memberdef.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ class MemberDef : public Definition
179179
virtual bool isDestructor() const = 0;
180180
virtual bool hasOneLineInitializer() const = 0;
181181
virtual bool hasMultiLineInitializer() const = 0;
182-
virtual bool showInCallGraph() const = 0;
182+
virtual bool isCallable() const = 0;
183183
virtual bool isStrongEnumValue() const = 0;
184184
virtual bool livesInsideEnum() const = 0;
185185
virtual bool isSliceLocal() const = 0;

src/searchindex_js.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ void writeJavaScriptSearchIndex()
513513
prefix+=convertToXML(md->argsString());
514514
// show argument list to disambiguate overloaded functions
515515
}
516-
else if (md) // unique member function
516+
else if (md && md->isCallable()) // unique member function
517517
{
518518
prefix+="()"; // only to show it is a function
519519
}

0 commit comments

Comments
 (0)