X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=EventParsers%2FVMGEntities%2FVMessage.cpp;fp=EventParsers%2FVMGEntities%2FVMessage.cpp;h=b79846226af1c4d7ca7a7b7b306ec44bcb502cda;hb=c0bfd6ab49e36b1f96a500fced976b9eef2aec4b;hp=59097d7a35c4530ac69fca87afca13efb1114f44;hpb=ede40b26168c61bd22caae822aac44fd15da74bc;p=qwerkisync

diff --git a/EventParsers/VMGEntities/VMessage.cpp b/EventParsers/VMGEntities/VMessage.cpp
index 59097d7..b798462 100644
--- a/EventParsers/VMGEntities/VMessage.cpp
+++ b/EventParsers/VMGEntities/VMessage.cpp
@@ -20,6 +20,7 @@
 
 #include "EventTypes/SMS.h"
 #include "Factory.h"
+#include "Settings.h"
 #include "VCard.h"
 #include "VEnvelope.h"
 #include "VBody.h"
@@ -31,8 +32,8 @@
 
 using namespace EventParsers::VMGEntities;
 
-VMessage::VMessage(const SMSEntity* parent) :
-	SMSEntity(parent), m_Version(1.1)
+VMessage::VMessage(const Settings &settings, const SMSEntity *parent) :
+	SMSEntity(settings, parent), m_Version(1.1)
 {
 }
 
@@ -40,8 +41,8 @@ VMessage::VMessage(const SMSEntity* parent) :
 //{
 //}
 
-VMessage::VMessage(const SMSEntity* parent, float version) :
-	SMSEntity(parent), m_Version(version)
+VMessage::VMessage(const Settings &settings, const SMSEntity *parent, float version) :
+	SMSEntity(settings, parent), m_Version(version)
 {
 }
 
@@ -105,7 +106,7 @@ bool VMessage::Read(const QString & initialLine, QTextStream & stream, EventType
 		}
 		else if(lineData.startsWith("BEGIN:"))
 		{
-			iReader* reader = Factory::Instantiate(lineData, this);
+			iReader* reader = Factory::Instantiate(CurrentSettings(), lineData, this);
 			bool valid(NULL != reader && reader->Read(lineData, stream, event));
 			delete reader;
 
@@ -141,24 +142,24 @@ void VMessage::Write(QTextStream &stream, const EventTypes::SMS &event)
 	stream << "X-IRMC-BOX:" << ( event.Destination() == EventTypes::SMS::SENT ? "SENT" : "INBOX") << "\n";
 	stream << "X-NOK-DT:" << event.Timestamp().toUTC().toString("yyyyMMddThhmmssZ") << "\n";
 
-	VEnvelope msgEnvelope(this);
+	VEnvelope msgEnvelope(CurrentSettings(), this);
 
 	// Add in the empty vcard for outgoing messages
 	if(event.Destination() == EventTypes::SMS::SENT)
 	{
-		VCard(this, 2.1, VCard::VCARD_LOCAL).Write(stream, event);
+		VCard(CurrentSettings(), this, 2.1, VCard::VCARD_LOCAL).Write(stream, event);
 
-		msgEnvelope.getContentWriters().append(new VCard(&msgEnvelope, 2.1, VCard::VCARD_REMOTE));
+		msgEnvelope.getContentWriters().append(new VCard(CurrentSettings(), &msgEnvelope, 2.1, VCard::VCARD_REMOTE));
 
-		VEnvelope *bodyEnvelope = new VEnvelope(this);
-		bodyEnvelope->getContentWriters().append(new VBody(bodyEnvelope));
+		VEnvelope *bodyEnvelope = new VEnvelope(CurrentSettings(), this);
+		bodyEnvelope->getContentWriters().append(new VBody(CurrentSettings(), bodyEnvelope));
 		msgEnvelope.getContentWriters().append(bodyEnvelope);
 	}
 	else
 	{
-		VCard(this, 2.1, VCard::VCARD_REMOTE).Write(stream, event);
+		VCard(CurrentSettings(), this, 2.1, VCard::VCARD_REMOTE).Write(stream, event);
 
-		msgEnvelope.getContentWriters().append(new VBody(&msgEnvelope));
+		msgEnvelope.getContentWriters().append(new VBody(CurrentSettings(), &msgEnvelope));
 	}
 
 	msgEnvelope.Write(stream, event);