Merge branch 'master' of github.com:doxygen/doxygen

2 files changed, 8 insertions, 8 deletions

diff --git a/addon/doxyapp/doxyapp.cpp b/addon/doxyapp/doxyapp.cpp
index 45e71fc..1249871 100644
--- a/addon/doxyapp/doxyapp.cpp
+++ b/addon/doxyapp/doxyapp.cpp
@@ -76,15 +76,15 @@ class XRefDummyCodeGenerator : public CodeOutputInterface
              // it is inside a member of a class
           {
             ctx.sprintf("inside %s %s of %s %s",
-              ((MemberDef *)context)->memberTypeName().data(),
+              (dynamic_cast<MemberDef*>(context))->memberTypeName().data(),
               context->name().data(),
-              ((ClassDef*)parentContext)->compoundTypeString().data(),
+              (dynamic_cast<ClassDef*>(parentContext))->compoundTypeString().data(),
               parentContext->name().data());
           }
           else if (parentContext==Doxygen::globalScope) // it is inside a global member
           {
             ctx.sprintf("inside %s %s",
-              ((MemberDef *)context)->memberTypeName().data(),
+              (dynamic_cast<MemberDef*>(context))->memberTypeName().data(),
               context->name().data());
           }
         }
@@ -185,20 +185,20 @@ static void lookupSymbol(Definition *d)
     {
       case Definition::TypeClass:
         {
-          ClassDef *cd = (ClassDef *)d;
+          ClassDef *cd = dynamic_cast<ClassDef*>(d);
           printf("Kind: %s\n",cd->compoundTypeString().data());
         }
         break;
       case Definition::TypeFile:
         {
-          FileDef *fd = (FileDef *)d;
+          FileDef *fd = dynamic_cast<FileDef*>(d);
           printf("Kind: File: #includes %d other files\n",
               fd->includeFileList() ? fd->includeFileList()->count() : 0);
         }
         break;
       case Definition::TypeNamespace:
         {
-          NamespaceDef *nd = (NamespaceDef *)d;
+          NamespaceDef *nd = dynamic_cast<NamespaceDef*>(d);
           printf("Kind: Namespace: contains %d classes and %d namespaces\n",
               nd->getClassSDict() ? nd->getClassSDict()->count() : 0,
               nd->getNamespaceSDict() ? nd->getNamespaceSDict()->count() : 0);
@@ -206,7 +206,7 @@ static void lookupSymbol(Definition *d)
         break;
       case Definition::TypeMember:
         {
-          MemberDef *md = (MemberDef *)d;
+          MemberDef *md = dynamic_cast<MemberDef*>(d);
           printf("Kind: %s\n",md->memberTypeName().data());
         }
         break;
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 85ca7a3..fa54d68 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -9802,7 +9802,7 @@ static void escapeAliases()
     while ((in=value.find("^^",p))!=-1)
     {
       newValue+=value.mid(p,in-p);
-      newValue+="\\\\_linebr";
+      newValue+="\\\\_linebr ";
       p=in+2;
     }
     newValue+=value.mid(p,value.length()-p);