Moved removeWhiteSpace() into the QCString class

Author: doxygen

src/qcstring.h

@@ -239,6 +239,7 @@ class QCString
       return QCString(convertUTF8ToUpper(m_rep));
     }
 
+    /// returns a copy of this string with leading and trailing whitespace removed
     QCString stripWhiteSpace() const
     {
       int sl = (uint)m_rep.size();
@@ -250,6 +251,24 @@ class QCString
       return QCString(m_rep.substr(start,1+end-start));
     }
 
+    /// returns a copy of this string with all whitespace removed
+    QCString removeWhiteSpace() const
+    {
+      size_t sl = (uint)m_rep.size();
+      if (sl==0) return *this;
+      std::string result = m_rep;
+      size_t src=0,dst=0;
+      while (src<sl)
+      {
+        if (!qisspace(m_rep[src])) result[dst++]=m_rep[src];
+        src++;
+      }
+      if (dst<m_rep.size()) result.resize(dst);
+      return QCString(result);
+    }
+
+    /// return a copy of this string with leading and trailing whitespace removed and multiple
+    /// whitespace characters replaced by a single space
     QCString simplifyWhiteSpace() const;
 
     QCString &insert( uint index, const QCString &s )

src/scanner.l

@@ -226,8 +226,6 @@ static void addKnRArgInfo(yyscan_t yyscanner,const QCString &type,const QCString
                           const QCString &brief,const QCString &docs);
 static yy_size_t yyread(yyscan_t yyscanner,char *buf,yy_size_t max_size);
 
-static QCString removeWhiteSpace(const QCString &s);
-
 /* ----------------------------------------------------------------- */
 #undef  YY_INPUT
 #define YY_INPUT(buf,result,max_size) result=yyread(yyscanner,buf,max_size);
@@ -2346,7 +2344,7 @@ NONLopt [^\n]*
                                               BEGIN(FindMembers);
                                             }
                                           }
-                                          yyextra->current->name = removeWhiteSpace(yyextra->current->name);
+                                          yyextra->current->name = yyextra->current->name.removeWhiteSpace();
                                         }
 <StaticAssert>"("                       {
                                           yyextra->lastSkipRoundContext = FindMembers;
@@ -7706,19 +7704,6 @@ static void parsePrototype(yyscan_t yyscanner,const QCString &text)
   //printf("**** parsePrototype end\n");
 }
 
-// removeRedundantWhiteSpace does not work as it will leave e.g. "foo:: bar"
-static QCString removeWhiteSpace(const QCString &s)
-{
-  QCString res;
-  uint l=s.length();
-  const char *src=s.data();
-  for (uint i = 0;i<l;i++)
-  {
-    if (!isspace((uchar)src[i])) res += src[i];
-  }
-  return res;
-}
-
 //static void handleGroupStartCommand(const char *header)
 //{
 //  memberGroupHeader=header;