Changeset 9547 for code/branches/testing/src/libraries/core

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/src/libraries/core

Files:

• Core.cc (modified) (2 diffs)
• command/Shell.cc (modified) (1 diff)

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);
     }