--- smsdaemon/SmsDaemon.cpp	2008/06/16 10:56:02	91
+++ smsdaemon/SmsDaemon.cpp	2008/06/16 11:30:20	92
@@ -12,6 +12,9 @@
 
 #include "util.h"
 
+#include "TaskManager.h"
+#include "PluginManager.h"
+
 using namespace std;
 
 
@@ -30,7 +33,7 @@
 {
 	Common* cmn = Common::instance();
 
-	PluginManager& manager = cmn->pluginManager;
+	PluginManager* manager = cmn->GetPluginManager();
 	vector<SMS> sms = _modem.ReadSms();
 
 	for (unsigned int i=0; i<sms.size(); ++i)
@@ -39,7 +42,7 @@
 			
 		cmd = Util::str_tolower(cmd);
 
-		Plugin* pl = manager.GetPlugin(cmd);
+		Plugin* pl = manager->GetPlugin(cmd);
 
 		CreateLogMessage(sms[i], pl != 0);
 
@@ -71,7 +74,7 @@
 
 		CheckSms();
 
-		cmn->taskManager.ExecuteTasks();
+		cmn->GetTaskManager()->ExecuteTasks(_modem);
 
 		if (cmn->isDebug && kbhit())
 			break;
@@ -90,8 +93,8 @@
 
 	cmn->logMessage("--------------------------------");
 
-	cmn->taskManager.LoadTasks();
-	cmn->pluginManager.LoadPlugins();
+	cmn->GetTaskManager()->LoadTasks();
+	cmn->GetPluginManager()->LoadPlugins();
 	cmn->logMessage("SMS daemon started");
 
 	_modem.DeleteAllSms();