Simplify logging

Let VerboseWriter solely handle logging to the destination file.
qt_message_handler takes the role of logging to cout. This allows
us to get rid of the twisted stream logic in utils.cpp, and
furthermore let us get rid of the buggy debugstream.

Change-Id: I5cf2e41b126a90025825a0d93f95b41d783ef22a
Task-number: QTIFW-524
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>

1 files changed, 2 insertions, 5 deletions

diff --git a/src/libs/installer/utils.h b/src/libs/installer/utils.h
index 879b29afc..8b6b31ea3 100644
--- a/src/libs/installer/utils.h
+++ b/src/libs/installer/utils.h
@@ -75,11 +75,8 @@ namespace QInstaller {
     void INSTALLER_EXPORT setVerbose(bool v);
     bool INSTALLER_EXPORT isVerbose();
 
-    INSTALLER_EXPORT std::ostream& stdverbose();
     INSTALLER_EXPORT std::ostream& operator<<(std::ostream &os, const QString &string);
 
-    class VerboseWriter;
-    INSTALLER_EXPORT VerboseWriter &verbose();
 
     class INSTALLER_EXPORT VerboseWriter : public QObject
     {
@@ -90,8 +87,8 @@ namespace QInstaller {
 
         static VerboseWriter *instance();
 
-        inline VerboseWriter &operator<<(const char *t) { stdverbose() << t; stream << t; return *this; }
-        inline VerboseWriter &operator<<(std::ostream& (*f)(std::ostream &s)) { stdverbose() << *f; stream << "\n"; return *this; }
+        void appendLine(const QString &msg);
+
     public slots:
         void setOutputStream(const QString &fileName);