SingletonPtr hinzugefuegt

1 files changed, 8 insertions, 10 deletions

diff --git a/src/madc.cpp b/src/madc.cpp
index 7397972..5dcb6ad 100644
--- a/src/madc.cpp
+++ b/src/madc.cpp
@@ -54,7 +54,7 @@ static void handleCommand(char *cmd) {
 
   if(Client::CommandManager::get()->requestsActive()) {
     rl_callback_handler_remove();
-    Net::FdManager::getFdManager()->setFdEvents(STDIN_FILENO, 0);
+    Net::FdManager::get()->setFdEvents(STDIN_FILENO, 0);
   }
 }
 
@@ -68,7 +68,7 @@ static void activateReadline() {
     return;
 
   rl_callback_handler_install("mad> ", handleCommand);
-  Net::FdManager::getFdManager()->setFdEvents(STDIN_FILENO, POLLIN);
+  Net::FdManager::get()->setFdEvents(STDIN_FILENO, POLLIN);
 }
 
 int main(int argc, char *argv[]) {
@@ -79,11 +79,10 @@ int main(int argc, char *argv[]) {
 
   Net::Connection::init();
 
-  Common::LogManager::get()->init();
+  Common::LogManager::get();
 
   Common::ConfigManager::get()->finish();
 
-  Common::RequestManager::get()->init();
   Net::ClientConnection *connection = new Net::ClientConnection;
 
   try {
@@ -92,7 +91,7 @@ int main(int argc, char *argv[]) {
     std::cerr << "Connecting to " << argv[1] << "..." << std::flush;
 
     while(connection->isConnecting())
-      Net::FdManager::getFdManager()->run();
+      Net::FdManager::get()->run();
 
     std::cerr << " connected." << std::endl;
 
@@ -100,25 +99,24 @@ int main(int argc, char *argv[]) {
 
     std::cerr << "Receiving host list..." << std::flush;
 
-    Client::InformationManager::get()->init();
     Client::InformationManager::get()->updateDaemonList(connection);
 
     while(Client::InformationManager::get()->isUpdating())
-      Net::FdManager::getFdManager()->run();
+      Net::FdManager::get()->run();
 
     std::cerr << " done." << std::endl << std::endl;
 
     Client::CommandParser::get()->setConnection(connection);
     Client::CommandManager::get()->signalFinished().connect(sigc::ptr_fun(activateReadline));
 
-    Net::FdManager::getFdManager()->registerFd(STDIN_FILENO, sigc::ptr_fun(charHandler));
+    Net::FdManager::get()->registerFd(STDIN_FILENO, sigc::ptr_fun(charHandler));
 
     activateReadline();
 
     while(connection->isConnected())
-      Net::FdManager::getFdManager()->run();
+      Net::FdManager::get()->run();
 
-    Net::FdManager::getFdManager()->unregisterFd(STDIN_FILENO);
+    Net::FdManager::get()->unregisterFd(STDIN_FILENO);
 
     Common::RequestManager::get()->unregisterConnection(connection);
   }