1 files changed, 20 insertions, 22 deletions

diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 3c6dfd2..aadb796 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -791,8 +791,8 @@ QCString MemberDef::getOutputFileBase() const
   if (baseName.isEmpty())
   {
     warn(getDefFileName(),getDefLine(),
-       "Warning: Internal inconsistency: member %s does not belong to any"
-       " container!",name().data()
+       "warning: Internal inconsistency: member %s does not belong to any"
+       " container!",qPrint(name())
       );
     return "dummy";
   }
@@ -2225,7 +2225,7 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
       }
       else
       {
-        err("Error: translation error: no marker in trReimplementsFromList()\n");
+        err("error: translation error: no marker in trReimplementsFromList()\n");
       }
       ol.endParagraph();
     }
@@ -2334,7 +2334,7 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
     DotCallGraph callGraph(this,FALSE);
     if (!callGraph.isTrivial() && !callGraph.isTooBig())
     {
-      msg("Generating call graph for function %s\n",qualifiedName().data());
+      msg("Generating call graph for function %s\n",qPrint(qualifiedName()));
       ol.disable(OutputGenerator::Man);
       ol.startParagraph();
       ol.startCallGraph();
@@ -2351,7 +2351,7 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
     DotCallGraph callerGraph(this, TRUE);
     if (!callerGraph.isTrivial() && !callerGraph.isTooBig())
     {
-      msg("Generating caller graph for function %s\n",qualifiedName().data());
+      msg("Generating caller graph for function %s\n",qPrint(qualifiedName()));
       ol.disable(OutputGenerator::Man);
       ol.startParagraph();
       ol.startCallGraph();
@@ -2389,14 +2389,14 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
     if (!hasDocumentedParams())
     {
       warn_doc_error(docFile(),docLine(),
-          "Warning: parameters of member %s are not (all) documented",
-          qualifiedName().data());
+          "warning: parameters of member %s are not (all) documented",
+          qPrint(qualifiedName()));
     }
-    if (!hasDocumentedReturnType())
+    if (!hasDocumentedReturnType() && !isDefine() && hasDocumentation())
     {
       warn_doc_error(docFile(),docLine(),
-          "Warning: return type of member %s is not documented",
-          qualifiedName().data());
+          "warning: return type of member %s is not documented",
+          qPrint(qualifiedName()));
     }
   }
 
@@ -2453,8 +2453,8 @@ void MemberDef::warnIfUndocumented()
       (m_impl->prot!=Private || Config_getBool("EXTRACT_PRIVATE"))
      )
   {
-    warn_undoc(getDefFileName(),getDefLine(),"Warning: Member %s%s (%s) of %s %s is not documented.",
-         name().data(),argsString()?argsString():"",memberTypeName().data(),t,d->name().data());
+    warn_undoc(getDefFileName(),getDefLine(),"warning: Member %s%s (%s) of %s %s is not documented.",
+         qPrint(name()),qPrint(argsString()),qPrint(memberTypeName()),t,qPrint(d->name()));
   }
 }
 
@@ -2692,7 +2692,7 @@ void MemberDef::addListReference(Definition *)
 {
   makeResident();
   static bool optimizeOutputForC = Config_getBool("OPTIMIZE_OUTPUT_FOR_C");
-  static bool hideScopeNames     = Config_getBool("HIDE_SCOPE_NAMES");
+  //static bool hideScopeNames     = Config_getBool("HIDE_SCOPE_NAMES");
   static bool optimizeOutputJava = Config_getBool("OPTIMIZE_OUTPUT_JAVA");
   static bool fortranOpt = Config_getBool("OPTIMIZE_FOR_FORTRAN");  
   visited=TRUE;
@@ -2712,6 +2712,9 @@ void MemberDef::addListReference(Definition *)
   }
   QCString memName = name();
   Definition *pd=getOuterScope();
+  QCString pdName = pd->definitionType()==Definition::TypeClass ? 
+                    ((ClassDef*)pd)->displayName() : pd->name();
+  QCString sep = optimizeOutputJava ? "." : "::";
   QCString memArgs;
   if (!isRelated() 
       /* && commented out as a result of bug 597016
@@ -2729,14 +2732,9 @@ void MemberDef::addListReference(Definition *)
     {
       memName = "[" + pd->name() + " " + name() + "]";
     }
-    else if (optimizeOutputJava)
-    {
-      if (!hideScopeNames && pd!=Doxygen::globalScope) memName.prepend(pd->name()+".");
-      memArgs = argsString();
-    }
-    else
+    else 
     {
-      if (!hideScopeNames && pd!=Doxygen::globalScope) memName.prepend(pd->name()+"::");
+      if (pd!=Doxygen::globalScope) memName.prepend(pdName+sep);
       memArgs = argsString();
     }
   }
@@ -2776,8 +2774,8 @@ Specifier MemberDef::virtualness(int count) const
   if (count>25) 
   {
      warn(getDefFileName(),getDefLine(),
-       "Warning: Internal inconsistency: recursion detected in overload relation for member %s!"
-       ,name().data()
+       "warning: Internal inconsistency: recursion detected in overload relation for member %s!"
+       ,qPrint(name())
       );
      return Normal;
   }