Release-1.8.3

1 files changed, 23 insertions, 7 deletions

diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index d658c4a..1482180 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -2350,6 +2350,10 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
     if (title.at(0)=='@')
     {
       ldef = title = "anonymous enum";
+      if (!m_impl->enumBaseType.isEmpty())
+      {
+        ldef+=" : "+m_impl->enumBaseType;
+      }
     }
     else
     {
@@ -2897,6 +2901,10 @@ void MemberDef::writeMemberDocSimple(OutputList &ol, Definition *container)
 
   ol.startInlineMemberName();
   ol.docify(doxyName);
+  if (isVariable() && argsString() && !isObjCMethod()) 
+  {
+    linkifyText(TextGeneratorOLImpl(ol),getOuterScope(),getBodyDef(),this,argsString());
+  }
   if (!m_impl->bitfields.isEmpty()) // add bitfields
   {
     linkifyText(TextGeneratorOLImpl(ol),getOuterScope(),getBodyDef(),this,m_impl->bitfields.simplifyWhiteSpace());
@@ -3545,13 +3553,13 @@ void MemberDef::writeEnumDeclaration(OutputList &typeDecl,
       typeDecl.endBold();
     }
     typeDecl.writeChar(' ');
-    if (!m_impl->enumBaseType.isEmpty())
-    {
-      typeDecl.writeChar(':');
-      typeDecl.writeChar(' ');
-      typeDecl.docify(m_impl->enumBaseType);
-      typeDecl.writeChar(' ');
-    }
+  }
+  if (!m_impl->enumBaseType.isEmpty())
+  {
+    typeDecl.writeChar(':');
+    typeDecl.writeChar(' ');
+    typeDecl.docify(m_impl->enumBaseType);
+    typeDecl.writeChar(' ');
   }
 
   uint enumValuesPerLine = (uint)Config_getInt("ENUM_VALUES_PER_LINE");
@@ -4987,6 +4995,14 @@ void MemberDef::_addToSearchIndex()
     if (ln!=qn)
     {
       Doxygen::searchIndex->addWord(qn,TRUE);
+      if (getClassDef())
+      {
+        Doxygen::searchIndex->addWord(getClassDef()->displayName(),TRUE);
+      }
+      else if (getNamespaceDef())
+      {
+        Doxygen::searchIndex->addWord(getNamespaceDef()->displayName(),TRUE);
+      }
     }
   }
 }