1 files changed, 17 insertions, 6 deletions
diff --git a/src/message.cpp b/src/message.cpp
index 678a80a..9554c02 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -18,7 +18,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include "config.h"
-#include <qregexp.h>
+#include "util.h"
 
 static QCString outputFormat;
 static int warnFormatOrder; // 1 = $file,$line,$text
@@ -62,11 +62,22 @@ void initWarningFormat()
   {
     warnFormatOrder = 6;
   }
-  outputFormat = Config::warnFormat.
-      replace(QRegExp("\\$file"),"%s").
-      replace(QRegExp("\\$text"),"%s").
-      replace(QRegExp("\\$line"),"%d")+
-      '\n';
+  outputFormat = 
+      substitute(
+        substitute(
+          substitute( 
+            Config::warnFormat,
+           "$file","%s"
+          ),
+          "$text","%s"
+        ),
+        "$line","%d"
+      )+'\n';
+
+  //    replace(QRegExp("\\$file"),"%s").
+  //    replace(QRegExp("\\$text"),"%s").
+  //    replace(QRegExp("\\$line"),"%d")+
+  //    '\n';
 }