Kurze statische get()-Methoden

1 files changed, 14 insertions, 14 deletions

diff --git a/src/madc.cpp b/src/madc.cpp
index b758ec8..7397972 100644
--- a/src/madc.cpp
+++ b/src/madc.cpp
@@ -44,15 +44,15 @@ static void usage(const std::string &cmd) {
 
 static void handleCommand(char *cmd) {
   if(!cmd)
-    Client::CommandParser::getCommandParser()->requestDisconnect();
+    Client::CommandParser::get()->requestDisconnect();
   else if(!*cmd)
     return;
   else {
-    Client::CommandParser::getCommandParser()->parse(cmd);
+    Client::CommandParser::get()->parse(cmd);
     add_history(cmd);
   }
 
-  if(Client::CommandParser::getCommandParser()->requestsActive()) {
+  if(Client::CommandManager::get()->requestsActive()) {
     rl_callback_handler_remove();
     Net::FdManager::getFdManager()->setFdEvents(STDIN_FILENO, 0);
   }
@@ -64,7 +64,7 @@ static void charHandler(short events) {
 }
 
 static void activateReadline() {
-  if(Client::CommandParser::getCommandParser()->willDisconnect())
+  if(Client::CommandManager::get()->willDisconnect())
     return;
 
   rl_callback_handler_install("mad> ", handleCommand);
@@ -79,11 +79,11 @@ int main(int argc, char *argv[]) {
 
   Net::Connection::init();
 
-  Common::LogManager::getLogManager()->init();
+  Common::LogManager::get()->init();
 
-  Common::ConfigManager::getConfigManager()->finish();
+  Common::ConfigManager::get()->finish();
 
-  Common::RequestManager::getRequestManager()->init();
+  Common::RequestManager::get()->init();
   Net::ClientConnection *connection = new Net::ClientConnection;
 
   try {
@@ -96,20 +96,20 @@ int main(int argc, char *argv[]) {
 
     std::cerr << " connected." << std::endl;
 
-    Common::RequestManager::getRequestManager()->registerConnection(connection);
+    Common::RequestManager::get()->registerConnection(connection);
 
     std::cerr << "Receiving host list..." << std::flush;
 
-    Client::InformationManager::getInformationManager()->init();
-    Client::InformationManager::getInformationManager()->updateDaemonList(connection);
+    Client::InformationManager::get()->init();
+    Client::InformationManager::get()->updateDaemonList(connection);
 
-    while(Client::InformationManager::getInformationManager()->isUpdating())
+    while(Client::InformationManager::get()->isUpdating())
       Net::FdManager::getFdManager()->run();
 
     std::cerr << " done." << std::endl << std::endl;
 
-    Client::CommandParser::getCommandParser()->setConnection(connection);
-    Client::CommandParser::getCommandParser()->signalFinished().connect(sigc::ptr_fun(activateReadline));
+    Client::CommandParser::get()->setConnection(connection);
+    Client::CommandManager::get()->signalFinished().connect(sigc::ptr_fun(activateReadline));
 
     Net::FdManager::getFdManager()->registerFd(STDIN_FILENO, sigc::ptr_fun(charHandler));
 
@@ -120,7 +120,7 @@ int main(int argc, char *argv[]) {
 
     Net::FdManager::getFdManager()->unregisterFd(STDIN_FILENO);
 
-    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());