Merge branch '4tf'

This commit is contained in:
fourtf
2018-08-06 18:41:30 +02:00
197 changed files with 3807 additions and 2801 deletions
+4 -2
View File
@@ -17,6 +17,8 @@
#include <QCheckBox>
#include <QDesktopServices>
#include <QLabel>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#define TEXT_FOLLOWERS "Followers: "
#define TEXT_VIEWS "Views: "
@@ -281,7 +283,7 @@ void UserInfoPopup::updateUserData()
auto request = NetworkRequest::twitchRequest(url);
request.setCaller(this);
request.onSuccess([this](auto result) {
request.onSuccess([this](auto result) -> Outcome {
auto obj = result.parseJson();
this->ui_.followerCountLabel->setText(TEXT_FOLLOWERS +
QString::number(obj.value("followers").toInt()));
@@ -292,7 +294,7 @@ void UserInfoPopup::updateUserData()
this->loadAvatar(QUrl(obj.value("logo").toString()));
return true;
return Success;
});
request.execute();