--- smsdaemon/tasks/SpoolTask.cpp	2008/12/07 08:44:22	134
+++ smsdaemon/tasks/SpoolTask.cpp	2008/12/18 06:53:29	196
@@ -1,6 +1,6 @@
 #include "SpoolTask.h"
-#include "IGsmModem.h"
-#include "common.h"
+#include "ISmsTransceiver.h"
+#include "Logger.h"
 
 #include "Spooler.h"
 #include "Exceptions.h"
@@ -9,31 +9,36 @@
 using namespace std;
 
 SpoolTask::SpoolTask()
-  : Task("spool", false)
+		: Task("spool", false)
 {
 }
 
-void SpoolTask::ExecuteTask(IGsmModem& modem)
+void SpoolTask::ExecuteTask(ISmsTransceiver& modem)
 {
 	Spooler spool;
 	string spoolfile;
 
-	try {
+	try
+	{
 		spoolfile = spool.dequeue();
-	} catch (filenotfoundexception& e) {
+	}
+	catch (filenotfoundexception& e)
+	{
 		return;
 	}
 
 	unsigned int pos = spoolfile.find('\n');
-	if (pos != string::npos) 
+	if (pos != string::npos)
 	{
 		string to = spoolfile.substr(0,pos);
 		string message = spoolfile.substr(pos+1, 1024);
 
-		Common::instance()->logMessage(string("sending spooled SMS message: ") + spool.getFilename() );
+		Logger::logMessage(string("sending spooled SMS message: ") + spool.getFilename() );
 
 		modem.SendSms(to,message, true);
-	} else {
-		Common::instance()->logMessage("received malformed spool file");
+	}
+	else
+	{
+		Logger::logMessage("received malformed spool file");
 	}
 }