--- smsdaemon/PluginManager.cpp 2008/12/08 20:56:36 156 +++ smsdaemon/PluginManager.cpp 2008/12/08 21:28:40 157 @@ -1,7 +1,7 @@ #include "PluginManager.h" -#include "common.h" +#include "Logger.h" #include "plugins/EchoPlugin.h" #include "plugins/SpamPlugin.h" @@ -24,8 +24,6 @@ void PluginManager::AddPlugin(Plugin* plugin) { - Common* cmn = Common::instance(); - if (plugin != 0) { std::string command = plugin->GetCommand(); @@ -33,18 +31,16 @@ if ( _plugins[ command ] == 0) _plugins[ command ] = plugin; else - cmn->logMessage( std::string("AddPlugin() -- already have a plugin called ") + command); + Logger::logMessage( std::string("AddPlugin() -- already have a plugin called ") + command); } else { - cmn->logMessage("AddPlugin() -- cannot register a null pointer"); + Logger::logMessage("AddPlugin() -- cannot register a null pointer"); } } void PluginManager::LoadPlugins() { - Common* cmn = Common::instance(); - static EchoPlugin echo; static SpamPlugin spam; @@ -64,7 +60,7 @@ { Plugin* pl = (*it).second; if (pl != 0) - cmn->logMessage( std::string("Loaded plugin \"") + pl->GetCommand() + "\" - " + pl->GetDescription() ); + Logger::logMessage( std::string("Loaded plugin \"") + pl->GetCommand() + "\" - " + pl->GetDescription() ); } }