From 854421e2c144ab6454d67beb6640579ad13f1a1f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Wed, 19 Nov 2008 16:15:17 +0100
Subject: Kurze statische get()-Methoden

---
 src/Common/ConfigManager.h   | 2 +-
 src/Common/Initializable.cpp | 8 ++++----
 src/Common/LogManager.h      | 2 +-
 src/Common/Logger.cpp        | 2 +-
 src/Common/RequestManager.h  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/Common')

diff --git a/src/Common/ConfigManager.h b/src/Common/ConfigManager.h
index b4264d5..036eed7 100644
--- a/src/Common/ConfigManager.h
+++ b/src/Common/ConfigManager.h
@@ -57,7 +57,7 @@ class ConfigManager {
       configurables.erase(c);
     }
 
-    static ConfigManager *getConfigManager() {
+    static ConfigManager *get() {
       return &configManager;
     }
 };
diff --git a/src/Common/Initializable.cpp b/src/Common/Initializable.cpp
index adcb0fa..9e7a49e 100644
--- a/src/Common/Initializable.cpp
+++ b/src/Common/Initializable.cpp
@@ -41,14 +41,14 @@ void Initializable::init() {
 
   initializing = true;
 
-  if(!(LogManager::getLogManager()->isInitialized() || LogManager::getLogManager()->isInitializing()))
-    LogManager::getLogManager()->init();
+  if(!(LogManager::get()->isInitialized() || LogManager::get()->isInitializing()))
+    LogManager::get()->init();
 
   doInit();
 
   Configurable *c = dynamic_cast<Configurable*>(this);
   if(c)
-    ConfigManager::getConfigManager()->registerConfigurable(c);
+    ConfigManager::get()->registerConfigurable(c);
 
   initializing = false;
   initialized = true;
@@ -61,7 +61,7 @@ void Initializable::deinit() {
 
     Configurable *c = dynamic_cast<Configurable*>(in);
     if(c)
-      ConfigManager::getConfigManager()->unregisterConfigurable(c);
+      ConfigManager::get()->unregisterConfigurable(c);
 
     in->doDeinit();
     in->initialized = false;
diff --git a/src/Common/LogManager.h b/src/Common/LogManager.h
index 65fcf19..22a8c75 100644
--- a/src/Common/LogManager.h
+++ b/src/Common/LogManager.h
@@ -86,7 +86,7 @@ class LogManager : public Configurable {
       remoteLoggers.erase(logger);
     }
 
-    static LogManager *getLogManager() {
+    static LogManager *get() {
       return &logManager;
     }
 };
diff --git a/src/Common/Logger.cpp b/src/Common/Logger.cpp
index 8586fa9..e746faf 100644
--- a/src/Common/Logger.cpp
+++ b/src/Common/Logger.cpp
@@ -54,7 +54,7 @@ void Logger::logfv(MessageCategory category, MessageLevel level, const char *for
 }
 
 void Logger::log(MessageCategory category, MessageLevel level, const std::string &message) {
-  LogManager::getLogManager()->log(category, level, std::time(0), message);
+  LogManager::get()->log(category, level, std::time(0), message);
 }
 
 void Logger::logf(MessageCategory category, MessageLevel level, const char *format, ...) {
diff --git a/src/Common/RequestManager.h b/src/Common/RequestManager.h
index b0002d0..723e619 100644
--- a/src/Common/RequestManager.h
+++ b/src/Common/RequestManager.h
@@ -86,7 +86,7 @@ class RequestManager : public Initializable {
     void receiveHandler(Net::Connection *connection, const Net::Packet &packet);
 
   public:
-    static RequestManager* getRequestManager() {
+    static RequestManager* get() {
       return &requestManager;
     }
 
-- 
cgit v1.2.3