chatterino2
Code Issues

added namespaces

Browse Source
This commit is contained in:
fourtf
2017-01-18 21:30:23 +01:00
parent 82338baaa3
commit 2e8dc63a95
82 changed files with 681 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files
emojis.cpp
+20 -13
View File
@@ -5,13 +5,15 @@
#include <QStringBuilder>
#include <QTextStream>
namespace chatterino {
QRegularExpression Emojis::findShortCodesRegex(":([-+\\w]+):");
QMap<QString, Emojis::EmojiData> Emojis::shortCodeToEmoji;
QMap<QString, QString> Emojis::emojiToShortCode;
QMap<QChar, QMap<QString, QString>> Emojis::firstEmojiChars;
ConcurrentMap<QString, LazyLoadedImage *> Emojis::imageCache;
ConcurrentMap<QString, messages::LazyLoadedImage *> Emojis::imageCache;
QString
Emojis::replaceShortCodes(const QString &text)
@@ -21,8 +23,9 @@ Emojis::replaceShortCodes(const QString &text)
}
void
Emojis::parseEmojis(std::vector<std::tuple<LazyLoadedImage *, QString>> &vector,
const QString &text)
Emojis::parseEmojis(
std::vector<std::tuple<messages::LazyLoadedImage *, QString>> &vector,
const QString &text)
{
long lastSlice = 0;
@@ -42,17 +45,20 @@ Emojis::parseEmojis(std::vector<std::tuple<LazyLoadedImage *, QString>> &vector,
if (i - lastSlice != 0) {
vector.push_back(
std::tuple<LazyLoadedImage *, QString>(
std::tuple<messages::LazyLoadedImage *,
QString>(
NULL, text.mid(lastSlice, i - lastSlice)));
}
vector.push_back(std::tuple<LazyLoadedImage *, QString>(
imageCache.getOrAdd(url,
[&url] {
return new LazyLoadedImage(
url, 0.35);
}),
QString()));
vector.push_back(
std::tuple<messages::LazyLoadedImage *, QString>(
imageCache.getOrAdd(
url,
[&url] {
return new messages::LazyLoadedImage(
url, 0.35);
}),
QString()));
i += j - 1;
@@ -66,8 +72,8 @@ Emojis::parseEmojis(std::vector<std::tuple<LazyLoadedImage *, QString>> &vector,
}
if (lastSlice < text.length()) {
vector.push_back(
std::tuple<LazyLoadedImage *, QString>(NULL, text.mid(lastSlice)));
vector.push_back(std::tuple<messages::LazyLoadedImage *, QString>(
NULL, text.mid(lastSlice)));
}
}
@@ -121,3 +127,4 @@ Emojis::loadEmojis()
QMap<QString, QString>{{emoji.second.value, emoji.second.code}});
}
}
}