Kurze statische get()-Methoden

1 files changed, 12 insertions, 12 deletions

diff --git a/src/mad.cpp b/src/mad.cpp
index d2315f1..54b25d0 100644
--- a/src/mad.cpp
+++ b/src/mad.cpp
@@ -45,13 +45,13 @@ static void requestFinished(const Common::Request<>&) {
 int main() {
   Net::Connection::init();
 
-  Common::ConfigManager::getConfigManager()->finish();
+  Common::ConfigManager::get()->finish();
 
-  Common::RequestManager::getRequestManager()->init();
-  Common::RequestManager::getRequestManager()->registerPacketType<Common::RequestHandlers::FSInfoRequestHandler>(Net::Packet::FS_INFO);
-  Common::RequestManager::getRequestManager()->registerPacketType<Common::RequestHandlers::StatusRequestHandler>(Net::Packet::STATUS);
-  Common::RequestManager::getRequestManager()->registerPacketType<Daemon::RequestHandlers::CommandRequestHandler>(Net::Packet::COMMAND_REBOOT);
-  Common::RequestManager::getRequestManager()->registerPacketType<Daemon::RequestHandlers::CommandRequestHandler>(Net::Packet::COMMAND_SHUTDOWN);
+  Common::RequestManager::get()->init();
+  Common::RequestManager::get()->registerPacketType<Common::RequestHandlers::FSInfoRequestHandler>(Net::Packet::FS_INFO);
+  Common::RequestManager::get()->registerPacketType<Common::RequestHandlers::StatusRequestHandler>(Net::Packet::STATUS);
+  Common::RequestManager::get()->registerPacketType<Daemon::RequestHandlers::CommandRequestHandler>(Net::Packet::COMMAND_REBOOT);
+  Common::RequestManager::get()->registerPacketType<Daemon::RequestHandlers::CommandRequestHandler>(Net::Packet::COMMAND_SHUTDOWN);
 
   Common::Backends::SystemBackendPosix::registerBackend();
   Common::Backends::SystemBackendProc::registerBackend();
@@ -64,23 +64,23 @@ int main() {
     while(connection->isConnecting())
       Net::FdManager::getFdManager()->run();
 
-    Common::RequestManager::getRequestManager()->registerConnection(connection);
+    Common::RequestManager::get()->registerConnection(connection);
 
     Common::SharedPtr<Common::Logger> networkLogger = new Daemon::Backends::NetworkLogger(connection);
-    Common::LogManager::getLogManager()->registerLogger(networkLogger);
+    Common::LogManager::get()->registerLogger(networkLogger);
 
 
     //char hostname[256];
     //gethostname(hostname, sizeof(hostname));
-    //Common::RequestManager::getRequestManager()->sendRequest(connection, std::auto_ptr<Common::RequestBase>(new Daemon::Requests::IdentifyRequest(hostname, sigc::ptr_fun(requestFinished))));
-    Common::RequestManager::getRequestManager()->sendRequest(connection, std::auto_ptr<Common::RequestBase>(new Daemon::Requests::IdentifyRequest("test", sigc::ptr_fun(requestFinished))));
+    //Common::RequestManager::get()->sendRequest(connection, std::auto_ptr<Common::RequestBase>(new Daemon::Requests::IdentifyRequest(hostname, sigc::ptr_fun(requestFinished))));
+    Common::RequestManager::get()->sendRequest(connection, std::auto_ptr<Common::RequestBase>(new Daemon::Requests::IdentifyRequest("test", sigc::ptr_fun(requestFinished))));
 
     while(connection->isConnected())
       Net::FdManager::getFdManager()->run();
 
-    Common::LogManager::getLogManager()->unregisterLogger(networkLogger);
+    Common::LogManager::get()->unregisterLogger(networkLogger);
 
-    Common::RequestManager::getRequestManager()->unregisterConnection(connection);
+    Common::RequestManager::get()->unregisterConnection(connection);
   }
   catch(Mad::Common::Exception &e) {
     Common::Logger::logf(Common::Logger::CRITICAL, "Connection error: %s", e.strerror().c_str());