1 files changed, 29 insertions, 31 deletions
diff --git a/Swift/QtUI/MessageSnippet.cpp b/Swift/QtUI/MessageSnippet.cpp
index f76212e..4682365 100644
--- a/Swift/QtUI/MessageSnippet.cpp
+++ b/Swift/QtUI/MessageSnippet.cpp
@@ -1,45 +1,43 @@
 /*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
-#include "MessageSnippet.h"
+#include <Swift/QtUI/MessageSnippet.h>
 
-#include <QtDebug>
 #include <QDateTime>
 
 namespace Swift {
 
 MessageSnippet::MessageSnippet(const QString& message, const QString& sender, const QDateTime& time, const QString& iconURI, bool isIncoming, bool appendToPrevious, QtChatTheme* theme, const QString& id, Direction direction) : ChatSnippet(appendToPrevious) {
-	if (appendToPrevious) {
-		setContinuationFallbackSnippet(boost::shared_ptr<ChatSnippet>(new MessageSnippet(message, sender, time, iconURI, isIncoming, false, theme, id, direction)));
-	}
-	if (isIncoming) {
-		if (appendToPrevious) {
-			content_ = theme->getIncomingNextContent();
-		}
-		else {
-			content_ = theme->getIncomingContent();
-		}
-	}
-	else {
-		if (appendToPrevious) {
-			content_ = theme->getOutgoingNextContent();
-		}
-		else {
-			content_ = theme->getOutgoingContent();
-		}
-	}
-
-	content_.replace("%direction%", directionToCSS(direction));
-	content_.replace("%message%", wrapResizable("<span class='swift_message'>" + escape(message) + "</span><span class='swift_ack'></span><span class='swift_receipt'></span>"));
-	content_.replace("%wrapped_sender%", wrapResizable(escape(sender)));
-	content_.replace("%sender%", escape(sender));
-	content_.replace("%time%", wrapResizable("<span class='swift_time'>" + timeToEscapedString(time) + "</span>"));
-	content_.replace("%userIconPath%", escape(iconURI));
-	content_ = QString("<div id='%1'>%2</div>").arg(id).arg(content_);
-	content_ = "<span class='date" + time.date().toString(Qt::ISODate) + "'>" + content_ + "</span>";
+    if (appendToPrevious) {
+        setContinuationFallbackSnippet(std::make_shared<MessageSnippet>(message, sender, time, iconURI, isIncoming, false, theme, id, direction));
+    }
+    if (isIncoming) {
+        if (appendToPrevious) {
+            content_ = theme->getIncomingNextContent();
+        }
+        else {
+            content_ = theme->getIncomingContent();
+        }
+    }
+    else {
+        if (appendToPrevious) {
+            content_ = theme->getOutgoingNextContent();
+        }
+        else {
+            content_ = theme->getOutgoingContent();
+        }
+    }
+
+    content_.replace("%direction%", directionToCSS(direction));
+    content_.replace("%message%", wrapResizable("<span class='swift_message'>" + escape(message) + "</span>"));
+    content_.replace("%wrapped_sender%", wrapResizable(escape(sender)));
+    content_.replace("%sender%", escape(sender));
+    content_.replace("%time%", wrapResizable("<span class='swift_time'>" + timeToEscapedString(time) + "</span>"));
+    content_.replace("%userIconPath%", escape(iconURI));
+    content_.replace("%id%", id);
 }
 
 MessageSnippet::~MessageSnippet() {