chatterino2
Code Issues

changed notation

Browse Source
This commit is contained in:
fourtf
2017-01-18 04:33:30 +01:00
parent 552e4c957a
commit 10e4a0f785
61 changed files with 1214 additions and 1051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
emotes.cpp
+18 -19
View File
@@ -1,19 +1,19 @@
#include "emotes.h"
#include "resources.h"
QString Emotes::m_twitchEmoteTemplate(
QString Emotes::twitchEmoteTemplate(
"https://static-cdn.jtvnw.net/emoticons/v1/{id}/{scale}.0");
ConcurrentMap<QString, TwitchEmoteValue *> Emotes::m_twitchEmotes;
ConcurrentMap<QString, LazyLoadedImage *> Emotes::m_bttvEmotes;
ConcurrentMap<QString, LazyLoadedImage *> Emotes::m_ffzEmotes;
ConcurrentMap<QString, LazyLoadedImage *> Emotes::m_chatterinoEmotes;
ConcurrentMap<QString, LazyLoadedImage *> Emotes::m_bttvChannelEmoteFromCaches;
ConcurrentMap<QString, LazyLoadedImage *> Emotes::m_ffzChannelEmoteFromCaches;
ConcurrentMap<long, LazyLoadedImage *> Emotes::m_twitchEmoteFromCache;
ConcurrentMap<QString, LazyLoadedImage *> Emotes::m_miscImageFromCache;
ConcurrentMap<QString, TwitchEmoteValue *> Emotes::twitchEmotes;
ConcurrentMap<QString, LazyLoadedImage *> Emotes::bttvEmotes;
ConcurrentMap<QString, LazyLoadedImage *> Emotes::ffzEmotes;
ConcurrentMap<QString, LazyLoadedImage *> Emotes::chatterinoEmotes;
ConcurrentMap<QString, LazyLoadedImage *> Emotes::bttvChannelEmoteFromCaches;
ConcurrentMap<QString, LazyLoadedImage *> Emotes::ffzChannelEmoteFromCaches;
ConcurrentMap<long, LazyLoadedImage *> Emotes::twitchEmoteFromCache;
ConcurrentMap<QString, LazyLoadedImage *> Emotes::miscImageFromCache;
int Emotes::m_generation = 0;
int Emotes::generation = 0;
Emotes::Emotes()
{
@@ -22,10 +22,9 @@ Emotes::Emotes()
LazyLoadedImage *
Emotes::getTwitchEmoteById(const QString &name, long id)
{
return m_twitchEmoteFromCache.getOrAdd(id, [&name, id] {
return Emotes::twitchEmoteFromCache.getOrAdd(id, [&name, id] {
qreal scale;
QString url = getTwitchEmoteLink(id, scale);
return new LazyLoadedImage(url, scale, name, name + "\nTwitch Emote");
});
}
@@ -35,7 +34,7 @@ Emotes::getTwitchEmoteLink(long id, qreal &scale)
{
scale = .5;
return m_twitchEmoteTemplate.replace("{id}", QString::number(id))
return Emotes::twitchEmoteTemplate.replace("{id}", QString::number(id))
.replace("{scale}", "2");
}
@@ -50,16 +49,16 @@ LazyLoadedImage *
Emotes::getCheerBadge(long long amount)
{
if (amount >= 100000) {
return Resources::cheerBadge100000();
return Resources::getCheerBadge100000();
} else if (amount >= 10000) {
return Resources::cheerBadge10000();
return Resources::getCheerBadge10000();
} else if (amount >= 5000) {
return Resources::cheerBadge5000();
return Resources::getCheerBadge5000();
} else if (amount >= 1000) {
return Resources::cheerBadge1000();
return Resources::getCheerBadge1000();
} else if (amount >= 100) {
return Resources::cheerBadge100();
return Resources::getCheerBadge100();
} else {
return Resources::cheerBadge1();
return Resources::getCheerBadge1();
}
}