Changeset 1313 for code/branches/console/src/core/OutputBuffer.h

Timestamp:

May 17, 2008, 3:58:19 AM (16 years ago)

Author:

landauf

Message:

• implemented Shell, but not yet linked with the graphical console
• added new features (cursor, OIS::KeyCode listener) to InputBuffer
• changed some includes to avoid circular header-dependencies in OrxonoxClass and Shell

File:

• code/branches/console/src/core/OutputBuffer.h (modified) (5 diffs)

code/branches/console/src/core/OutputBuffer.h

@@ -30 +30 @@
 #define _OutputBuffer_H__
 
-#include <set>
+#include <list>
 #include <sstream>
 
@@ -37 +37 @@
 namespace orxonox
 {
-    class OutputBufferListener
+    class _CoreExport OutputBufferListener
     {
         friend class OutputBuffer;
+
         virtual void outputChanged() = 0;
     };
@@ -46 +47 @@
     {
         public:
-            static OutputBuffer& getOutputBuffer();
+            OutputBuffer() {}
+            ~OutputBuffer() {}
 
             template <class T>
@@ -53 +55 @@
                 this->stream_ << object;
                 this->callListeners();
-                return &this;
+                return *this;
             }
 
@@ -86 +88 @@
             void unregisterListener(OutputBufferListener* listener);
 
+            inline operator std::stringstream&()
+            {
+                return this->stream_;
+            }
+
         private:
-            OutputBuffer() {}
-            OutputBuffer(const OutputBuffer& other);
-            ~OutputBuffer() {}
-
             void callListeners();
 
             std::stringstream stream_;
-            std::set<OutputBufferListener*> listeners_;
+            std::list<OutputBufferListener*> listeners_;
     };
 }