Changeset 9547

Timestamp:

Mar 12, 2013, 10:05:25 PM (12 years ago)

Author:

landauf

Message:

return pointers instead of references because they could be null

Location:

code/branches/testing

Files:

• src/libraries/core/Core.cc (modified) (2 diffs)
• src/libraries/core/command/Shell.cc (modified) (1 diff)
• src/libraries/util/output/LogWriter.cc (modified) (1 diff)
• src/libraries/util/output/OutputManager.h (modified) (1 diff)
• src/orxonox/overlays/InGameConsole.cc (modified) (1 diff)
• test/util/output/ConsoleWriterTest.cc (modified) (1 diff)
• test/util/output/OutputManagerTest.cc (modified) (3 diffs)
• test/util/output/OutputStreamTest.cc (modified) (2 diffs)

code/branches/testing/src/libraries/core/Core.cc

@@ -181 +181 @@
 
         // Set the correct log path and rewrite the log file with the correct log levels
-        OutputManager::getInstance().getLogWriter().setLogDirectory(PathConfig::getLogPathString());
+        OutputManager::getInstance().getLogWriter()->setLogDirectory(PathConfig::getLogPathString());
 
 #if !defined(ORXONOX_PLATFORM_APPLE) && !defined(ORXONOX_USE_WINMAIN)
@@ -259 +259 @@
     void Core::setConfigValues()
     {
-        SetConfigValueExternal(OutputManager::getInstance().getLogWriter().configurableMaxLevel_,
-                               OutputManager::getInstance().getLogWriter().getConfigurableSectionName(),
-                               OutputManager::getInstance().getLogWriter().getConfigurableMaxLevelName(),
-                               OutputManager::getInstance().getLogWriter().configurableMaxLevel_)
+        SetConfigValueExternal(OutputManager::getInstance().getLogWriter()->configurableMaxLevel_,
+                               OutputManager::getInstance().getLogWriter()->getConfigurableSectionName(),
+                               OutputManager::getInstance().getLogWriter()->getConfigurableMaxLevelName(),
+                               OutputManager::getInstance().getLogWriter()->configurableMaxLevel_)
             .description("The maximum level of output shown in the log file")
-            .callback(static_cast<BaseWriter*>(&OutputManager::getInstance().getLogWriter()), &BaseWriter::changedConfigurableLevel);
-        SetConfigValueExternal(OutputManager::getInstance().getLogWriter().configurableAdditionalContextsMaxLevel_,
-                               OutputManager::getInstance().getLogWriter().getConfigurableSectionName(),
-                               OutputManager::getInstance().getLogWriter().getConfigurableAdditionalContextsMaxLevelName(),
-                               OutputManager::getInstance().getLogWriter().configurableAdditionalContextsMaxLevel_)
+            .callback(static_cast<BaseWriter*>(OutputManager::getInstance().getLogWriter()), &BaseWriter::changedConfigurableLevel);
+        SetConfigValueExternal(OutputManager::getInstance().getLogWriter()->configurableAdditionalContextsMaxLevel_,
+                               OutputManager::getInstance().getLogWriter()->getConfigurableSectionName(),
+                               OutputManager::getInstance().getLogWriter()->getConfigurableAdditionalContextsMaxLevelName(),
+                               OutputManager::getInstance().getLogWriter()->configurableAdditionalContextsMaxLevel_)
             .description("The maximum level of output shown in the log file for additional contexts")
-            .callback(static_cast<BaseWriter*>(&OutputManager::getInstance().getLogWriter()), &BaseWriter::changedConfigurableAdditionalContextsLevel);
-        SetConfigValueExternal(OutputManager::getInstance().getLogWriter().configurableAdditionalContexts_,
-                               OutputManager::getInstance().getLogWriter().getConfigurableSectionName(),
-                               OutputManager::getInstance().getLogWriter().getConfigurableAdditionalContextsName(),
-                               OutputManager::getInstance().getLogWriter().configurableAdditionalContexts_)
+            .callback(static_cast<BaseWriter*>(OutputManager::getInstance().getLogWriter()), &BaseWriter::changedConfigurableAdditionalContextsLevel);
+        SetConfigValueExternal(OutputManager::getInstance().getLogWriter()->configurableAdditionalContexts_,
+                               OutputManager::getInstance().getLogWriter()->getConfigurableSectionName(),
+                               OutputManager::getInstance().getLogWriter()->getConfigurableAdditionalContextsName(),
+                               OutputManager::getInstance().getLogWriter()->configurableAdditionalContexts_)
             .description("Additional output contexts shown in the log file")
-            .callback(static_cast<BaseWriter*>(&OutputManager::getInstance().getLogWriter()), &BaseWriter::changedConfigurableAdditionalContexts);
+            .callback(static_cast<BaseWriter*>(OutputManager::getInstance().getLogWriter()), &BaseWriter::changedConfigurableAdditionalContexts);
 
         SetConfigValue(bDevMode_, PathConfig::buildDirectoryRun())

code/branches/testing/src/libraries/core/command/Shell.cc

@@ -88 +88 @@
 
         // Get the previous output and add it to the Shell
-        OutputManager::getInstance().getMemoryWriter().resendOutput(this);
+        OutputManager::getInstance().getMemoryWriter()->resendOutput(this);
     }
 

code/branches/testing/src/libraries/util/output/LogWriter.cc

@@ -168 +168 @@
 
         // request old output from MemoryWriter
-        if (&OutputManager::getInstance().getMemoryWriter())
-            OutputManager::getInstance().getMemoryWriter().resendOutput(this);
+        if (OutputManager::getInstance().getMemoryWriter())
+            OutputManager::getInstance().getMemoryWriter()->resendOutput(this);
     }
 

code/branches/testing/src/libraries/util/output/OutputManager.h

@@ -72 +72 @@
             static OutputManager& getInstanceAndCreateListeners();
 
-            inline MemoryWriter& getMemoryWriter()   { return *this->memoryWriterInstance_; }
-            inline ConsoleWriter& getConsoleWriter() { return *this->consoleWriterInstance_; }
-            inline LogWriter& getLogWriter()         { return *this->logWriterInstance_; }
+            inline MemoryWriter* getMemoryWriter()   { return this->memoryWriterInstance_; }
+            inline ConsoleWriter* getConsoleWriter() { return this->consoleWriterInstance_; }
+            inline LogWriter* getLogWriter()         { return this->logWriterInstance_; }
 
             virtual void pushMessage(OutputLevel level, const OutputContextContainer& context, const std::string& message);

code/branches/testing/src/orxonox/overlays/InGameConsole.cc

@@ -96 +96 @@
         // Output buffering is not anymore needed. Not the best solution to do
         // this here, but there isn't much of another way.
-        OutputManager::getInstance().getMemoryWriter().disable();
+        OutputManager::getInstance().getMemoryWriter()->disable();
     }
 

code/branches/testing/test/util/output/ConsoleWriterTest.cc

@@ -66 +66 @@
     {
         OutputManager::getInstanceAndCreateListeners();
-        EXPECT_EQ(std::cout, OutputManager::getInstance().getConsoleWriter().getOutputStream());
+        EXPECT_EQ(std::cout, OutputManager::getInstance().getConsoleWriter()->getOutputStream());
     }
 }

code/branches/testing/test/util/output/OutputManagerTest.cc

@@ -54 +54 @@
     TEST(OutputManagerTest, GetInstanceDoesNotCreateDefaultListeners)
     {
-        EXPECT_TRUE(NULL == &OutputManager::getInstance().getMemoryWriter());
-        EXPECT_TRUE(NULL == &OutputManager::getInstance().getConsoleWriter());
-        EXPECT_TRUE(NULL == &OutputManager::getInstance().getLogWriter());
+        EXPECT_TRUE(NULL == OutputManager::getInstance().getMemoryWriter());
+        EXPECT_TRUE(NULL == OutputManager::getInstance().getConsoleWriter());
+        EXPECT_TRUE(NULL == OutputManager::getInstance().getLogWriter());
     }
 
@@ -62 +62 @@
     TEST(OutputManagerTest, GetInstanceAndCreateListenersCreatesDefaultListeners)
     {
-        EXPECT_TRUE(NULL != &OutputManager::getInstanceAndCreateListeners().getMemoryWriter());
-        EXPECT_TRUE(NULL != &OutputManager::getInstanceAndCreateListeners().getConsoleWriter());
-        EXPECT_TRUE(NULL != &OutputManager::getInstanceAndCreateListeners().getLogWriter());
+        EXPECT_TRUE(NULL != OutputManager::getInstanceAndCreateListeners().getMemoryWriter());
+        EXPECT_TRUE(NULL != OutputManager::getInstanceAndCreateListeners().getConsoleWriter());
+        EXPECT_TRUE(NULL != OutputManager::getInstanceAndCreateListeners().getLogWriter());
     }
 
@@ -70 +70 @@
     TEST(OutputManagerTest, GetInstanceAndCreateListenersDoesNotCreateDefaultListenersTwice)
     {
-        MemoryWriter* memoryWriter = &OutputManager::getInstanceAndCreateListeners().getMemoryWriter();
-        ConsoleWriter* consoleWriter = &OutputManager::getInstanceAndCreateListeners().getConsoleWriter();
-        LogWriter* logWriter = &OutputManager::getInstanceAndCreateListeners().getLogWriter();
-
-        EXPECT_TRUE(memoryWriter == &OutputManager::getInstanceAndCreateListeners().getMemoryWriter());
-        EXPECT_TRUE(consoleWriter == &OutputManager::getInstanceAndCreateListeners().getConsoleWriter());
-        EXPECT_TRUE(logWriter == &OutputManager::getInstanceAndCreateListeners().getLogWriter());
+        MemoryWriter* memoryWriter = OutputManager::getInstanceAndCreateListeners().getMemoryWriter();
+        ConsoleWriter* consoleWriter = OutputManager::getInstanceAndCreateListeners().getConsoleWriter();
+        LogWriter* logWriter = OutputManager::getInstanceAndCreateListeners().getLogWriter();
+
+        EXPECT_TRUE(memoryWriter == OutputManager::getInstanceAndCreateListeners().getMemoryWriter());
+        EXPECT_TRUE(consoleWriter == OutputManager::getInstanceAndCreateListeners().getConsoleWriter());
+        EXPECT_TRUE(logWriter == OutputManager::getInstanceAndCreateListeners().getLogWriter());
     }
 

code/branches/testing/test/util/output/OutputStreamTest.cc

@@ -64 +64 @@
     {
         // disable MemoryWriter because otherwise we would always accept all output
-        OutputManager::getInstance().getMemoryWriter().disable();
+        OutputManager::getInstance().getMemoryWriter()->disable();
 
         {
@@ -140 +140 @@
     {
         // disable MemoryWriter because otherwise we would always accept all output
-        OutputManager::getInstanceAndCreateListeners().getMemoryWriter().disable();
+        OutputManager::getInstanceAndCreateListeners().getMemoryWriter()->disable();
 
         OutputStream stream;