Changeset 1452 for code/branches/network/src

Timestamp:

May 28, 2008, 3:09:33 PM (16 years ago)

Author:

rgrieder

Message:

• removed Shell.h dependency from OutputHandler.h to avoid recompiling the entire project when InputBuffer.h changes

Location:

code/branches/network/src/core

Files:

• OutputHandler.cc (modified) (2 diffs)
• OutputHandler.h (modified) (4 diffs)

code/branches/network/src/core/OutputHandler.cc

@@ -35 +35 @@
 #include "CoreSettings.h"
 #include "ConsoleCommand.h"
+#include "Shell.h"
 
 namespace orxonox
@@ -83 +84 @@
     {
         return CoreSettings::getSoftDebugLevel(device);
+    }
+
+    /**
+        @brief Returns the Shell's OutputBuffer. This is mere placed here to avoid
+               recompiling the entire project when Shell.h changes.
+        @return The OutputBuffer of the Shell
+    */
+    OutputBuffer& OutputHandler::getShellOutputBuffer()
+    {
+        return Shell::getInstance().getOutputBuffer();
     }
 

code/branches/network/src/core/OutputHandler.h

@@ -44 +44 @@
 #include <string>
 
-#include "Shell.h"
+#include "OutputBuffer.h"
 
 namespace orxonox
@@ -95 +95 @@
 
             static int getSoftDebugLevel(OutputHandler::OutputDevice device);
+
+            OutputBuffer& getShellOutputBuffer();
 
             template <class T>
@@ -157 +159 @@
 
         if (OutputHandler::getSoftDebugLevel(OutputHandler::LD_Shell) >= this->outputLevel_)
-            Shell::getInstance().getOutputBuffer() << output;
+            OutputHandler::getOutStream().getShellOutputBuffer() << output;
 
         return *this;
@@ -181 +183 @@
 
         if (OutputHandler::getSoftDebugLevel(OutputHandler::LD_Shell) >= out.getOutputLevel())
-            Shell::getInstance().getOutputBuffer() << output;
+            OutputHandler::getOutStream().getShellOutputBuffer() << output;
 
         return out;