Bug 693537 - Create possibility to keep user comments in Doxyfile

2 files changed, 3 insertions, 2 deletions

diff --git a/src/config.h b/src/config.h
index 7d72f52..3dcf8de 100644
--- a/src/config.h
+++ b/src/config.h
@@ -22,6 +22,7 @@
 #include <qstrlist.h>
 #include <qdict.h>
 #include <qlist.h>
+#include <qregexp.h>
 #include "ftextstream.h"
 
 
@@ -518,7 +519,7 @@ class Config
     {
       QCString result=m_userComment;
       m_userComment.resize(0);
-      return result;
+      return result.replace(QRegExp("\r"),"");
     }
 
   protected:
diff --git a/src/config.l b/src/config.l
index f3b0962..19f0267 100644
--- a/src/config.l
+++ b/src/config.l
@@ -856,7 +856,7 @@ void Config::writeTemplate(FTextStream &t,bool sl,bool upd)
   if (m_userComment)
   {
     t << "\n";
-    t << m_userComment;
+    t << takeUserComment();
   }
 }