From 7d10b872c905c2eb0adaf98c401ce3169e6bb201 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc.waeckerlin@tech.swisssign.com>
Date: Thu, 25 Apr 2013 08:09:03 +0000
Subject: [PATCH] (re-) added log to std::clog; refs #169

---
 src/qbrowserlib/log.cxx | 12 +++++-------
 src/qbrowserlib/log.hxx |  9 ++++-----
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/qbrowserlib/log.cxx b/src/qbrowserlib/log.cxx
index 979ab4a..7693870 100644
--- a/src/qbrowserlib/log.cxx
+++ b/src/qbrowserlib/log.cxx
@@ -21,9 +21,8 @@ namespace qbrowserlib {
     if (!_debug || !_close) return;
     ++_level;
     std::stringstream ss;
-    // init(ss);
     indent(ss)<<"\\ "<<_name;
-    // std::clog<<close(ss).str()<<std::endl;
+    close(init(std::clog)<<ss.str())<<std::endl;
     if (!_dialog) _dialog = new LogDialog;
     _dialog->append(*this, ss.str());
   }
@@ -31,9 +30,8 @@ namespace qbrowserlib {
   Log::~Log() throw() {
     if (!_debug || !_close) return;
     std::stringstream ss;
-    // init(ss);
     indent(ss)<<"/ "<<_name;
-    // std::clog<<close(ss).str()<<std::endl;
+    close(init(std::clog)<<ss.str())<<std::endl;
     --_level;
     if (!_dialog) _dialog = new LogDialog;
     _dialog->append(*this, ss.str());
@@ -47,7 +45,7 @@ namespace qbrowserlib {
     _dialog->show();
   }
   
-  std::stringstream& Log::init(std::stringstream& ss) {
+  std::ostream& Log::init(std::ostream& ss) {
     if (_addr)
       ss<<std::hex<<std::setw(15)<<_addr<<": "<<std::dec;
     else
@@ -55,12 +53,12 @@ namespace qbrowserlib {
     return ss;
   }
   
-  std::stringstream& Log::indent(std::stringstream& ss) {
+  std::ostream& Log::indent(std::ostream& ss) {
     ss<<std::setw(2+_level)<<std::setfill(' ');
     return ss;
   }
   
-  std::stringstream& Log::close(std::stringstream& ss) {
+  std::ostream& Log::close(std::ostream& ss) {
     ss<<" ("<<_file<<':'<<_line<<')';
     return ss;
   }
diff --git a/src/qbrowserlib/log.hxx b/src/qbrowserlib/log.hxx
index 7e5a7fa..447934b 100644
--- a/src/qbrowserlib/log.hxx
+++ b/src/qbrowserlib/log.hxx
@@ -89,11 +89,11 @@ namespace qbrowserlib {
       
     private:
       
-      std::stringstream& init(std::stringstream& ss);
+      std::ostream& init(std::ostream& ss);
       
-      std::stringstream& indent(std::stringstream& ss);
+      std::ostream& indent(std::ostream& ss);
       
-      std::stringstream& close(std::stringstream& ss);
+      std::ostream& close(std::ostream& ss);
       
     private:
 
@@ -217,9 +217,8 @@ namespace qbrowserlib {
   template<typename TYPE> Log& Log::operator<<(TYPE arg) {
     if (!_debug) return *this;
     std::stringstream ss;
-    // init(ss);
     indent(ss)<<"   → "<<arg;
-    // std::clog<<close(ss).str()<<std::endl;
+    close(init(std::clog)<<ss.str())<<std::endl;
     if (!_dialog) _dialog = new LogDialog;
     _dialog->append(*this, ss.str());
     return *this;