[Orxonox-commit 4178] r8849 - in code/branches/output/src/libraries: core core/command util/output

[landauf at orxonox.net]

Author: landauf
Date: 2011-08-21 16:50:36 +0200 (Sun, 21 Aug 2011)
New Revision: 8849

Modified:
   code/branches/output/src/libraries/core/CoreIncludes.h
   code/branches/output/src/libraries/core/command/CommandExecutor.cc
   code/branches/output/src/libraries/util/output/OutputStream.cc
   code/branches/output/src/libraries/util/output/OutputStream.h
Log:
function argument was ignored in CommandExecutor::execute()
added CoreIncludes.h to Identifier doxygen group
OutputStream sends remaining output to OutputManager before destruction

Modified: code/branches/output/src/libraries/core/CoreIncludes.h
===================================================================
--- code/branches/output/src/libraries/core/CoreIncludes.h	2011-08-21 14:04:54 UTC (rev 8848)
+++ code/branches/output/src/libraries/core/CoreIncludes.h	2011-08-21 14:50:36 UTC (rev 8849)
@@ -33,7 +33,7 @@
 
 /**
     @file
-    @ingroup Object Factory
+    @ingroup Object Factory Class Identifier
     @brief Defines several very important macros used to register objects, create factories, and to work with identifiers.
 
     Every class needs the @c RegisterObject(class) macro in its constructor. If the class is an interface

Modified: code/branches/output/src/libraries/core/command/CommandExecutor.cc
===================================================================
--- code/branches/output/src/libraries/core/command/CommandExecutor.cc	2011-08-21 14:04:54 UTC (rev 8848)
+++ code/branches/output/src/libraries/core/command/CommandExecutor.cc	2011-08-21 14:50:36 UTC (rev 8849)
@@ -72,7 +72,7 @@
     {
         int error;
         CommandExecutor::queryMT(command, &error, useTcl);
-        if (error)
+        if (error && printErrors)
             orxout(user_error) << "Can't execute \"" << command << "\", " << CommandExecutor::getErrorDescription(error) << ". (execute)" << endl;
         return error;
     }

Modified: code/branches/output/src/libraries/util/output/OutputStream.cc
===================================================================
--- code/branches/output/src/libraries/util/output/OutputStream.cc	2011-08-21 14:04:54 UTC (rev 8848)
+++ code/branches/output/src/libraries/util/output/OutputStream.cc	2011-08-21 14:50:36 UTC (rev 8849)
@@ -54,6 +54,15 @@
     }
 
     /**
+        @brief Destructor, sends remaining output to OutputManager (if any).
+    */
+    OutputStream::~OutputStream()
+    {
+        if (this->str() != "")
+            *this << " [missing endl]" << std::endl;
+    }
+
+    /**
         @brief Sends the buffered message to OutputManager together with the stored level and context.
         Additionally empties the buffer.
     */

Modified: code/branches/output/src/libraries/util/output/OutputStream.h
===================================================================
--- code/branches/output/src/libraries/util/output/OutputStream.h	2011-08-21 14:04:54 UTC (rev 8848)
+++ code/branches/output/src/libraries/util/output/OutputStream.h	2011-08-21 14:50:36 UTC (rev 8849)
@@ -77,6 +77,7 @@
         public:
             _UtilExport OutputStream();
             _UtilExport OutputStream(OutputLevel level, const OutputContextContainer& context);
+            _UtilExport ~OutputStream();
 
             void _UtilExport setOutputAttributes(OutputLevel level, const OutputContextContainer& context);