Changeset 1795 for code/trunk/src/core/ConfigFileManager.cc

Timestamp:

Sep 17, 2008, 11:49:08 PM (16 years ago)

Author:

rgrieder

Message:

changed return type of ConfigFileManager::getInstance() to ConfigFileManager& (from pointer before).

File:

• code/trunk/src/core/ConfigFileManager.cc (modified) (2 diffs)

code/trunk/src/core/ConfigFileManager.cc

@@ -73 +73 @@
     void reloadConfig()
     {
-        ConfigFileManager::getInstance()->load();
+        ConfigFileManager::getInstance().load();
     }
 
     void cleanConfig()
     {
-        ConfigFileManager::getInstance()->clean(false);
+        ConfigFileManager::getInstance().clean(false);
     }
 
     void loadSettings(const std::string& filename)
     {
-        ConfigFileManager::getInstance()->setFile(CFT_Settings, filename, false);
+        ConfigFileManager::getInstance().setFile(CFT_Settings, filename, false);
     }
 
     void loadKeybindings(const std::string& filename)
     {
-        ConfigFileManager::getInstance()->setFile(CFT_Keybindings, filename);
+        ConfigFileManager::getInstance().setFile(CFT_Keybindings, filename);
     }
 
@@ -461 +461 @@
     }
 
-    ConfigFileManager* ConfigFileManager::getInstance()
+    ConfigFileManager& ConfigFileManager::getInstance()
     {
         static ConfigFileManager instance;
-        return (&instance);
+        return instance;
     }