Skip to content

Commit d1dbb7c

Browse files
committed
Refactoring: remove mutable from DefinitionAliasImpl
1 parent 7d4a9d1 commit d1dbb7c

File tree

2 files changed

+11
-23
lines changed

2 files changed

+11
-23
lines changed

src/definition.cpp

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1933,41 +1933,30 @@ void DefinitionAliasImpl::init()
19331933
{
19341934
//printf("%s::addToMap(%s)\n",qPrint(name()),qPrint(alias->name()));
19351935
addToMap(m_symbolName,m_def);
1936+
if (m_scope==nullptr)
1937+
{
1938+
m_qualifiedName = m_def->localName();
1939+
}
1940+
else
1941+
{
1942+
m_qualifiedName = m_scope->qualifiedName()+
1943+
getLanguageSpecificSeparator(m_scope->getLanguage())+
1944+
m_def->localName();
1945+
}
19361946
}
19371947

19381948
void DefinitionAliasImpl::deinit()
19391949
{
19401950
removeFromMap(m_symbolName,m_def);
19411951
}
19421952

1943-
void DefinitionAliasImpl::updateQualifiedName() const
1944-
{
1945-
std::lock_guard<std::recursive_mutex> lock(g_qualifiedNameMutex);
1946-
if (m_qualifiedName.isEmpty())
1947-
{
1948-
//printf("start %s::qualifiedName() localName=%s\n",qPrint(name()),qPrint(m_impl->localName));
1949-
if (m_scope==nullptr)
1950-
{
1951-
m_qualifiedName = m_def->localName();
1952-
}
1953-
else
1954-
{
1955-
m_qualifiedName = m_scope->qualifiedName()+
1956-
getLanguageSpecificSeparator(m_scope->getLanguage())+
1957-
m_def->localName();
1958-
}
1959-
}
1960-
}
1961-
19621953
QCString DefinitionAliasImpl::qualifiedName() const
19631954
{
1964-
updateQualifiedName();
19651955
return m_qualifiedName;
19661956
}
19671957

19681958
const QCString &DefinitionAliasImpl::name() const
19691959
{
1970-
updateQualifiedName();
19711960
return m_qualifiedName;
19721961
}
19731962

src/definitionimpl.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,11 +313,10 @@ class DefinitionAliasImpl
313313
const QCString &name() const;
314314
QCString qualifiedName() const;
315315
private:
316-
void updateQualifiedName() const;
317316
Definition *m_def;
318317
const Definition *m_scope;
319318
QCString m_symbolName;
320-
mutable QCString m_qualifiedName;
319+
QCString m_qualifiedName;
321320
};
322321

323322
template<class Base>

0 commit comments

Comments
 (0)