Massage includes some more (#4294)

* Add `<functional>` include to QStringHash.hpp

This ensures the base `std::hash` template is declared before this
specialization

* Add missing includes to `src/providers/twitch/TwitchAccountManager.hpp`

* Move explicit HelixChatters constructor to the source file

* Remove unused includes & add used includes to NicknamesModel.hpp

* NicknamesModel.hpp: Remove `virtual` when `override` is used

* Add missing QStringHash include to TwitchEmotes.cpp

* Add missing includes to various files

* Print Qt version in cmake step

Technically unrelated, but I'm sneaking it in

* Add changelog entry
This commit is contained in:
pajlada
2023-01-08 13:07:06 +01:00
committed by GitHub
parent c0f0a7e555
commit 18cb4bd6e5
18 changed files with 43 additions and 22 deletions
+1
View File
@@ -4,6 +4,7 @@
#include <memory>
#include <unordered_map>
#include <vector>
namespace chatterino {
+1
View File
@@ -5,6 +5,7 @@
#include <boost/variant.hpp>
#include <QMap>
#include <QRegularExpression>
#include <QVector>
#include <map>
#include <set>
@@ -1,8 +1,11 @@
#include "providers/seventv/eventapi/SeventvEventAPISubscription.hpp"
#include <QDebug>
#include <QJsonDocument>
#include <QJsonObject>
#include <tuple>
namespace {
using namespace chatterino;
@@ -2,10 +2,13 @@
#include "common/ChatterinoSetting.hpp"
#include "common/SignalVector.hpp"
#include "util/QStringHash.hpp"
#include "util/RapidJsonSerializeQString.hpp"
#include <boost/signals2.hpp>
#include <QString>
#include <memory>
#include <mutex>
#include <vector>
+2
View File
@@ -3,6 +3,8 @@
#include <QColor>
#include <QString>
#include <vector>
namespace chatterino {
#ifndef ATTR_UNUSED
+2
View File
@@ -1,7 +1,9 @@
#include "providers/twitch/TwitchEmotes.hpp"
#include "common/QLogging.hpp"
#include "messages/Emote.hpp"
#include "messages/Image.hpp"
#include "util/QStringHash.hpp"
namespace chatterino {
+13
View File
@@ -22,6 +22,19 @@ namespace chatterino {
static IHelix *instance = nullptr;
HelixChatters::HelixChatters(const QJsonObject &jsonObject)
: total(jsonObject.value("total").toInt())
, cursor(
jsonObject.value("pagination").toObject().value("cursor").toString())
{
const auto &data = jsonObject.value("data").toArray();
for (const auto &chatter : data)
{
auto userLogin = chatter.toObject().value("user_login").toString();
this->chatters.insert(userLogin);
}
}
void Helix::fetchUsers(QStringList userIds, QStringList userLogins,
ResultCallback<std::vector<HelixUser>> successCallback,
HelixFailureCallback failureCallback)
+1 -14
View File
@@ -357,20 +357,7 @@ struct HelixChatters {
HelixChatters() = default;
explicit HelixChatters(const QJsonObject &jsonObject)
: total(jsonObject.value("total").toInt())
, cursor(jsonObject.value("pagination")
.toObject()
.value("cursor")
.toString())
{
const auto &data = jsonObject.value("data").toArray();
for (const auto &chatter : data)
{
auto userLogin = chatter.toObject().value("user_login").toString();
this->chatters.insert(userLogin);
}
}
explicit HelixChatters(const QJsonObject &jsonObject);
};
using HelixModerator = HelixVip;