From 21c2302f75084ca4f556182f35494c56ebdc21ff Mon Sep 17 00:00:00 2001
From: Victor Berger <victor.berger@m4x.org>
Date: Thu, 28 Sep 2017 15:09:04 +0200
Subject: [PATCH] Remove replaceEmoji

---
 include/TimelineItem.h |  2 --
 src/TimelineItem.cc    | 27 +++------------------------
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/include/TimelineItem.h b/include/TimelineItem.h
index 0a0538f9..5b01d4be 100644
--- a/include/TimelineItem.h
+++ b/include/TimelineItem.h
@@ -80,8 +80,6 @@ private:
         void setupAvatarLayout(const QString &userName);
         void setupSimpleLayout();
 
-        QString replaceEmoji(const QString &body);
-
         DescInfo descriptionMsg_;
 
         QHBoxLayout *topLayout_;
diff --git a/src/TimelineItem.cc b/src/TimelineItem.cc
index 70fc113f..e96b20e4 100644
--- a/src/TimelineItem.cc
+++ b/src/TimelineItem.cc
@@ -303,12 +303,12 @@ TimelineItem::TimelineItem(const events::MessageEvent<msgs::Text> &event,
 void
 TimelineItem::generateBody(const QString &body)
 {
-        QString content("<span style=\"color: black;\"> %1 </span>");
+        QString content("<span style=\"color: black; font-family: EmojiOne Color, Open Sans;\"> %1 </span>");
 
         body_ = new QLabel(this);
         body_->setFont(font_);
         body_->setWordWrap(true);
-        body_->setText(content.arg(replaceEmoji(body)));
+        body_->setText(content.arg(body));
         body_->setMargin(0);
 
         body_->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextBrowserInteraction);
@@ -341,7 +341,7 @@ TimelineItem::generateBody(const QString &userid, const QString &body)
         body_ = new QLabel(this);
         body_->setFont(font_);
         body_->setWordWrap(true);
-        body_->setText(bodyContent.arg(replaceEmoji(body)));
+        body_->setText(bodyContent.arg(body));
         body_->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextBrowserInteraction);
         body_->setOpenExternalLinks(true);
         body_->setMargin(0);
@@ -364,27 +364,6 @@ TimelineItem::generateTimestamp(const QDateTime &time)
         timestamp_->setContentsMargins(0, topMargin, 0, 0);
 }
 
-QString
-TimelineItem::replaceEmoji(const QString &body)
-{
-        QString fmtBody = "";
-
-        for (auto &c : body) {
-                int code = c.unicode();
-
-                // TODO: Be more precise here.
-                if (code > 9000)
-                        fmtBody += QString("<span style=\"font-family: Emoji "
-                                           "One; font-size: %1px\">")
-                                     .arg(conf::emojiSize) +
-                                   QString(c) + "</span>";
-                else
-                        fmtBody += c;
-        }
-
-        return fmtBody;
-}
-
 void
 TimelineItem::setupAvatarLayout(const QString &userName)
 {