[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ktp-common-internals/mklapetek/SpaceBar] KTp/Declarative: Search for :ascii: emoji rather than rely
From:       Martin Klapetek <mklapetek () kde ! org>
Date:       2016-06-11 14:26:17
Message-ID: E1bBjrd-00026R-Ue () scm ! kde ! org
[Download RAW message or body]

Git commit e082f72e677e1e9b4763dcc413aa129cbb7182b6 by Martin Klapetek.
Committed on 11/06/2016 at 14:25.
Pushed by mklapetek into branch 'mklapetek/SpaceBar'.

Search for :ascii: emoji rather than relying on the theme order

M  +7    -1    KTp/Declarative/emojis-model.cpp

http://commits.kde.org/telepathy-common-internals/e082f72e677e1e9b4763dcc413aa129cbb7182b6

diff --git a/KTp/Declarative/emojis-model.cpp b/KTp/Declarative/emojis-model.cpp
index 1f9dc50..c7812d4 100644
--- a/KTp/Declarative/emojis-model.cpp
+++ b/KTp/Declarative/emojis-model.cpp
@@ -78,7 +78,13 @@ QVariant EmojisModel::data(const QModelIndex &index, int role) const
                 return QStringLiteral("Diversity");
             }
         case EmojiText:
-            return m_emojisHash.value(filePath).at(0);
+            const auto emojiValues = m_emojisHash.value(filePath);
+            Q_FOREACH (const QString &emoji, emojiValues) {
+                if (emoji.startsWith(QLatin1Char(':'))) {
+                    return emoji;
+                }
+            }
+            return emojiValues.at(0);
     }
 
     return QVariant();
[prev in list] [next in list] [prev in thread] [next in thread]