Merge lp:~renatofilho/messaging-app/emoji into lp:messaging-app

Proposed by Renato Araujo Oliveira Filho on 2014-08-17
Status: Rejected
Rejected by: Bill Filler on 2014-09-17
Proposed branch: lp:~renatofilho/messaging-app/emoji
Merge into: lp:messaging-app
Diff against target: 820 lines (+314/-3)
11 files modified
debian/messaging-app.install (+1/-0)
src/CMakeLists.txt (+2/-0)
src/emoji.cpp (+247/-0)
src/emoji.h (+45/-0)
src/main.cpp (+2/-0)
src/messagingapplication.cpp (+2/-0)
src/messagingapplication.h (+3/-0)
src/qml/CMakeLists.txt (+1/-0)
src/qml/MessageBubble.qml (+4/-1)
src/qml/Messages.qml (+2/-2)
src/qml/emoji/CMakeLists.txt (+5/-0)
To merge this branch: bzr merge lp:~renatofilho/messaging-app/emoji
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2014-08-17
Ubuntu Phablet Team 2014-08-17 Pending
Review via email: mp+231108@code.launchpad.net

Commit message

Initial support for Emoji and Emoticons.

Images imported from: https://github.com/Genshin/PhantomOpenEmoji

To post a comment you must log in.
lp:~renatofilho/messaging-app/emoji updated on 2014-08-17
194. By Renato Araujo Oliveira Filho on 2014-08-17

Removed unused file.

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~renatofilho/messaging-app/emoji updated on 2014-08-17
195. By Renato Araujo Oliveira Filho on 2014-08-17

Used w_char to represet emoji code insted QChar.
No way to create QChar from unicode value.

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Unmerged revisions

195. By Renato Araujo Oliveira Filho on 2014-08-17

Used w_char to represet emoji code insted QChar.
No way to create QChar from unicode value.

194. By Renato Araujo Oliveira Filho on 2014-08-17

Removed unused file.

193. By Renato Araujo Oliveira Filho on 2014-08-17

Initial support for Emoji and Emoticons.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/messaging-app.install'
2--- debian/messaging-app.install 2014-08-11 22:22:59 +0000
3+++ debian/messaging-app.install 2014-08-17 14:26:34 +0000
4@@ -8,4 +8,5 @@
5 usr/share/messaging-app/3rd_party
6 usr/share/messaging-app/MMS/*.qml
7 usr/share/messaging-app/Dialogs/*.qml
8+usr/share/messaging-app/emoji/*.png
9 usr/bin/*messaging-app*
10
11=== modified file 'src/CMakeLists.txt'
12--- src/CMakeLists.txt 2014-07-16 15:26:33 +0000
13+++ src/CMakeLists.txt 2014-08-17 14:26:34 +0000
14@@ -2,10 +2,12 @@
15
16 set(messaging_app_HDRS
17 messagingapplication.h
18+ emoji.h
19 )
20
21 set(messaging_app_SRCS
22 messagingapplication.cpp
23+ emoji.cpp
24 main.cpp
25 )
26
27
28=== added file 'src/emoji.cpp'
29--- src/emoji.cpp 1970-01-01 00:00:00 +0000
30+++ src/emoji.cpp 2014-08-17 14:26:34 +0000
31@@ -0,0 +1,247 @@
32+/*
33+ * Copyright (C) 2014 Canonical, Ltd.
34+ *
35+ * This file is part of messaging-app.
36+ *
37+ * messaging-app is free software; you can redistribute it and/or modify
38+ * it under the terms of the GNU General Public License as published by
39+ * the Free Software Foundation; version 3.
40+ *
41+ * messaging-app is distributed in the hope that it will be useful,
42+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
43+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
44+ * GNU General Public License for more details.
45+ *
46+ * You should have received a copy of the GNU General Public License
47+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
48+ */
49+
50+
51+#include "emoji.h"
52+#include <QStringList>
53+
54+#define IMAGE_SIZE 32
55+
56+
57+EmojiMap::EmojiMap(QObject *parent)
58+ : QObject(parent)
59+{
60+}
61+
62+QString EmojiMap::fromUtf8(const QString &value, const QString &imagePrefix)
63+{
64+ if (m_utf8Map.isEmpty()) {
65+ initUtf8Map();
66+ }
67+
68+ std::wstring result;
69+ std::wstring wString = value.toStdWString();
70+ for (int i=0; i < wString.length(); i++) {
71+ wchar_t c = wString.at(i);
72+ QByteArray imageName = m_utf8Map.value(c, "");
73+ if (!imageName.isEmpty()) {
74+ QString imgTag = QString("<img src=\"%1/%2_%3.png\">").arg(imagePrefix).arg(QString(imageName)).arg(IMAGE_SIZE);
75+ result.append(imgTag.toStdWString());
76+ } else {
77+ result.push_back(c);
78+ }
79+ }
80+ return QString::fromStdWString(result);
81+}
82+
83+QString EmojiMap::asciiToUtf8(const QString &value)
84+{
85+ if (m_asciiToUtf8Map.isEmpty()) {
86+ initAsciiMap();
87+ }
88+
89+ QStringList words = value.split(" ");
90+ std::wstring result;
91+ Q_FOREACH(const QString &word, words) {
92+ if (m_asciiToUtf8Map.contains(word.toUtf8())) {
93+ wchar_t c = m_asciiToUtf8Map.value(word.toUtf8());
94+ result.push_back(c);
95+ } else {
96+ result.append(word.toStdWString());
97+ }
98+ result.push_back(' ');
99+ }
100+
101+ return QString::fromStdWString(result).trimmed();
102+}
103+
104+void EmojiMap::initUtf8Map()
105+{
106+ m_utf8Map.insert(wchar_t(0x1f300), QByteArray("cyclone"));
107+ m_utf8Map.insert(wchar_t(0x1f308), QByteArray("rainbow"));
108+ m_utf8Map.insert(wchar_t(0x1f30c), QByteArray("milky_way"));
109+ m_utf8Map.insert(wchar_t(0x1f311), QByteArray("new_moon"));
110+ m_utf8Map.insert(wchar_t(0x1f313), QByteArray("first_quarter_moon"));
111+ m_utf8Map.insert(wchar_t(0x1f314), QByteArray("waxing_gibbous_moon"));
112+ m_utf8Map.insert(wchar_t(0x1f315), QByteArray("full_moon"));
113+ m_utf8Map.insert(wchar_t(0x1f317), QByteArray("last_quarter_moon"));
114+ m_utf8Map.insert(wchar_t(0x1f319), QByteArray("crescent_moon"));
115+ m_utf8Map.insert(wchar_t(0x1f320), QByteArray("shooting_star"));
116+ m_utf8Map.insert(wchar_t(0x1f31b), QByteArray("moon_with_face"));
117+ m_utf8Map.insert(wchar_t(0x1f31f), QByteArray("glowing_star"));
118+ m_utf8Map.insert(wchar_t(0x1f335), QByteArray("cactus"));
119+ m_utf8Map.insert(wchar_t(0x1f34a), QByteArray("tangerine"));
120+ m_utf8Map.insert(wchar_t(0x1f355), QByteArray("pizza"));
121+ m_utf8Map.insert(wchar_t(0x1f359), QByteArray("rice_ball"));
122+ m_utf8Map.insert(wchar_t(0x1f365), QByteArray("fish_cake_with_swirl_design"));
123+ m_utf8Map.insert(wchar_t(0x1f371), QByteArray("bento_box"));
124+ m_utf8Map.insert(wchar_t(0x1f379), QByteArray("tropical_drink"));
125+ m_utf8Map.insert(wchar_t(0x1f37a), QByteArray("beer_mug"));
126+ m_utf8Map.insert(wchar_t(0x1f383), QByteArray("jack_o_lantern"));
127+ m_utf8Map.insert(wchar_t(0x1f3a4), QByteArray("microphone"));
128+ m_utf8Map.insert(wchar_t(0x1f3ae), QByteArray("video_game"));
129+ m_utf8Map.insert(wchar_t(0x1f3b8), QByteArray("guitar"));
130+ m_utf8Map.insert(wchar_t(0x1f3be), QByteArray("tennis_racquet_and_ball"));
131+ m_utf8Map.insert(wchar_t(0x1f3c2), QByteArray("snowboarder"));
132+ m_utf8Map.insert(wchar_t(0x1f3e9), QByteArray("love_hotel"));
133+ m_utf8Map.insert(wchar_t(0x1f40c), QByteArray("snail"));
134+ m_utf8Map.insert(wchar_t(0x1f40d), QByteArray("snake"));
135+ m_utf8Map.insert(wchar_t(0x1f414), QByteArray("chicken"));
136+ m_utf8Map.insert(wchar_t(0x1f417), QByteArray("boar"));
137+ m_utf8Map.insert(wchar_t(0x1f418), QByteArray("elephant"));
138+ m_utf8Map.insert(wchar_t(0x1f419), QByteArray("octopus"));
139+ m_utf8Map.insert(wchar_t(0x1f421), QByteArray("blowfish"));
140+ m_utf8Map.insert(wchar_t(0x1f423), QByteArray("hatching_chick"));
141+ m_utf8Map.insert(wchar_t(0x1f427), QByteArray("penguin"));
142+ m_utf8Map.insert(wchar_t(0x1f428), QByteArray("koala"));
143+ m_utf8Map.insert(wchar_t(0x1f42b), QByteArray("bactrian_camel"));
144+ m_utf8Map.insert(wchar_t(0x1f431), QByteArray("cat_face"));
145+ m_utf8Map.insert(wchar_t(0x1f433), QByteArray("spouting_whale"));
146+ m_utf8Map.insert(wchar_t(0x1f434), QByteArray("horse"));
147+ m_utf8Map.insert(wchar_t(0x1f436), QByteArray("dog_face"));
148+ m_utf8Map.insert(wchar_t(0x1f438), QByteArray("frog_face"));
149+ m_utf8Map.insert(wchar_t(0x1f43a), QByteArray("wolf_face"));
150+ m_utf8Map.insert(wchar_t(0x1f43e), QByteArray("paw_prints"));
151+ m_utf8Map.insert(wchar_t(0x1f44a), QByteArray("fisted_hand_sign"));
152+ m_utf8Map.insert(wchar_t(0x1f44d), QByteArray("thumbs_up_sign"));
153+ m_utf8Map.insert(wchar_t(0x1f46a), QByteArray("family"));
154+ m_utf8Map.insert(wchar_t(0x1f46b), QByteArray("couple_holding_hands"));
155+ m_utf8Map.insert(wchar_t(0x1f46c), QByteArray("two_men_holding_hands"));
156+ m_utf8Map.insert(wchar_t(0x1f46d), QByteArray("two_women_holding_hands"));
157+ m_utf8Map.insert(wchar_t(0x1f478), QByteArray("princess"));
158+ m_utf8Map.insert(wchar_t(0x1f47b), QByteArray("ghost"));
159+ m_utf8Map.insert(wchar_t(0x1f47d), QByteArray("extraterrestrial_alien"));
160+ m_utf8Map.insert(wchar_t(0x1f480), QByteArray("skull"));
161+ m_utf8Map.insert(wchar_t(0x1f483), QByteArray("dancer"));
162+ m_utf8Map.insert(wchar_t(0x1f48a), QByteArray("pill"));
163+ m_utf8Map.insert(wchar_t(0x1f491), QByteArray("couple_with_heart"));
164+ m_utf8Map.insert(wchar_t(0x1f493), QByteArray("heartbeat"));
165+ m_utf8Map.insert(wchar_t(0x1f4a1), QByteArray("electric_light_bulb"));
166+ m_utf8Map.insert(wchar_t(0x1f4a9), QByteArray("poop"));
167+ m_utf8Map.insert(wchar_t(0x1f4ac), QByteArray("speech_balloon"));
168+ m_utf8Map.insert(wchar_t(0x1f51e), QByteArray("no_one_under_eighteen_symbol"));
169+ m_utf8Map.insert(wchar_t(0x1f5fb), QByteArray("mount_fuji"));
170+ m_utf8Map.insert(wchar_t(0x1f600), QByteArray("grinning"));
171+ m_utf8Map.insert(wchar_t(0x1f601), QByteArray("grin"));
172+ m_utf8Map.insert(wchar_t(0x1f602), QByteArray("face_with_tear_of_joy"));
173+ m_utf8Map.insert(wchar_t(0x1f603), QByteArray("smiley"));
174+ m_utf8Map.insert(wchar_t(0x1f604), QByteArray("smile"));
175+ m_utf8Map.insert(wchar_t(0x1f605), QByteArray("sweat_smile"));
176+ m_utf8Map.insert(wchar_t(0x1f606), QByteArray("laughing"));
177+ m_utf8Map.insert(wchar_t(0x1f609), QByteArray("wink"));
178+ m_utf8Map.insert(wchar_t(0x1f60a), QByteArray("blush"));
179+ m_utf8Map.insert(wchar_t(0x1f60b), QByteArray("face_savouring_delicious_food"));
180+ m_utf8Map.insert(wchar_t(0x1f60c), QByteArray("relieved"));
181+ m_utf8Map.insert(wchar_t(0x1f60d), QByteArray("heart_eyes"));
182+ m_utf8Map.insert(wchar_t(0x1f60f), QByteArray("smirk"));
183+ m_utf8Map.insert(wchar_t(0x1f611), QByteArray("expressionless"));
184+ m_utf8Map.insert(wchar_t(0x1f612), QByteArray("unamused"));
185+ m_utf8Map.insert(wchar_t(0x1f613), QByteArray("sweat"));
186+ m_utf8Map.insert(wchar_t(0x1f614), QByteArray("pensive_face"));
187+ m_utf8Map.insert(wchar_t(0x1f615), QByteArray("confused"));
188+ m_utf8Map.insert(wchar_t(0x1f617), QByteArray("kissing"));
189+ m_utf8Map.insert(wchar_t(0x1f618), QByteArray("kissing_heart"));
190+ m_utf8Map.insert(wchar_t(0x1f619), QByteArray("kissing_smiling_eyes"));
191+ m_utf8Map.insert(wchar_t(0x1f61a), QByteArray("kissing_closed_eyes"));
192+ m_utf8Map.insert(wchar_t(0x1f61b), QByteArray("stuck_out_tongue"));
193+ m_utf8Map.insert(wchar_t(0x1f61e), QByteArray("disappointed_face"));
194+ m_utf8Map.insert(wchar_t(0x1f61f), QByteArray("worried"));
195+ m_utf8Map.insert(wchar_t(0x1f620), QByteArray("angry_face"));
196+ m_utf8Map.insert(wchar_t(0x1f621), QByteArray("pouting_face"));
197+ m_utf8Map.insert(wchar_t(0x1f622), QByteArray("crying_face"));
198+ m_utf8Map.insert(wchar_t(0x1f623), QByteArray("persevering_face"));
199+ m_utf8Map.insert(wchar_t(0x1f624), QByteArray("face_with_look_of_triumph"));
200+ m_utf8Map.insert(wchar_t(0x1f625), QByteArray("disappointed_but_relieved_face"));
201+ m_utf8Map.insert(wchar_t(0x1f626), QByteArray("frowning"));
202+ m_utf8Map.insert(wchar_t(0x1f627), QByteArray("anguished"));
203+ m_utf8Map.insert(wchar_t(0x1f628), QByteArray("fearful_face"));
204+ m_utf8Map.insert(wchar_t(0x1f629), QByteArray("weary_face"));
205+ m_utf8Map.insert(wchar_t(0x1f62c), QByteArray("grimacing"));
206+ m_utf8Map.insert(wchar_t(0x1f62d), QByteArray("loudly_crying_face"));
207+ m_utf8Map.insert(wchar_t(0x1f62e), QByteArray("open_mouth"));
208+ m_utf8Map.insert(wchar_t(0x1f62f), QByteArray("hushed"));
209+ m_utf8Map.insert(wchar_t(0x1f630), QByteArray("face_with_open_mouth_and_cold_sweat"));
210+ m_utf8Map.insert(wchar_t(0x1f632), QByteArray("astonished_face"));
211+ m_utf8Map.insert(wchar_t(0x1f633), QByteArray("flushed"));
212+ m_utf8Map.insert(wchar_t(0x1f634), QByteArray("sleeping"));
213+ m_utf8Map.insert(wchar_t(0x1f635), QByteArray("dizzy_face"));
214+ m_utf8Map.insert(wchar_t(0x1f637), QByteArray("face_with_medical_mask"));
215+ m_utf8Map.insert(wchar_t(0x1f638), QByteArray("grinning_cat_face_with_smiling_eyes"));
216+ m_utf8Map.insert(wchar_t(0x1f639), QByteArray("cat_face_with_tears_of_joy"));
217+ m_utf8Map.insert(wchar_t(0x1f63a), QByteArray("smiling_cat_face_with_open_mouth"));
218+ m_utf8Map.insert(wchar_t(0x1f63b), QByteArray("smiling_cat_face_with_heart_shaped_eyes"));
219+ m_utf8Map.insert(wchar_t(0x1f63c), QByteArray("cat_face_with_wry_smile"));
220+ m_utf8Map.insert(wchar_t(0x1f63d), QByteArray("kissing_cat_face_with_closed_eyes"));
221+ m_utf8Map.insert(wchar_t(0x1f63e), QByteArray("pouting_cat_face"));
222+ m_utf8Map.insert(wchar_t(0x1f63f), QByteArray("crying_cat_face"));
223+ m_utf8Map.insert(wchar_t(0x1f640), QByteArray("weary_cat_face"));
224+ m_utf8Map.insert(wchar_t(0x1f645), QByteArray("face_with_no_good_gesture"));
225+ m_utf8Map.insert(wchar_t(0x1f646), QByteArray("face_with_ok_gesture"));
226+ m_utf8Map.insert(wchar_t(0x1f647), QByteArray("person_bowing_deeply"));
227+ m_utf8Map.insert(wchar_t(0x1f648), QByteArray("see_no_evil_monkey"));
228+ m_utf8Map.insert(wchar_t(0x1f649), QByteArray("hear_no_evil_monkey"));
229+ m_utf8Map.insert(wchar_t(0x1f64a), QByteArray("speak_no_evil_monkey"));
230+ m_utf8Map.insert(wchar_t(0x1f64b), QByteArray("happy_person_raising_one_hand"));
231+ m_utf8Map.insert(wchar_t(0x1f64c), QByteArray("person_raising_both_hands_in_celebration"));
232+ m_utf8Map.insert(wchar_t(0x1f64d), QByteArray("person_frowning"));
233+ m_utf8Map.insert(wchar_t(0x1f64e), QByteArray("person_with_pouting_face"));
234+ m_utf8Map.insert(wchar_t(0x1f64f), QByteArray("person_with_folded_hands"));
235+ m_utf8Map.insert(wchar_t(0x1f68f), QByteArray("bus_stop"));
236+ m_utf8Map.insert(wchar_t(0x1f6a2), QByteArray("ship"));
237+ m_utf8Map.insert(wchar_t(0x1f6b9), QByteArray("mens_symbol"));
238+ m_utf8Map.insert(wchar_t(0x2600), QByteArray("sun"));
239+ m_utf8Map.insert(wchar_t(0x2601), QByteArray("cloud"));
240+ m_utf8Map.insert(wchar_t(0x2615), QByteArray("hot_beverage"));
241+ m_utf8Map.insert(wchar_t(0x263a), QByteArray("white_smiling_face"));
242+ m_utf8Map.insert(wchar_t(0x2648), QByteArray("Aries"));
243+ m_utf8Map.insert(wchar_t(0x2649), QByteArray("Taurus"));
244+ m_utf8Map.insert(wchar_t(0x264a), QByteArray("Gemini"));
245+ m_utf8Map.insert(wchar_t(0x264b), QByteArray("Cancer"));
246+ m_utf8Map.insert(wchar_t(0x264c), QByteArray("Leo"));
247+ m_utf8Map.insert(wchar_t(0x264d), QByteArray("Virgo"));
248+ m_utf8Map.insert(wchar_t(0x264e), QByteArray("Libra"));
249+ m_utf8Map.insert(wchar_t(0x264f), QByteArray("Scorpius"));
250+ m_utf8Map.insert(wchar_t(0x2650), QByteArray("Sagittarius"));
251+ m_utf8Map.insert(wchar_t(0x2651), QByteArray("Capricorn"));
252+ m_utf8Map.insert(wchar_t(0x2652), QByteArray("Aquarius"));
253+ m_utf8Map.insert(wchar_t(0x2653), QByteArray("Pisces"));
254+ m_utf8Map.insert(wchar_t(0x267f), QByteArray("wheelchair"));
255+ m_utf8Map.insert(wchar_t(0x2693), QByteArray("anchor"));
256+ m_utf8Map.insert(wchar_t(0x26a1), QByteArray("high_voltage_sign"));
257+ m_utf8Map.insert(wchar_t(0x270c), QByteArray("victory_hand"));
258+ m_utf8Map.insert(wchar_t(0x2764), QByteArray("heart"));
259+ m_utf8Map.insert(wchar_t(0x3299), QByteArray("circled_ideograph_secret"));}
260+
261+void EmojiMap::initAsciiMap()
262+{
263+ m_asciiToUtf8Map.insert(QByteArray(";D"), wchar_t(0x1f602));
264+ m_asciiToUtf8Map.insert(QByteArray(":)"), wchar_t(0x1f603));
265+ m_asciiToUtf8Map.insert(QByteArray(":D"), wchar_t(0x1f606));
266+ m_asciiToUtf8Map.insert(QByteArray(";)"), wchar_t(0x1f609));
267+ m_asciiToUtf8Map.insert(QByteArray(":$"), wchar_t(0x1f60a));
268+ m_asciiToUtf8Map.insert(QByteArray("(:|"), wchar_t(0x1f613));
269+ m_asciiToUtf8Map.insert(QByteArray(":^)"), wchar_t(0x1f615));
270+ m_asciiToUtf8Map.insert(QByteArray(":*"), wchar_t(0x1f617));
271+ m_asciiToUtf8Map.insert(QByteArray(":P"), wchar_t(0x1f61b));
272+ m_asciiToUtf8Map.insert(QByteArray(":'("), wchar_t(0x1f622));
273+ m_asciiToUtf8Map.insert(QByteArray(":("), wchar_t(0x1f626));
274+ m_asciiToUtf8Map.insert(QByteArray("X("), wchar_t(0x1f629));
275+ m_asciiToUtf8Map.insert(QByteArray(":O"), wchar_t(0x1f62e));
276+ m_asciiToUtf8Map.insert(QByteArray(":x"), wchar_t(0x1f62f));
277+ m_asciiToUtf8Map.insert(QByteArray("Xo"), wchar_t(0x1f635));
278+}
279
280=== added file 'src/emoji.h'
281--- src/emoji.h 1970-01-01 00:00:00 +0000
282+++ src/emoji.h 2014-08-17 14:26:34 +0000
283@@ -0,0 +1,45 @@
284+/*
285+ * Copyright (C) 2014 Canonical, Ltd.
286+ *
287+ * This file is part of messaging-app.
288+ *
289+ * messaging-app is free software; you can redistribute it and/or modify
290+ * it under the terms of the GNU General Public License as published by
291+ * the Free Software Foundation; version 3.
292+ *
293+ * messaging-app is distributed in the hope that it will be useful,
294+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
295+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
296+ * GNU General Public License for more details.
297+ *
298+ * You should have received a copy of the GNU General Public License
299+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
300+ */
301+
302+#ifndef EMOJIMAP_H
303+#define EMOJIMAP_H
304+
305+#include <QObject>
306+#include <QHash>
307+#include <QString>
308+#include <QByteArray>
309+#include <QChar>
310+
311+class EmojiMap : public QObject
312+{
313+ Q_OBJECT
314+public:
315+ EmojiMap(QObject *parent=0);
316+
317+ Q_INVOKABLE QString fromUtf8(const QString &value, const QString &imagePrefix);
318+ Q_INVOKABLE QString asciiToUtf8(const QString &value);
319+
320+private:
321+ QHash<wchar_t, QByteArray> m_utf8Map;
322+ QHash<QByteArray, wchar_t> m_asciiToUtf8Map;
323+
324+ void initUtf8Map();
325+ void initAsciiMap();
326+};
327+
328+#endif
329
330=== modified file 'src/main.cpp'
331--- src/main.cpp 2014-08-08 21:38:51 +0000
332+++ src/main.cpp 2014-08-17 14:26:34 +0000
333@@ -24,11 +24,13 @@
334 #include <QString>
335 #include <QTemporaryFile>
336 #include <QTextStream>
337+#include <QByteArray>
338
339 // libc
340 #include <cerrno>
341 #include <cstdlib>
342 #include <cstring>
343+#include <iostream>
344
345 // local
346 #include "messagingapplication.h"
347
348=== modified file 'src/messagingapplication.cpp'
349--- src/messagingapplication.cpp 2014-07-01 18:08:32 +0000
350+++ src/messagingapplication.cpp 2014-08-17 14:26:34 +0000
351@@ -17,6 +17,7 @@
352 */
353
354 #include "messagingapplication.h"
355+#include "emoji.h"
356
357 #include <QDir>
358 #include <QUrl>
359@@ -132,6 +133,7 @@
360 m_view->setTitle("Messaging");
361 m_view->rootContext()->setContextProperty("application", this);
362 m_view->rootContext()->setContextProperty("i18nDirectory", I18N_DIRECTORY);
363+ m_view->rootContext()->setContextProperty("Emoji", new EmojiMap(m_view));
364 m_view->engine()->setBaseUrl(QUrl::fromLocalFile(messagingAppDirectory()));
365
366 // check if there is a contacts backend override
367
368=== modified file 'src/messagingapplication.h'
369--- src/messagingapplication.h 2014-07-01 18:08:32 +0000
370+++ src/messagingapplication.h 2014-08-17 14:26:34 +0000
371@@ -23,6 +23,8 @@
372 #include <QQuickView>
373 #include <QGuiApplication>
374
375+class EmojiMap;
376+
377 class MessagingApplication : public QGuiApplication
378 {
379 Q_OBJECT
380@@ -46,6 +48,7 @@
381
382 private:
383 QQuickView *m_view;
384+ EmojiMap *m_emojiMap;
385 QString m_arg;
386 bool m_applicationIsReady;
387 };
388
389=== modified file 'src/qml/CMakeLists.txt'
390--- src/qml/CMakeLists.txt 2014-08-11 22:22:59 +0000
391+++ src/qml/CMakeLists.txt 2014-08-17 14:26:34 +0000
392@@ -17,3 +17,4 @@
393
394 add_subdirectory(MMS)
395 add_subdirectory(Dialogs)
396+add_subdirectory(emoji)
397
398=== modified file 'src/qml/MessageBubble.qml'
399--- src/qml/MessageBubble.qml 2014-08-11 22:59:14 +0000
400+++ src/qml/MessageBubble.qml 2014-08-17 14:26:34 +0000
401@@ -61,7 +61,10 @@
402 // check for links
403 text = BaLinkify.linkify(text);
404 // linkify phone numbers
405- return text.replace(phoneExp, '<a href="tel:///$1">$1</a>');
406+ var newText = text.replace(phoneExp, '<a href="tel:///$1">$1</a>');
407+
408+ // insert emoji
409+ return Emoji.fromUtf8(newText, Qt.resolvedUrl("emoji/"))
410 }
411
412 onMessageIncomingChanged: source = selectBubble()
413
414=== modified file 'src/qml/Messages.qml'
415--- src/qml/Messages.qml 2014-08-12 15:14:25 +0000
416+++ src/qml/Messages.qml 2014-08-17 14:26:34 +0000
417@@ -975,13 +975,13 @@
418 attachment.push(item.filePath)
419 newAttachments.push(attachment)
420 }
421- chatManager.sendMMS(participants, textEntry.text, newAttachments, messages.account.accountId)
422+ chatManager.sendMMS(participants, Emoji.asciiToUtf8(textEntry.text), newAttachments, messages.account.accountId)
423 textEntry.text = ""
424 attachments.clear()
425 return
426 }
427
428- chatManager.sendMessage(participants, textEntry.text, messages.account.accountId)
429+ chatManager.sendMessage(participants, Emoji.asciiToUtf8(textEntry.text), messages.account.accountId)
430 textEntry.text = ""
431 }
432 }
433
434=== added directory 'src/qml/emoji'
435=== added file 'src/qml/emoji/Aquarius_32.png'
436Binary files src/qml/emoji/Aquarius_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/Aquarius_32.png 2014-08-17 14:26:34 +0000 differ
437=== added file 'src/qml/emoji/Aries_32.png'
438Binary files src/qml/emoji/Aries_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/Aries_32.png 2014-08-17 14:26:34 +0000 differ
439=== added file 'src/qml/emoji/CMakeLists.txt'
440--- src/qml/emoji/CMakeLists.txt 1970-01-01 00:00:00 +0000
441+++ src/qml/emoji/CMakeLists.txt 2014-08-17 14:26:34 +0000
442@@ -0,0 +1,5 @@
443+file(GLOB EMOJI_PNG_FILES *.png)
444+
445+add_custom_target(messaging_app_EMOJI_IMAGES ALL SOURCES ${EMOJI_PNG_FILES})
446+
447+install(FILES ${EMOJI_PNG_FILES} DESTINATION ${MESSAGING_APP_DIR}/emoji)
448
449=== added file 'src/qml/emoji/Cancer_32.png'
450Binary files src/qml/emoji/Cancer_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/Cancer_32.png 2014-08-17 14:26:34 +0000 differ
451=== added file 'src/qml/emoji/Capricorn_32.png'
452Binary files src/qml/emoji/Capricorn_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/Capricorn_32.png 2014-08-17 14:26:34 +0000 differ
453=== added file 'src/qml/emoji/Charlie_32.png'
454Binary files src/qml/emoji/Charlie_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/Charlie_32.png 2014-08-17 14:26:34 +0000 differ
455=== added file 'src/qml/emoji/Gemini_32.png'
456Binary files src/qml/emoji/Gemini_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/Gemini_32.png 2014-08-17 14:26:34 +0000 differ
457=== added file 'src/qml/emoji/Happy_FMC_32.png'
458Binary files src/qml/emoji/Happy_FMC_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/Happy_FMC_32.png 2014-08-17 14:26:34 +0000 differ
459=== added file 'src/qml/emoji/Leo_32.png'
460Binary files src/qml/emoji/Leo_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/Leo_32.png 2014-08-17 14:26:34 +0000 differ
461=== added file 'src/qml/emoji/Libra_32.png'
462Binary files src/qml/emoji/Libra_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/Libra_32.png 2014-08-17 14:26:34 +0000 differ
463=== added file 'src/qml/emoji/Pisces_32.png'
464Binary files src/qml/emoji/Pisces_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/Pisces_32.png 2014-08-17 14:26:34 +0000 differ
465=== added file 'src/qml/emoji/Sagittarius_32.png'
466Binary files src/qml/emoji/Sagittarius_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/Sagittarius_32.png 2014-08-17 14:26:34 +0000 differ
467=== added file 'src/qml/emoji/Scorpius_32.png'
468Binary files src/qml/emoji/Scorpius_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/Scorpius_32.png 2014-08-17 14:26:34 +0000 differ
469=== added file 'src/qml/emoji/Taurus_32.png'
470Binary files src/qml/emoji/Taurus_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/Taurus_32.png 2014-08-17 14:26:34 +0000 differ
471=== added file 'src/qml/emoji/Virgo_32.png'
472Binary files src/qml/emoji/Virgo_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/Virgo_32.png 2014-08-17 14:26:34 +0000 differ
473=== added file 'src/qml/emoji/anchor_32.png'
474Binary files src/qml/emoji/anchor_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/anchor_32.png 2014-08-17 14:26:34 +0000 differ
475=== added file 'src/qml/emoji/angry_face_32.png'
476Binary files src/qml/emoji/angry_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/angry_face_32.png 2014-08-17 14:26:34 +0000 differ
477=== added file 'src/qml/emoji/anguished_32.png'
478Binary files src/qml/emoji/anguished_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/anguished_32.png 2014-08-17 14:26:34 +0000 differ
479=== added file 'src/qml/emoji/apple_of_discord_32.png'
480Binary files src/qml/emoji/apple_of_discord_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/apple_of_discord_32.png 2014-08-17 14:26:34 +0000 differ
481=== added file 'src/qml/emoji/astonished_face_32.png'
482Binary files src/qml/emoji/astonished_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/astonished_face_32.png 2014-08-17 14:26:34 +0000 differ
483=== added file 'src/qml/emoji/bactrian_camel_32.png'
484Binary files src/qml/emoji/bactrian_camel_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/bactrian_camel_32.png 2014-08-17 14:26:34 +0000 differ
485=== added file 'src/qml/emoji/beer_mug_32.png'
486Binary files src/qml/emoji/beer_mug_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/beer_mug_32.png 2014-08-17 14:26:34 +0000 differ
487=== added file 'src/qml/emoji/bento_box_32.png'
488Binary files src/qml/emoji/bento_box_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/bento_box_32.png 2014-08-17 14:26:34 +0000 differ
489=== added file 'src/qml/emoji/blowfish_32.png'
490Binary files src/qml/emoji/blowfish_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/blowfish_32.png 2014-08-17 14:26:34 +0000 differ
491=== added file 'src/qml/emoji/blush_32.png'
492Binary files src/qml/emoji/blush_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/blush_32.png 2014-08-17 14:26:34 +0000 differ
493=== added file 'src/qml/emoji/boar_32.png'
494Binary files src/qml/emoji/boar_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/boar_32.png 2014-08-17 14:26:34 +0000 differ
495=== added file 'src/qml/emoji/bowtie_32.png'
496Binary files src/qml/emoji/bowtie_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/bowtie_32.png 2014-08-17 14:26:34 +0000 differ
497=== added file 'src/qml/emoji/bus_stop_32.png'
498Binary files src/qml/emoji/bus_stop_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/bus_stop_32.png 2014-08-17 14:26:34 +0000 differ
499=== added file 'src/qml/emoji/cactus_32.png'
500Binary files src/qml/emoji/cactus_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/cactus_32.png 2014-08-17 14:26:34 +0000 differ
501=== added file 'src/qml/emoji/cat_face_32.png'
502Binary files src/qml/emoji/cat_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/cat_face_32.png 2014-08-17 14:26:34 +0000 differ
503=== added file 'src/qml/emoji/cat_face_with_tears_of_joy_32.png'
504Binary files src/qml/emoji/cat_face_with_tears_of_joy_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/cat_face_with_tears_of_joy_32.png 2014-08-17 14:26:34 +0000 differ
505=== added file 'src/qml/emoji/cat_face_with_wry_smile_32.png'
506Binary files src/qml/emoji/cat_face_with_wry_smile_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/cat_face_with_wry_smile_32.png 2014-08-17 14:26:34 +0000 differ
507=== added file 'src/qml/emoji/chicken_32.png'
508Binary files src/qml/emoji/chicken_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/chicken_32.png 2014-08-17 14:26:34 +0000 differ
509=== added file 'src/qml/emoji/circled_ideograph_secret_32.png'
510Binary files src/qml/emoji/circled_ideograph_secret_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/circled_ideograph_secret_32.png 2014-08-17 14:26:34 +0000 differ
511=== added file 'src/qml/emoji/cloud_32.png'
512Binary files src/qml/emoji/cloud_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/cloud_32.png 2014-08-17 14:26:34 +0000 differ
513=== added file 'src/qml/emoji/confused_32.png'
514Binary files src/qml/emoji/confused_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/confused_32.png 2014-08-17 14:26:34 +0000 differ
515=== added file 'src/qml/emoji/couple_holding_hands_32.png'
516Binary files src/qml/emoji/couple_holding_hands_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/couple_holding_hands_32.png 2014-08-17 14:26:34 +0000 differ
517=== added file 'src/qml/emoji/couple_with_heart_32.png'
518Binary files src/qml/emoji/couple_with_heart_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/couple_with_heart_32.png 2014-08-17 14:26:34 +0000 differ
519=== added file 'src/qml/emoji/crescent_moon_32.png'
520Binary files src/qml/emoji/crescent_moon_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/crescent_moon_32.png 2014-08-17 14:26:34 +0000 differ
521=== added file 'src/qml/emoji/crying_cat_face_32.png'
522Binary files src/qml/emoji/crying_cat_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/crying_cat_face_32.png 2014-08-17 14:26:34 +0000 differ
523=== added file 'src/qml/emoji/crying_face_32.png'
524Binary files src/qml/emoji/crying_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/crying_face_32.png 2014-08-17 14:26:34 +0000 differ
525=== added file 'src/qml/emoji/cutting_lines_32.png'
526Binary files src/qml/emoji/cutting_lines_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/cutting_lines_32.png 2014-08-17 14:26:34 +0000 differ
527=== added file 'src/qml/emoji/cyclone_32.png'
528Binary files src/qml/emoji/cyclone_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/cyclone_32.png 2014-08-17 14:26:34 +0000 differ
529=== added file 'src/qml/emoji/disappointed_but_relieved_face_32.png'
530Binary files src/qml/emoji/disappointed_but_relieved_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/disappointed_but_relieved_face_32.png 2014-08-17 14:26:34 +0000 differ
531=== added file 'src/qml/emoji/disappointed_face_32.png'
532Binary files src/qml/emoji/disappointed_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/disappointed_face_32.png 2014-08-17 14:26:34 +0000 differ
533=== added file 'src/qml/emoji/dizzy_face_32.png'
534Binary files src/qml/emoji/dizzy_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/dizzy_face_32.png 2014-08-17 14:26:34 +0000 differ
535=== added file 'src/qml/emoji/dog_face_32.png'
536Binary files src/qml/emoji/dog_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/dog_face_32.png 2014-08-17 14:26:34 +0000 differ
537=== added file 'src/qml/emoji/drunk_32.png'
538Binary files src/qml/emoji/drunk_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/drunk_32.png 2014-08-17 14:26:34 +0000 differ
539=== added file 'src/qml/emoji/electric_light_bulb_32.png'
540Binary files src/qml/emoji/electric_light_bulb_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/electric_light_bulb_32.png 2014-08-17 14:26:34 +0000 differ
541=== added file 'src/qml/emoji/elephant_32.png'
542Binary files src/qml/emoji/elephant_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/elephant_32.png 2014-08-17 14:26:34 +0000 differ
543=== added file 'src/qml/emoji/expressionless_32.png'
544Binary files src/qml/emoji/expressionless_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/expressionless_32.png 2014-08-17 14:26:34 +0000 differ
545=== added file 'src/qml/emoji/extraterrestrial_alien_32.png'
546Binary files src/qml/emoji/extraterrestrial_alien_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/extraterrestrial_alien_32.png 2014-08-17 14:26:34 +0000 differ
547=== added file 'src/qml/emoji/face_savouring_delicious_food_32.png'
548Binary files src/qml/emoji/face_savouring_delicious_food_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/face_savouring_delicious_food_32.png 2014-08-17 14:26:34 +0000 differ
549=== added file 'src/qml/emoji/face_with_look_of_triumph_32.png'
550Binary files src/qml/emoji/face_with_look_of_triumph_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/face_with_look_of_triumph_32.png 2014-08-17 14:26:34 +0000 differ
551=== added file 'src/qml/emoji/face_with_medical_mask_32.png'
552Binary files src/qml/emoji/face_with_medical_mask_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/face_with_medical_mask_32.png 2014-08-17 14:26:34 +0000 differ
553=== added file 'src/qml/emoji/face_with_no_good_gesture_32.png'
554Binary files src/qml/emoji/face_with_no_good_gesture_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/face_with_no_good_gesture_32.png 2014-08-17 14:26:34 +0000 differ
555=== added file 'src/qml/emoji/face_with_ok_gesture_32.png'
556Binary files src/qml/emoji/face_with_ok_gesture_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/face_with_ok_gesture_32.png 2014-08-17 14:26:34 +0000 differ
557=== added file 'src/qml/emoji/face_with_open_mouth_and_cold_sweat_32.png'
558Binary files src/qml/emoji/face_with_open_mouth_and_cold_sweat_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/face_with_open_mouth_and_cold_sweat_32.png 2014-08-17 14:26:34 +0000 differ
559=== added file 'src/qml/emoji/face_with_tear_of_joy_32.png'
560Binary files src/qml/emoji/face_with_tear_of_joy_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/face_with_tear_of_joy_32.png 2014-08-17 14:26:34 +0000 differ
561=== added file 'src/qml/emoji/family_32.png'
562Binary files src/qml/emoji/family_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/family_32.png 2014-08-17 14:26:34 +0000 differ
563=== added file 'src/qml/emoji/family_daughters_32.png'
564Binary files src/qml/emoji/family_daughters_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/family_daughters_32.png 2014-08-17 14:26:34 +0000 differ
565=== added file 'src/qml/emoji/fearful_face_32.png'
566Binary files src/qml/emoji/fearful_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/fearful_face_32.png 2014-08-17 14:26:34 +0000 differ
567=== added file 'src/qml/emoji/first_quarter_moon_32.png'
568Binary files src/qml/emoji/first_quarter_moon_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/first_quarter_moon_32.png 2014-08-17 14:26:34 +0000 differ
569=== added file 'src/qml/emoji/fish_cake_with_swirl_design_32.png'
570Binary files src/qml/emoji/fish_cake_with_swirl_design_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/fish_cake_with_swirl_design_32.png 2014-08-17 14:26:34 +0000 differ
571=== added file 'src/qml/emoji/fisted_hand_sign_32.png'
572Binary files src/qml/emoji/fisted_hand_sign_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/fisted_hand_sign_32.png 2014-08-17 14:26:34 +0000 differ
573=== added file 'src/qml/emoji/flushed_32.png'
574Binary files src/qml/emoji/flushed_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/flushed_32.png 2014-08-17 14:26:34 +0000 differ
575=== added file 'src/qml/emoji/frog_face_32.png'
576Binary files src/qml/emoji/frog_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/frog_face_32.png 2014-08-17 14:26:34 +0000 differ
577=== added file 'src/qml/emoji/frowning_32.png'
578Binary files src/qml/emoji/frowning_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/frowning_32.png 2014-08-17 14:26:34 +0000 differ
579=== added file 'src/qml/emoji/full_moon_32.png'
580Binary files src/qml/emoji/full_moon_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/full_moon_32.png 2014-08-17 14:26:34 +0000 differ
581=== added file 'src/qml/emoji/gentleman_octopus_32.png'
582Binary files src/qml/emoji/gentleman_octopus_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/gentleman_octopus_32.png 2014-08-17 14:26:34 +0000 differ
583=== added file 'src/qml/emoji/ghost_32.png'
584Binary files src/qml/emoji/ghost_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/ghost_32.png 2014-08-17 14:26:34 +0000 differ
585=== added file 'src/qml/emoji/glowing_star_32.png'
586Binary files src/qml/emoji/glowing_star_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/glowing_star_32.png 2014-08-17 14:26:34 +0000 differ
587=== added file 'src/qml/emoji/grimacing_32.png'
588Binary files src/qml/emoji/grimacing_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/grimacing_32.png 2014-08-17 14:26:34 +0000 differ
589=== added file 'src/qml/emoji/grin_32.png'
590Binary files src/qml/emoji/grin_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/grin_32.png 2014-08-17 14:26:34 +0000 differ
591=== added file 'src/qml/emoji/grinning_32.png'
592Binary files src/qml/emoji/grinning_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/grinning_32.png 2014-08-17 14:26:34 +0000 differ
593=== added file 'src/qml/emoji/grinning_cat_face_with_smiling_eyes_32.png'
594Binary files src/qml/emoji/grinning_cat_face_with_smiling_eyes_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/grinning_cat_face_with_smiling_eyes_32.png 2014-08-17 14:26:34 +0000 differ
595=== added file 'src/qml/emoji/guitar_32.png'
596Binary files src/qml/emoji/guitar_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/guitar_32.png 2014-08-17 14:26:34 +0000 differ
597=== added file 'src/qml/emoji/happy_person_raising_one_hand_32.png'
598Binary files src/qml/emoji/happy_person_raising_one_hand_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/happy_person_raising_one_hand_32.png 2014-08-17 14:26:34 +0000 differ
599=== added file 'src/qml/emoji/hatching_chick_32.png'
600Binary files src/qml/emoji/hatching_chick_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/hatching_chick_32.png 2014-08-17 14:26:34 +0000 differ
601=== added file 'src/qml/emoji/hear_no_evil_monkey_32.png'
602Binary files src/qml/emoji/hear_no_evil_monkey_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/hear_no_evil_monkey_32.png 2014-08-17 14:26:34 +0000 differ
603=== added file 'src/qml/emoji/heart_32.png'
604Binary files src/qml/emoji/heart_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/heart_32.png 2014-08-17 14:26:34 +0000 differ
605=== added file 'src/qml/emoji/heart_eyes_32.png'
606Binary files src/qml/emoji/heart_eyes_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/heart_eyes_32.png 2014-08-17 14:26:34 +0000 differ
607=== added file 'src/qml/emoji/high_voltage_sign_32.png'
608Binary files src/qml/emoji/high_voltage_sign_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/high_voltage_sign_32.png 2014-08-17 14:26:34 +0000 differ
609=== added file 'src/qml/emoji/horse_32.png'
610Binary files src/qml/emoji/horse_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/horse_32.png 2014-08-17 14:26:34 +0000 differ
611=== added file 'src/qml/emoji/hot_beverage_32.png'
612Binary files src/qml/emoji/hot_beverage_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/hot_beverage_32.png 2014-08-17 14:26:34 +0000 differ
613=== added file 'src/qml/emoji/hushed_32.png'
614Binary files src/qml/emoji/hushed_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/hushed_32.png 2014-08-17 14:26:34 +0000 differ
615=== added file 'src/qml/emoji/jack_o_lantern_32.png'
616Binary files src/qml/emoji/jack_o_lantern_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/jack_o_lantern_32.png 2014-08-17 14:26:34 +0000 differ
617=== added file 'src/qml/emoji/jumping_spider_32.png'
618Binary files src/qml/emoji/jumping_spider_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/jumping_spider_32.png 2014-08-17 14:26:34 +0000 differ
619=== added file 'src/qml/emoji/kissing_32.png'
620Binary files src/qml/emoji/kissing_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/kissing_32.png 2014-08-17 14:26:34 +0000 differ
621=== added file 'src/qml/emoji/kissing_cat_face_with_closed_eyes_32.png'
622Binary files src/qml/emoji/kissing_cat_face_with_closed_eyes_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/kissing_cat_face_with_closed_eyes_32.png 2014-08-17 14:26:34 +0000 differ
623=== added file 'src/qml/emoji/kissing_closed_eyes_32.png'
624Binary files src/qml/emoji/kissing_closed_eyes_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/kissing_closed_eyes_32.png 2014-08-17 14:26:34 +0000 differ
625=== added file 'src/qml/emoji/kissing_heart_32.png'
626Binary files src/qml/emoji/kissing_heart_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/kissing_heart_32.png 2014-08-17 14:26:34 +0000 differ
627=== added file 'src/qml/emoji/kissing_smiling_eyes_32.png'
628Binary files src/qml/emoji/kissing_smiling_eyes_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/kissing_smiling_eyes_32.png 2014-08-17 14:26:34 +0000 differ
629=== added file 'src/qml/emoji/koala_32.png'
630Binary files src/qml/emoji/koala_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/koala_32.png 2014-08-17 14:26:34 +0000 differ
631=== added file 'src/qml/emoji/lambda_chi_alpha_32.png'
632Binary files src/qml/emoji/lambda_chi_alpha_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/lambda_chi_alpha_32.png 2014-08-17 14:26:34 +0000 differ
633=== added file 'src/qml/emoji/last_quarter_moon_32.png'
634Binary files src/qml/emoji/last_quarter_moon_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/last_quarter_moon_32.png 2014-08-17 14:26:34 +0000 differ
635=== added file 'src/qml/emoji/laughing_32.png'
636Binary files src/qml/emoji/laughing_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/laughing_32.png 2014-08-17 14:26:34 +0000 differ
637=== added file 'src/qml/emoji/loudly_crying_face_32.png'
638Binary files src/qml/emoji/loudly_crying_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/loudly_crying_face_32.png 2014-08-17 14:26:34 +0000 differ
639=== added file 'src/qml/emoji/love_hotel_32.png'
640Binary files src/qml/emoji/love_hotel_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/love_hotel_32.png 2014-08-17 14:26:34 +0000 differ
641=== added file 'src/qml/emoji/mens_symbol_32.png'
642Binary files src/qml/emoji/mens_symbol_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/mens_symbol_32.png 2014-08-17 14:26:34 +0000 differ
643=== added file 'src/qml/emoji/microphone_32.png'
644Binary files src/qml/emoji/microphone_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/microphone_32.png 2014-08-17 14:26:34 +0000 differ
645=== added file 'src/qml/emoji/milky_way_32.png'
646Binary files src/qml/emoji/milky_way_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/milky_way_32.png 2014-08-17 14:26:34 +0000 differ
647=== added file 'src/qml/emoji/monster_32.png'
648Binary files src/qml/emoji/monster_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/monster_32.png 2014-08-17 14:26:34 +0000 differ
649=== added file 'src/qml/emoji/moon_with_face_32.png'
650Binary files src/qml/emoji/moon_with_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/moon_with_face_32.png 2014-08-17 14:26:34 +0000 differ
651=== added file 'src/qml/emoji/mount_fuji_32.png'
652Binary files src/qml/emoji/mount_fuji_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/mount_fuji_32.png 2014-08-17 14:26:34 +0000 differ
653=== added file 'src/qml/emoji/new_moon_32.png'
654Binary files src/qml/emoji/new_moon_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/new_moon_32.png 2014-08-17 14:26:34 +0000 differ
655=== added file 'src/qml/emoji/ninja_32.png'
656Binary files src/qml/emoji/ninja_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/ninja_32.png 2014-08-17 14:26:34 +0000 differ
657=== added file 'src/qml/emoji/no_one_under_eighteen_symbol_32.png'
658Binary files src/qml/emoji/no_one_under_eighteen_symbol_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/no_one_under_eighteen_symbol_32.png 2014-08-17 14:26:34 +0000 differ
659=== added file 'src/qml/emoji/oars_32.png'
660Binary files src/qml/emoji/oars_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/oars_32.png 2014-08-17 14:26:34 +0000 differ
661=== added file 'src/qml/emoji/octopus_32.png'
662Binary files src/qml/emoji/octopus_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/octopus_32.png 2014-08-17 14:26:34 +0000 differ
663=== added file 'src/qml/emoji/open_mouth_32.png'
664Binary files src/qml/emoji/open_mouth_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/open_mouth_32.png 2014-08-17 14:26:34 +0000 differ
665=== added file 'src/qml/emoji/paw_prints_32.png'
666Binary files src/qml/emoji/paw_prints_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/paw_prints_32.png 2014-08-17 14:26:34 +0000 differ
667=== added file 'src/qml/emoji/pegasus_black_32.png'
668Binary files src/qml/emoji/pegasus_black_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/pegasus_black_32.png 2014-08-17 14:26:34 +0000 differ
669=== added file 'src/qml/emoji/penguin_32.png'
670Binary files src/qml/emoji/penguin_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/penguin_32.png 2014-08-17 14:26:34 +0000 differ
671=== added file 'src/qml/emoji/penguin_chick_32.png'
672Binary files src/qml/emoji/penguin_chick_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/penguin_chick_32.png 2014-08-17 14:26:34 +0000 differ
673=== added file 'src/qml/emoji/pensive_face_32.png'
674Binary files src/qml/emoji/pensive_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/pensive_face_32.png 2014-08-17 14:26:34 +0000 differ
675=== added file 'src/qml/emoji/persevering_face_32.png'
676Binary files src/qml/emoji/persevering_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/persevering_face_32.png 2014-08-17 14:26:34 +0000 differ
677=== added file 'src/qml/emoji/person_bowing_deeply_32.png'
678Binary files src/qml/emoji/person_bowing_deeply_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/person_bowing_deeply_32.png 2014-08-17 14:26:34 +0000 differ
679=== added file 'src/qml/emoji/person_frowning_32.png'
680Binary files src/qml/emoji/person_frowning_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/person_frowning_32.png 2014-08-17 14:26:34 +0000 differ
681=== added file 'src/qml/emoji/person_raising_both_hands_in_celebration_32.png'
682Binary files src/qml/emoji/person_raising_both_hands_in_celebration_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/person_raising_both_hands_in_celebration_32.png 2014-08-17 14:26:34 +0000 differ
683=== added file 'src/qml/emoji/person_with_folded_hands_32.png'
684Binary files src/qml/emoji/person_with_folded_hands_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/person_with_folded_hands_32.png 2014-08-17 14:26:34 +0000 differ
685=== added file 'src/qml/emoji/person_with_pouting_face_32.png'
686Binary files src/qml/emoji/person_with_pouting_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/person_with_pouting_face_32.png 2014-08-17 14:26:34 +0000 differ
687=== added file 'src/qml/emoji/phone_book_32.png'
688Binary files src/qml/emoji/phone_book_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/phone_book_32.png 2014-08-17 14:26:34 +0000 differ
689=== added file 'src/qml/emoji/pill_32.png'
690Binary files src/qml/emoji/pill_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/pill_32.png 2014-08-17 14:26:34 +0000 differ
691=== added file 'src/qml/emoji/pizza_32.png'
692Binary files src/qml/emoji/pizza_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/pizza_32.png 2014-08-17 14:26:34 +0000 differ
693=== added file 'src/qml/emoji/poop_32.png'
694Binary files src/qml/emoji/poop_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/poop_32.png 2014-08-17 14:26:34 +0000 differ
695=== added file 'src/qml/emoji/pouting_cat_face_32.png'
696Binary files src/qml/emoji/pouting_cat_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/pouting_cat_face_32.png 2014-08-17 14:26:34 +0000 differ
697=== added file 'src/qml/emoji/pouting_face_32.png'
698Binary files src/qml/emoji/pouting_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/pouting_face_32.png 2014-08-17 14:26:34 +0000 differ
699=== added file 'src/qml/emoji/princess_32.png'
700Binary files src/qml/emoji/princess_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/princess_32.png 2014-08-17 14:26:34 +0000 differ
701=== added file 'src/qml/emoji/puke_32.png'
702Binary files src/qml/emoji/puke_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/puke_32.png 2014-08-17 14:26:34 +0000 differ
703=== added file 'src/qml/emoji/puke_finger_32.png'
704Binary files src/qml/emoji/puke_finger_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/puke_finger_32.png 2014-08-17 14:26:34 +0000 differ
705=== added file 'src/qml/emoji/quoll_32.png'
706Binary files src/qml/emoji/quoll_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/quoll_32.png 2014-08-17 14:26:34 +0000 differ
707=== added file 'src/qml/emoji/rainbow_32.png'
708Binary files src/qml/emoji/rainbow_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/rainbow_32.png 2014-08-17 14:26:34 +0000 differ
709=== added file 'src/qml/emoji/rainbow_sky_32.png'
710Binary files src/qml/emoji/rainbow_sky_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/rainbow_sky_32.png 2014-08-17 14:26:34 +0000 differ
711=== added file 'src/qml/emoji/rainbow_solid_32.png'
712Binary files src/qml/emoji/rainbow_solid_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/rainbow_solid_32.png 2014-08-17 14:26:34 +0000 differ
713=== added file 'src/qml/emoji/relaxed_32.png'
714Binary files src/qml/emoji/relaxed_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/relaxed_32.png 2014-08-17 14:26:34 +0000 differ
715=== added file 'src/qml/emoji/relieved_32.png'
716Binary files src/qml/emoji/relieved_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/relieved_32.png 2014-08-17 14:26:34 +0000 differ
717=== added file 'src/qml/emoji/rice_ball_32.png'
718Binary files src/qml/emoji/rice_ball_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/rice_ball_32.png 2014-08-17 14:26:34 +0000 differ
719=== added file 'src/qml/emoji/satisfied_32.png'
720Binary files src/qml/emoji/satisfied_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/satisfied_32.png 2014-08-17 14:26:34 +0000 differ
721=== added file 'src/qml/emoji/scuba_diver_32.png'
722Binary files src/qml/emoji/scuba_diver_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/scuba_diver_32.png 2014-08-17 14:26:34 +0000 differ
723=== added file 'src/qml/emoji/see_no_evil_monkey_32.png'
724Binary files src/qml/emoji/see_no_evil_monkey_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/see_no_evil_monkey_32.png 2014-08-17 14:26:34 +0000 differ
725=== added file 'src/qml/emoji/ship_32.png'
726Binary files src/qml/emoji/ship_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/ship_32.png 2014-08-17 14:26:34 +0000 differ
727=== added file 'src/qml/emoji/shit_32.png'
728Binary files src/qml/emoji/shit_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/shit_32.png 2014-08-17 14:26:34 +0000 differ
729=== added file 'src/qml/emoji/shooting_star_32.png'
730Binary files src/qml/emoji/shooting_star_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/shooting_star_32.png 2014-08-17 14:26:34 +0000 differ
731=== added file 'src/qml/emoji/skull_32.png'
732Binary files src/qml/emoji/skull_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/skull_32.png 2014-08-17 14:26:34 +0000 differ
733=== added file 'src/qml/emoji/sleeping_32.png'
734Binary files src/qml/emoji/sleeping_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/sleeping_32.png 2014-08-17 14:26:34 +0000 differ
735=== added file 'src/qml/emoji/smile_32.png'
736Binary files src/qml/emoji/smile_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/smile_32.png 2014-08-17 14:26:34 +0000 differ
737=== added file 'src/qml/emoji/smiley_32.png'
738Binary files src/qml/emoji/smiley_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/smiley_32.png 2014-08-17 14:26:34 +0000 differ
739=== added file 'src/qml/emoji/smiley_confused_32.png'
740Binary files src/qml/emoji/smiley_confused_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/smiley_confused_32.png 2014-08-17 14:26:34 +0000 differ
741=== added file 'src/qml/emoji/smiley_kissing_heart_32.png'
742Binary files src/qml/emoji/smiley_kissing_heart_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/smiley_kissing_heart_32.png 2014-08-17 14:26:34 +0000 differ
743=== added file 'src/qml/emoji/smiley_sleeping_32.png'
744Binary files src/qml/emoji/smiley_sleeping_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/smiley_sleeping_32.png 2014-08-17 14:26:34 +0000 differ
745=== added file 'src/qml/emoji/smiley_smile_32.png'
746Binary files src/qml/emoji/smiley_smile_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/smiley_smile_32.png 2014-08-17 14:26:34 +0000 differ
747=== added file 'src/qml/emoji/smiling_cat_face_with_open_mouth_32.png'
748Binary files src/qml/emoji/smiling_cat_face_with_open_mouth_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/smiling_cat_face_with_open_mouth_32.png 2014-08-17 14:26:34 +0000 differ
749=== added file 'src/qml/emoji/smiling_face_32.png'
750Binary files src/qml/emoji/smiling_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/smiling_face_32.png 2014-08-17 14:26:34 +0000 differ
751=== added file 'src/qml/emoji/smirk_32.png'
752Binary files src/qml/emoji/smirk_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/smirk_32.png 2014-08-17 14:26:34 +0000 differ
753=== added file 'src/qml/emoji/snail_32.png'
754Binary files src/qml/emoji/snail_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/snail_32.png 2014-08-17 14:26:34 +0000 differ
755=== added file 'src/qml/emoji/snake_32.png'
756Binary files src/qml/emoji/snake_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/snake_32.png 2014-08-17 14:26:34 +0000 differ
757=== added file 'src/qml/emoji/snake_alt_32.png'
758Binary files src/qml/emoji/snake_alt_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/snake_alt_32.png 2014-08-17 14:26:34 +0000 differ
759=== added file 'src/qml/emoji/snowboarder_32.png'
760Binary files src/qml/emoji/snowboarder_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/snowboarder_32.png 2014-08-17 14:26:34 +0000 differ
761=== added file 'src/qml/emoji/speak_no_evil_monkey_32.png'
762Binary files src/qml/emoji/speak_no_evil_monkey_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/speak_no_evil_monkey_32.png 2014-08-17 14:26:34 +0000 differ
763=== added file 'src/qml/emoji/speech_balloon_32.png'
764Binary files src/qml/emoji/speech_balloon_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/speech_balloon_32.png 2014-08-17 14:26:34 +0000 differ
765=== added file 'src/qml/emoji/spouting_whale_32.png'
766Binary files src/qml/emoji/spouting_whale_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/spouting_whale_32.png 2014-08-17 14:26:34 +0000 differ
767=== added file 'src/qml/emoji/stuck_out_tongue_32.png'
768Binary files src/qml/emoji/stuck_out_tongue_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/stuck_out_tongue_32.png 2014-08-17 14:26:34 +0000 differ
769=== added file 'src/qml/emoji/sun_32.png'
770Binary files src/qml/emoji/sun_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/sun_32.png 2014-08-17 14:26:34 +0000 differ
771=== added file 'src/qml/emoji/sun_with_face_32.png'
772Binary files src/qml/emoji/sun_with_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/sun_with_face_32.png 2014-08-17 14:26:34 +0000 differ
773=== added file 'src/qml/emoji/sunrise_over_mountains_32.png'
774Binary files src/qml/emoji/sunrise_over_mountains_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/sunrise_over_mountains_32.png 2014-08-17 14:26:34 +0000 differ
775=== added file 'src/qml/emoji/sweat_32.png'
776Binary files src/qml/emoji/sweat_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/sweat_32.png 2014-08-17 14:26:34 +0000 differ
777=== added file 'src/qml/emoji/sweat_smile_32.png'
778Binary files src/qml/emoji/sweat_smile_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/sweat_smile_32.png 2014-08-17 14:26:34 +0000 differ
779=== added file 'src/qml/emoji/tangerine_32.png'
780Binary files src/qml/emoji/tangerine_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/tangerine_32.png 2014-08-17 14:26:34 +0000 differ
781=== added file 'src/qml/emoji/tennis_racquet_and_ball_32.png'
782Binary files src/qml/emoji/tennis_racquet_and_ball_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/tennis_racquet_and_ball_32.png 2014-08-17 14:26:34 +0000 differ
783=== added file 'src/qml/emoji/thumbs_up_sign_32.png'
784Binary files src/qml/emoji/thumbs_up_sign_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/thumbs_up_sign_32.png 2014-08-17 14:26:34 +0000 differ
785=== added file 'src/qml/emoji/tropical_drink_32.png'
786Binary files src/qml/emoji/tropical_drink_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/tropical_drink_32.png 2014-08-17 14:26:34 +0000 differ
787=== added file 'src/qml/emoji/two_men_holding_hands_32.png'
788Binary files src/qml/emoji/two_men_holding_hands_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/two_men_holding_hands_32.png 2014-08-17 14:26:34 +0000 differ
789=== added file 'src/qml/emoji/two_men_with_heart_32.png'
790Binary files src/qml/emoji/two_men_with_heart_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/two_men_with_heart_32.png 2014-08-17 14:26:34 +0000 differ
791=== added file 'src/qml/emoji/two_women_holding_hands_32.png'
792Binary files src/qml/emoji/two_women_holding_hands_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/two_women_holding_hands_32.png 2014-08-17 14:26:34 +0000 differ
793=== added file 'src/qml/emoji/two_women_in_love_32.png'
794Binary files src/qml/emoji/two_women_in_love_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/two_women_in_love_32.png 2014-08-17 14:26:34 +0000 differ
795=== added file 'src/qml/emoji/two_women_with_heart_32.png'
796Binary files src/qml/emoji/two_women_with_heart_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/two_women_with_heart_32.png 2014-08-17 14:26:34 +0000 differ
797=== added file 'src/qml/emoji/unamused_32.png'
798Binary files src/qml/emoji/unamused_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/unamused_32.png 2014-08-17 14:26:34 +0000 differ
799=== added file 'src/qml/emoji/victory_hand_32.png'
800Binary files src/qml/emoji/victory_hand_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/victory_hand_32.png 2014-08-17 14:26:34 +0000 differ
801=== added file 'src/qml/emoji/video_game_32.png'
802Binary files src/qml/emoji/video_game_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/video_game_32.png 2014-08-17 14:26:34 +0000 differ
803=== added file 'src/qml/emoji/waxing_gibbous_moon_32.png'
804Binary files src/qml/emoji/waxing_gibbous_moon_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/waxing_gibbous_moon_32.png 2014-08-17 14:26:34 +0000 differ
805=== added file 'src/qml/emoji/weary_cat_face_32.png'
806Binary files src/qml/emoji/weary_cat_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/weary_cat_face_32.png 2014-08-17 14:26:34 +0000 differ
807=== added file 'src/qml/emoji/weary_face_32.png'
808Binary files src/qml/emoji/weary_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/weary_face_32.png 2014-08-17 14:26:34 +0000 differ
809=== added file 'src/qml/emoji/wheelchair_32.png'
810Binary files src/qml/emoji/wheelchair_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/wheelchair_32.png 2014-08-17 14:26:34 +0000 differ
811=== added file 'src/qml/emoji/white_smiling_face_32.png'
812Binary files src/qml/emoji/white_smiling_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/white_smiling_face_32.png 2014-08-17 14:26:34 +0000 differ
813=== added file 'src/qml/emoji/wink2_32.png'
814Binary files src/qml/emoji/wink2_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/wink2_32.png 2014-08-17 14:26:34 +0000 differ
815=== added file 'src/qml/emoji/wink_32.png'
816Binary files src/qml/emoji/wink_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/wink_32.png 2014-08-17 14:26:34 +0000 differ
817=== added file 'src/qml/emoji/wolf_face_32.png'
818Binary files src/qml/emoji/wolf_face_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/wolf_face_32.png 2014-08-17 14:26:34 +0000 differ
819=== added file 'src/qml/emoji/worried_32.png'
820Binary files src/qml/emoji/worried_32.png 1970-01-01 00:00:00 +0000 and src/qml/emoji/worried_32.png 2014-08-17 14:26:34 +0000 differ

Subscribers

People subscribed via source and target branches