noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove unused functions from EmoteManager

Browse source
This commit is contained in:
Rasmus Karlsson 2018-06-05 17:12:16 +02:00 committed by fourtf
parent d584852bc0
commit 3a8ceede4e
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/singletons/emotemanager.cpp
View file

@ -211,11 +211,6 @@ void EmoteManager::reloadFFZChannelEmotes(const QString &channelName,
}); });
} }
util::ConcurrentMap<QString, providers::twitch::EmoteValue *> &EmoteManager::getTwitchEmotes()
{
return _twitchEmotes;
}
util::EmoteMap &EmoteManager::getFFZEmotes() util::EmoteMap &EmoteManager::getFFZEmotes()
{ {
return ffzGlobalEmotes; return ffzGlobalEmotes;
@ -241,11 +236,6 @@ util::ConcurrentMap<int, util::EmoteData> &EmoteManager::getFFZChannelEmoteFromC
return _ffzChannelEmoteFromCaches; return _ffzChannelEmoteFromCaches;
} }
util::ConcurrentMap<long, util::EmoteData> &EmoteManager::getTwitchEmoteFromCache()
{
return _twitchEmoteFromCache;
}
void EmoteManager::loadEmojis() void EmoteManager::loadEmojis()
{ {
QFile file(":/emojidata.txt"); QFile file(":/emojidata.txt");
@ -549,6 +539,7 @@ util::EmoteData EmoteManager::getTwitchEmoteById(long id, const QString &emoteNa
_emoteName.replace("<", "&lt;"); _emoteName.replace("<", "&lt;");
_emoteName.replace(">", "&gt;"); _emoteName.replace(">", "&gt;");
// clang-format off
static QMap<QString, QString> emoteNameReplacements{ static QMap<QString, QString> emoteNameReplacements{
{"[oO](_|\\.)[oO]", "O_o"}, {"\\&gt\\;\\(", "&gt;("}, {"\\&lt\\;3", "&lt;3"}, {"[oO](_|\\.)[oO]", "O_o"}, {"\\&gt\\;\\(", "&gt;("}, {"\\&lt\\;3", "&lt;3"},
{"\\:-?(o|O)", ":O"}, {"\\:-?(p|P)", ":P"}, {"\\:-?[\\\\/]", ":/"}, {"\\:-?(o|O)", ":O"}, {"\\:-?(p|P)", ":P"}, {"\\:-?[\\\\/]", ":/"},
@ -556,6 +547,7 @@ util::EmoteData EmoteManager::getTwitchEmoteById(long id, const QString &emoteNa
{"\\:-?D", ":D"}, {"\\;-?(p|P)", ";P"}, {"\\;-?\\)", ";)"}, {"\\:-?D", ":D"}, {"\\;-?(p|P)", ";P"}, {"\\;-?\\)", ";)"},
{"R-?\\)", "R)"}, {"B-?\\)", "B)"}, {"R-?\\)", "R)"}, {"B-?\\)", "B)"},
}; };
// clang-format on
auto it = emoteNameReplacements.find(_emoteName); auto it = emoteNameReplacements.find(_emoteName);
if (it != emoteNameReplacements.end()) { if (it != emoteNameReplacements.end()) {

2
src/singletons/emotemanager.hpp
View file

@ -34,13 +34,11 @@ public:
void reloadFFZChannelEmotes(const QString &channelName, void reloadFFZChannelEmotes(const QString &channelName,
std::weak_ptr<util::EmoteMap> channelEmoteMap); std::weak_ptr<util::EmoteMap> channelEmoteMap);
util::ConcurrentMap<QString, providers::twitch::EmoteValue *> &getTwitchEmotes();
util::EmoteMap &getFFZEmotes(); util::EmoteMap &getFFZEmotes();
util::EmoteMap &getChatterinoEmotes(); util::EmoteMap &getChatterinoEmotes();
util::EmoteMap &getBTTVChannelEmoteFromCaches(); util::EmoteMap &getBTTVChannelEmoteFromCaches();
util::EmojiMap &getEmojis(); util::EmojiMap &getEmojis();
util::ConcurrentMap<int, util::EmoteData> &getFFZChannelEmoteFromCaches(); util::ConcurrentMap<int, util::EmoteData> &getFFZChannelEmoteFromCaches();
util::ConcurrentMap<long, util::EmoteData> &getTwitchEmoteFromCache();
util::EmoteData getCheerImage(long long int amount, bool animated); util::EmoteData getCheerImage(long long int amount, bool animated);