Fixed differently by changing root cause for introducing the space

doxygen · Nov 24, 2018 · 890e356 · 890e356
1 parent dcf89b5
commit 890e356
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/src/reflist.cpp b/src/reflist.cpp
@@ -162,10 +162,7 @@ void RefList::generatePage()
       if (item->scope->name() != "<globalScope>")
       {
         doc += "\\_setscope ";
-	if (item->scope->name().right(3)==" -p")
-	  doc += item->scope->name().left(item->scope->name().length()-3) + "-p";
-        else
-          doc += item->scope->name();
+        doc += item->scope->name();
         doc += " ";
       }
     }

diff --git a/src/scanner.l b/src/scanner.l
@@ -5457,7 +5457,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					  BEGIN( FindMembers ) ;
 					}
-<CompoundName>{SCOPENAME}{BN}*/"<"	{
+<CompoundName>{SCOPENAME}/{BN}*"<"	{
   					  sharpCount = 0;
   					  current->name = yytext ;
 					  if (current->spec & Entry::Protocol)

diff --git a/src/util.cpp b/src/util.cpp
@@ -1424,12 +1424,8 @@ static ClassDef *getResolvedClassRec(const Definition *scope,
       di = Doxygen::symbolMap->find(name+"-p");
       if (di==0)
       {
-        di = Doxygen::symbolMap->find(name+" -p");
-        if (di==0)
-        {
-          //printf("no such symbol!\n");
-          return 0;
-        }
+        //printf("no such symbol!\n");
+        return 0;
       }
     //}
   }
@@ -4560,8 +4556,7 @@ static bool getScopeDefs(const char *docScope,const char *scope,
     if (scopeOffset>0) fullName.prepend(docScopeName.left(scopeOffset)+"::");
 
     if (((cd=getClass(fullName)) ||         // normal class
-         (cd=getClass(fullName+"-p")) ||    // ObjC protocol
-         (cd=getClass(fullName+" -p")) //||    // ObjC protocol
+         (cd=getClass(fullName+"-p")) //||    // ObjC protocol
          //(cd=getClass(fullName+"-g"))       // C# generic
         ) && cd->isLinkable())
     {