revamp message callbacks

instead of having a bazillion different callbacks, have only one with a
type parameter. the drain typically multiplexes all into one stream anyway.

Change-Id: I963daefc5a266c91334a4cc599570ed26b603d5d
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

2 files changed, 2 insertions, 6 deletions

diff --git a/tests/auto/profilewriter/tst_profilewriter.cpp b/tests/auto/profilewriter/tst_profilewriter.cpp
index fa98d73021..e063b77efd 100644
--- a/tests/auto/profilewriter/tst_profilewriter.cpp
+++ b/tests/auto/profilewriter/tst_profilewriter.cpp
@@ -47,7 +47,7 @@ static void print(const QString &fileName, int lineNo, const QString &msg)
 
 class ParseHandler : public QMakeParserHandler {
 public:
-    virtual void parseError(const QString &fileName, int lineNo, const QString &msg)
+    virtual void message(int /* type */, const QString &msg, const QString &fileName, int lineNo)
         { print(fileName, lineNo, msg); }
 };
 
diff --git a/tests/manual/proparser/main.cpp b/tests/manual/proparser/main.cpp
index c80c3193fc..dd89628a48 100644
--- a/tests/manual/proparser/main.cpp
+++ b/tests/manual/proparser/main.cpp
@@ -53,13 +53,9 @@ static void print(const QString &fileName, int lineNo, const QString &msg)
 
 class EvalHandler : public QMakeHandler {
 public:
-    virtual void parseError(const QString &fileName, int lineNo, const QString &msg)
+    virtual void message(int /* type */, const QString &msg, const QString &fileName, int lineNo)
         { print(fileName, lineNo, msg); }
 
-    virtual void configError(const QString &msg)
-        { qWarning("%s", qPrintable(msg)); }
-    virtual void evalError(const QString &fileName, int lineNo, const QString &msg)
-        { print(fileName, lineNo, msg); }
     virtual void fileMessage(const QString &msg)
         { qWarning("%s", qPrintable(msg)); }