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

2.1.5

Browse source
This commit is contained in:
fourtf 2019-09-22 16:59:51 +02:00
parent fc049d8f45
commit 2c25c8a5f5
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/common/Version.cpp
View file

@ -20,7 +20,8 @@ Version::Version()
#ifdef CHATTERINO_NIGHTLY_VERSION_STRING #ifdef CHATTERINO_NIGHTLY_VERSION_STRING
this->dateOfBuild_ = this->dateOfBuild_ =
QString(FROM_EXTERNAL_DEFINE(CHATTERINO_NIGHTLY_VERSION_STRING)) QString(FROM_EXTERNAL_DEFINE(CHATTERINO_NIGHTLY_VERSION_STRING))
.remove('"').split(' ')[0]; .remove('"')
.split(' ')[0];
#endif #endif
// "Full" version string, as displayed in window title // "Full" version string, as displayed in window title

4
src/common/Version.hpp
View file

@ -2,7 +2,7 @@
#include <QtGlobal> #include <QtGlobal>
#define CHATTERINO_VERSION "2.1.4" #define CHATTERINO_VERSION "2.1.5"
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
# define CHATTERINO_OS "win" # define CHATTERINO_OS "win"
@ -35,4 +35,4 @@ private:
QString fullVersion_; QString fullVersion_;
}; };
}; }; // namespace chatterino

6
src/providers/bttv/BttvEmotes.cpp
View file

@ -1,5 +1,8 @@
#include "providers/bttv/BttvEmotes.hpp" #include "providers/bttv/BttvEmotes.hpp"
#include <QJsonArray>
#include <QThread>
#include "common/Common.hpp" #include "common/Common.hpp"
#include "common/NetworkRequest.hpp" #include "common/NetworkRequest.hpp"
#include "debug/Log.hpp" #include "debug/Log.hpp"
@ -8,9 +11,6 @@
#include "messages/ImageSet.hpp" #include "messages/ImageSet.hpp"
#include "providers/twitch/TwitchChannel.hpp" #include "providers/twitch/TwitchChannel.hpp"
#include <QJsonArray>
#include <QThread>
namespace chatterino { namespace chatterino {
namespace { namespace {
Url getEmoteLink(QString urlTemplate, const EmoteId &id, Url getEmoteLink(QString urlTemplate, const EmoteId &id,