Changeset 9550 for code/trunk/src/libraries/util/output/ConsoleWriter.h

Timestamp:

Mar 12, 2013, 11:13:03 PM (11 years ago)

Author:

landauf

Message:

merged testing branch back to trunk. unbelievable it took me 13 months to finish this chore…

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/util/output/ConsoleWriter.h (modified) (3 diffs)

code/trunk/src/libraries/util/output/ConsoleWriter.h

@@ -37 +37 @@
 
 #include "util/UtilPrereqs.h"
+
+#include <ostream>
+
 #include "BaseWriter.h"
 
@@ -44 +47 @@
         @brief ConsoleWriter inherits from BaseWriter and writes output to the console.
 
-        This class can be seen as an equivalent to std::cout within the output
-        system. It is implemented as a singleton for static acces.
+        This class can be seen as an equivalent to std::cout within the output system.
     */
     class _UtilExport ConsoleWriter : public BaseWriter
     {
         public:
-            static ConsoleWriter& getInstance();
+            ConsoleWriter(std::ostream& outputStream);
+            ConsoleWriter(const ConsoleWriter&);
+            virtual ~ConsoleWriter();
 
             void enable();
             void disable();
+
+            inline const std::ostream& getOutputStream() const
+                { return this->outputStream_; }
 
         protected:
@@ -59 +66 @@
 
         private:
-            ConsoleWriter();
-            ConsoleWriter(const ConsoleWriter&);
-            virtual ~ConsoleWriter();
-
-            bool bEnabled_; ///< If false, the instance will not write output to the console.
+            std::ostream& outputStream_; ///< The ostream to which the console writer writes its output
+            bool bEnabled_;              ///< If false, the instance will not write output to the console.
     };
 }