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 https://github.com/fourtf/chatterino2

Browse source
This commit is contained in:
fourtf 2017-04-18 02:30:07 +02:00
parent c2937eb7b3 20b0699025
commit 780286582f
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
twitch/twitchaccount.cpp
View file

@ -5,9 +5,9 @@ namespace twitch {
TwitchUser::TwitchUser(const QString &username, const QString &oauthToken, TwitchUser::TwitchUser(const QString &username, const QString &oauthToken,
const QString &oauthClient) const QString &oauthClient)
: IrcUser2(username, username, username, "oauth:" + oauthToken) : IrcUser2(username, username, username, "oauth:" + oauthToken)
, _oauthClient(oauthClient)
, _oauthToken(oauthToken)
{ {
_oauthClient = oauthClient;
_oauthToken = oauthToken;
} }
const QString &TwitchUser::getOAuthClient() const const QString &TwitchUser::getOAuthClient() const

3
widgets/mainwindow.h
View file

@ -4,7 +4,10 @@
#include "widgets/notebook.h" #include "widgets/notebook.h"
#include "widgets/titlebar.h" #include "widgets/titlebar.h"
#ifdef USEWINSDK
#include <platform/borderless/qwinwidget.h> #include <platform/borderless/qwinwidget.h>
#endif
#include <QMainWindow> #include <QMainWindow>
#include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree.hpp>