noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:fourtf/idontknowcppplsdontjudge

Browse source
This commit is contained in:
Rasmus Karlsson 2017-01-15 17:35:06 +01:00
parent 99bb415ad5 58cdda38c4
commit d924f5bd8d
5 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chatterino.pro
View file

@ -11,6 +11,8 @@ COMMUNI += core model util
win32:LIBS += -LC:/OpenSSL-Win32/lib/openssl.lib
INCLUDEPATH += C:/OpenSSL-Win32/include
CONFIG += c++11
include(lib/libcommuni/src/src.pri)
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets

2
emojis.cpp
View file

@ -20,7 +20,7 @@ ConcurrentMap<QString, LazyLoadedImage *> *Emojis::imageCache =
QString
Emojis::replaceShortCodes(const QString &text)
{
#pragma message WARN("xD")
// TODO: Implement this xD
return text;
}

2
emotes.cpp
View file

@ -42,7 +42,7 @@ Emotes::getTwitchEmoteLink(long id, qreal &scale)
LazyLoadedImage *
Emotes::getCheerImage(long long amount, bool animated)
{
#pragma message WARN("xD")
// TODO: fix this xD
return getCheerBadge(amount);
}

4
ircmanager.cpp
View file

@ -219,7 +219,7 @@ IrcManager::addIgnoredUser(QString const &username)
{
QString errorMessage;
if (!tryAddIgnoredUser(username, errorMessage)) {
#pragma message WARN("Implement IrcManager::addIgnoredUser")
// TODO: Implement IrcManager::addIgnoredUser
}
}
@ -253,6 +253,6 @@ IrcManager::removeIgnoredUser(QString const &username)
{
QString errorMessage;
if (!tryRemoveIgnoredUser(username, errorMessage)) {
#pragma message WARN("TODO: Implement IrcManager::removeIgnoredUser")
// TODO: Implement IrcManager::removeIgnoredUser
}
}

10
message.cpp
View file

@ -105,7 +105,7 @@ Message::Message(const IrcPrivateMessage &ircMessage, const Channel &channel,
Word::BadgeGlobalMod, QString(),
QString("Global Moderator")));
} else if (badge == "moderator/1") {
#pragma message WARN("xD")
// TODO: implement this xD
words.push_back(Word(
Resources::badgeTurbo(), Word::BadgeModerator, QString(),
QString("Channel Moderator"))); // custom badge
@ -183,7 +183,7 @@ Message::Message(const IrcPrivateMessage &ircMessage, const Channel &channel,
userDisplayString, QString()));
// highlights
#pragma message WARN("xD")
// TODO: implement this xD
// bits
QString bits = "";
@ -353,7 +353,7 @@ Message::Message(const IrcPrivateMessage &ircMessage, const Channel &channel,
// bttv / ffz emotes
LazyLoadedImage *bttvEmote;
#pragma message WARN("ignored emotes")
// TODO: Implement this (ignored emotes)
if (Emotes::bttvEmotes().tryGet(string, bttvEmote) ||
channel.bttvChannelEmotes().tryGet(string, bttvEmote) ||
Emotes::ffzEmotes().tryGet(string, bttvEmote) ||
@ -388,7 +388,7 @@ Message::Message(const IrcPrivateMessage &ircMessage, const Channel &channel,
this->m_words = words;
#pragma message WARN("xD")
// TODO: Implement this xD
// if (!isReceivedWhisper &&
// AppSettings.HighlightIgnoredUsers.ContainsKey(Username))
// {
@ -593,6 +593,6 @@ Message::sortTwitchEmotes(const std::pair<long int, LazyLoadedImage *> &a,
QString
Message::matchLink(const QString &string)
{
#pragma message WARN("xD")
// TODO: Implement this xD
return QString();
}