summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2015-06-11 19:17:52 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2015-06-11 19:21:07 (GMT)
commita735498be5a572236755cc3da65bf4774cbac25c (patch)
tree5514b591e9bdb10e6032831bdd384ab3d1f96e3a /src
parent7a0c06d1745739cb7f9753e75cb46f4a431b0eaa (diff)
downloadDoxygen-a735498be5a572236755cc3da65bf4774cbac25c.zip
Doxygen-a735498be5a572236755cc3da65bf4774cbac25c.tar.gz
Doxygen-a735498be5a572236755cc3da65bf4774cbac25c.tar.bz2
Bug 744762 - Using TAGFILES prevents symbol extraction
Diffstat (limited to 'src')
-rw-r--r--src/doxygen.cpp7
-rw-r--r--src/namespacedef.cpp9
-rw-r--r--src/namespacedef.h1
3 files changed, 15 insertions, 2 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index eb72a00..647b5c8 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -1745,6 +1745,13 @@ static void buildNamespaceList(EntryNav *rootNav)
{
nd->setLanguage(root->lang);
}
+ if (rootNav->tagInfo()==0) // if we found the namespace in a tag file
+ // and also in a project file, then remove
+ // the tag file reference
+ {
+ nd->setReference("");
+ nd->setFileName(fullName);
+ }
// file definition containing the namespace nd
FileDef *fd=rootNav->fileDef();
diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp
index d08e735..a2341c7 100644
--- a/src/namespacedef.cpp
+++ b/src/namespacedef.cpp
@@ -46,8 +46,7 @@ NamespaceDef::NamespaceDef(const char *df,int dl,int dc,
}
else
{
- fileName="namespace";
- fileName+=name;
+ setFileName(name);
}
classSDict = new ClassSDict(17);
namespaceSDict = new NamespaceSDict(17);
@@ -89,6 +88,12 @@ NamespaceDef::~NamespaceDef()
delete m_allMembersDict;
}
+void NamespaceDef::setFileName(const QCString &fn)
+{
+ fileName="namespace";
+ fileName+=fn;
+}
+
void NamespaceDef::distributeMemberGroupDocumentation()
{
MemberGroupSDict::Iterator mgli(*memberGroupSDict);
diff --git a/src/namespacedef.h b/src/namespacedef.h
index 2d23d23..9b734eb 100644
--- a/src/namespacedef.h
+++ b/src/namespacedef.h
@@ -83,6 +83,7 @@ class NamespaceDef : public Definition
virtual Definition *findInnerCompound(const char *name);
void addInnerCompound(Definition *d);
void addListReferences();
+ void setFileName(const QCString &fn);
bool subGrouping() const { return m_subGrouping; }