[kpimtextedit/Applications/19.04] src: Revert "Add more emoticons"

Pino Toscano null at kde.org
Mon Apr 1 19:26:16 BST 2019


Git commit d585af51ee3ee505cf34787e7bb364f2b699b611 by Pino Toscano.
Committed on 01/04/2019 at 18:23.
Pushed by pino into branch 'Applications/19.04'.

Revert "Add more emoticons"

This adds a new feature to a frozen release branch.
Even more, the new feature adds a new UI visible string without
translating it, to circumvent the string freeze.

Similar commits like these (just with the proper i18n() string) were
done in the past days, breaking the feature and string freezes.

CCMAIL: montel at kde.org
CCMAIL: release-team at kde.org

This reverts commit 5f35f89b1441959c776af7a93eedb077f1cf4c56.

M  +0    -1    src/emoticon/emoticonunicodetab.cpp
M  +1    -9    src/textutils.cpp
M  +0    -1    src/textutils.h

https://commits.kde.org/kpimtextedit/d585af51ee3ee505cf34787e7bb364f2b699b611

diff --git a/src/emoticon/emoticonunicodetab.cpp b/src/emoticon/emoticonunicodetab.cpp
index 12f3c29..8c29bc9 100644
--- a/src/emoticon/emoticonunicodetab.cpp
+++ b/src/emoticon/emoticonunicodetab.cpp
@@ -46,7 +46,6 @@ void EmoticonUnicodeTab::loadEmoticons()
         createPlainTextEmoticonTab(i18n("Flags"), KPIMTextEdit::TextUtils::unicodeFlagsEmoji());
         createPlainTextEmoticonTab(i18n("Weather"), KPIMTextEdit::TextUtils::unicodeWeatherEmoji());
         createPlainTextEmoticonTab(i18n("Foods"), KPIMTextEdit::TextUtils::unicodeFoodEmoji());
-        createPlainTextEmoticonTab(QStringLiteral("Sports"), KPIMTextEdit::TextUtils::unicodeSportEmoji());
     } else {
         createEmoticonTab(QString());
     }
diff --git a/src/textutils.cpp b/src/textutils.cpp
index 4e80c1c..e9af096 100644
--- a/src/textutils.cpp
+++ b/src/textutils.cpp
@@ -176,8 +176,7 @@ QList<uint> TextUtils::unicodeFullEmoji()
            +TextUtils::unicodeEventEmoji()
            +TextUtils::unicodeFlagsEmoji()
            +TextUtils::unicodeWeatherEmoji()
-           +TextUtils::unicodeFoodEmoji()
-           +TextUtils::unicodeSportEmoji();
+           +TextUtils::unicodeFoodEmoji();
 }
 
 QList<uint> TextUtils::unicodeFacesEmoji()
@@ -250,10 +249,3 @@ QList<uint> TextUtils::unicodeFoodEmoji()
                                0x1F366, 0x1F367, 0x1F368};
     return lstEmoji;
 }
-
-QList<uint> TextUtils::unicodeSportEmoji()
-{
-    //Add more
-    const QList<uint> lstEmoji{0x1F93A, 0x1F3C7, 0x26F7, 0x1F3C2, 0x1F3CC, 0x1F3C4, 0x1F6A3, 0x1F3CA, 0x26F9, 0x1F3CB, 0x1F6B4, 0x1F938, 0x1F93C, 0x1F93D, 0x1F93E};
-    return lstEmoji;
-}
diff --git a/src/textutils.h b/src/textutils.h
index 7738575..0fd90e8 100644
--- a/src/textutils.h
+++ b/src/textutils.h
@@ -66,7 +66,6 @@ KPIMTEXTEDIT_EXPORT Q_REQUIRED_RESULT QList<uint> unicodeEventEmoji();
 KPIMTEXTEDIT_EXPORT Q_REQUIRED_RESULT QList<uint> unicodeFlagsEmoji();
 KPIMTEXTEDIT_EXPORT Q_REQUIRED_RESULT QList<uint> unicodeWeatherEmoji();
 KPIMTEXTEDIT_EXPORT Q_REQUIRED_RESULT QList<uint> unicodeFoodEmoji();
-KPIMTEXTEDIT_EXPORT Q_REQUIRED_RESULT QList<uint> unicodeSportEmoji();
 }
 }
 


More information about the release-team mailing list