chatterino2
Code Issues

Sort and force grouping of includes (#4172)

Browse Source 
This change enforces strict include grouping using IncludeCategories

In addition to adding this to the .clang-format file and applying it in the tests/src and src directories, I also did the following small changes:

    In ChatterSet.hpp, I changed lrucache to a <>include
    In Irc2.hpp, I change common/SignalVector.hpp to a "project-include"
    In AttachedWindow.cpp, NativeMessaging.cpp, WindowsHelper.hpp, BaseWindow.cpp, and StreamerMode.cpp, I disabled clang-format for the windows-includes
    In WindowDescriptors.hpp, I added the missing vector include. It was previously not needed because the include was handled by another file that was previously included first.
    clang-format minimum version has been bumped, so Ubuntu version used in the check-formatting job has been bumped to 22.04 (which is the latest LTS)
This commit is contained in:
pajlada
2022-11-27 19:32:53 +01:00
committed by GitHub
parent f2b35fb7dc
commit 032f290767
247 changed files with 658 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/providers/twitch/ChannelPointReward.cpp
+1
View File
@@ -1,4 +1,5 @@
#include "ChannelPointReward.hpp"
#include "common/QLogging.hpp"
namespace chatterino {
src/providers/twitch/ChatterinoWebSocketppLogger.hpp
+4 -2
View File
@@ -28,11 +28,13 @@
#ifndef CHATTERINOWEBSOCKETPPLOGGER_HPP
#define CHATTERINOWEBSOCKETPPLOGGER_HPP
#include <string>
#include "common/QLogging.hpp"
#include <websocketpp/common/cpp11.hpp>
#include <websocketpp/logger/basic.hpp>
#include <websocketpp/logger/levels.hpp>
#include "common/QLogging.hpp"
#include <string>
namespace websocketpp {
namespace log {
src/providers/twitch/IrcMessageHandler.hpp
+2 -1
View File
@@ -1,11 +1,12 @@
#pragma once
#include <IrcMessage>
#include "common/Channel.hpp"
#include "messages/Message.hpp"
#include "providers/twitch/TwitchChannel.hpp"
#include "providers/twitch/TwitchMessageBuilder.hpp"
#include <IrcMessage>
#include <vector>
namespace chatterino {
src/providers/twitch/PubSubClient.hpp
+1 -1
View File
@@ -4,8 +4,8 @@
#include "providers/twitch/PubSubMessages.hpp"
#include "providers/twitch/PubSubWebsocket.hpp"
#include <QString>
#include <pajlada/signals/signal.hpp>
#include <QString>
#include <atomic>
#include <vector>
src/providers/twitch/PubSubHelpers.hpp
+6 -4
View File
@@ -1,12 +1,14 @@
#pragma once
#include <QJsonObject>
#include <boost/asio.hpp>
#include <boost/asio/steady_timer.hpp>
#include <memory>
#include "common/QLogging.hpp"
#include "util/RapidjsonHelpers.hpp"
#include <boost/asio.hpp>
#include <boost/asio/steady_timer.hpp>
#include <QJsonObject>
#include <memory>
namespace chatterino {
class TwitchAccount;
src/providers/twitch/PubSubManager.hpp
+1 -1
View File
@@ -9,9 +9,9 @@
#include "providers/twitch/TwitchAccount.hpp"
#include "util/ExponentialBackoff.hpp"
#include <pajlada/signals/signal.hpp>
#include <QJsonObject>
#include <QString>
#include <pajlada/signals/signal.hpp>
#include <websocketpp/client.hpp>
#include <atomic>
src/providers/twitch/TwitchAccount.cpp
+4 -4
View File
@@ -1,7 +1,5 @@
#include "providers/twitch/TwitchAccount.hpp"
#include <QThread>
#include "Application.hpp"
#include "common/Channel.hpp"
#include "common/Env.hpp"
@@ -11,16 +9,18 @@
#include "controllers/accounts/AccountController.hpp"
#include "messages/Message.hpp"
#include "messages/MessageBuilder.hpp"
#include "providers/IvrApi.hpp"
#include "providers/irc/IrcMessageBuilder.hpp"
#include "providers/IvrApi.hpp"
#include "providers/twitch/api/Helix.hpp"
#include "providers/twitch/TwitchCommon.hpp"
#include "providers/twitch/TwitchUser.hpp"
#include "providers/twitch/api/Helix.hpp"
#include "singletons/Emotes.hpp"
#include "util/Helpers.hpp"
#include "util/QStringHash.hpp"
#include "util/RapidjsonHelpers.hpp"
#include <QThread>
namespace chatterino {
TwitchAccount::TwitchAccount(const QString &username, const QString &oauthToken,
src/providers/twitch/TwitchAccount.hpp
+1 -1
View File
@@ -9,10 +9,10 @@
#include "providers/twitch/TwitchUser.hpp"
#include "util/QStringHash.hpp"
#include <rapidjson/document.h>
#include <QColor>
#include <QElapsedTimer>
#include <QString>
#include <rapidjson/document.h>
#include <functional>
#include <mutex>
src/providers/twitch/TwitchAccountManager.cpp
+1 -1
View File
@@ -2,9 +2,9 @@
#include "common/Common.hpp"
#include "common/QLogging.hpp"
#include "providers/twitch/api/Helix.hpp"
#include "providers/twitch/TwitchAccount.hpp"
#include "providers/twitch/TwitchCommon.hpp"
#include "providers/twitch/api/Helix.hpp"
namespace chatterino {
src/providers/twitch/TwitchBadges.cpp
+5 -5
View File
@@ -1,5 +1,10 @@
#include "TwitchBadges.hpp"
#include "common/NetworkRequest.hpp"
#include "common/Outcome.hpp"
#include "common/QLogging.hpp"
#include "messages/Emote.hpp"
#include <QBuffer>
#include <QIcon>
#include <QImageReader>
@@ -9,11 +14,6 @@
#include <QThread>
#include <QUrlQuery>
#include "common/NetworkRequest.hpp"
#include "common/Outcome.hpp"
#include "common/QLogging.hpp"
#include "messages/Emote.hpp"
namespace chatterino {
TwitchBadges::TwitchBadges()
src/providers/twitch/TwitchBadges.hpp
+5 -6
View File
@@ -1,20 +1,19 @@
#pragma once
#include <QMap>
#include <QString>
#include <boost/optional.hpp>
#include <unordered_map>
#include "common/UniqueAccess.hpp"
#include "messages/Image.hpp"
#include "util/DisplayBadge.hpp"
#include "util/QStringHash.hpp"
#include "pajlada/signals/signal.hpp"
#include <boost/optional.hpp>
#include <pajlada/signals/signal.hpp>
#include <QMap>
#include <QString>
#include <memory>
#include <queue>
#include <shared_mutex>
#include <unordered_map>
namespace chatterino {
src/providers/twitch/TwitchChannel.cpp
+3 -3
View File
@@ -7,17 +7,17 @@
#include "controllers/accounts/AccountController.hpp"
#include "controllers/notifications/NotificationController.hpp"
#include "messages/Message.hpp"
#include "providers/RecentMessagesApi.hpp"
#include "providers/bttv/BttvEmotes.hpp"
#include "providers/bttv/LoadBttvChannelEmote.hpp"
#include "providers/RecentMessagesApi.hpp"
#include "providers/seventv/SeventvEmotes.hpp"
#include "providers/seventv/SeventvEventAPI.hpp"
#include "providers/twitch/api/Helix.hpp"
#include "providers/twitch/IrcMessageHandler.hpp"
#include "providers/twitch/PubSubManager.hpp"
#include "providers/twitch/TwitchCommon.hpp"
#include "providers/twitch/TwitchIrcServer.hpp"
#include "providers/twitch/TwitchMessageBuilder.hpp"
#include "providers/twitch/api/Helix.hpp"
#include "singletons/Emotes.hpp"
#include "singletons/Settings.hpp"
#include "singletons/Toasts.hpp"
@@ -26,13 +26,13 @@
#include "util/QStringHash.hpp"
#include "widgets/Window.hpp"
#include <rapidjson/document.h>
#include <IrcConnection>
#include <QJsonArray>
#include <QJsonObject>
#include <QJsonValue>
#include <QThread>
#include <QTimer>
#include <rapidjson/document.h>
namespace chatterino {
namespace {
src/providers/twitch/TwitchChannel.hpp
+4 -4
View File
@@ -10,17 +10,17 @@
#include "common/UniqueAccess.hpp"
#include "messages/MessageThread.hpp"
#include "providers/seventv/eventapi/SeventvEventAPIDispatch.hpp"
#include "providers/twitch/api/Helix.hpp"
#include "providers/twitch/ChannelPointReward.hpp"
#include "providers/twitch/TwitchEmotes.hpp"
#include "providers/twitch/api/Helix.hpp"
#include "util/QStringHash.hpp"
#include <QColor>
#include <QElapsedTimer>
#include <QRegularExpression>
#include <boost/optional.hpp>
#include <boost/signals2.hpp>
#include <pajlada/signals/signalholder.hpp>
#include <QColor>
#include <QElapsedTimer>
#include <QRegularExpression>
#include <atomic>
#include <mutex>
src/providers/twitch/TwitchEmotes.hpp
+5 -5
View File
@@ -1,14 +1,14 @@
#pragma once
#include <QColor>
#include <QRegularExpression>
#include <QString>
#include <unordered_map>
#include "common/Aliases.hpp"
#include "common/UniqueAccess.hpp"
#include <QColor>
#include <QRegularExpression>
#include <QString>
#include <memory>
#include <unordered_map>
// NB: "default" can be replaced with "static" to always get a non-animated
// variant
src/providers/twitch/TwitchHelpers.cpp
+1
View File
@@ -1,4 +1,5 @@
#include "providers/twitch/TwitchHelpers.hpp"
#include "common/QLogging.hpp"
namespace chatterino {
src/providers/twitch/TwitchIrcServer.cpp
+3 -3
View File
@@ -1,8 +1,5 @@
#include "TwitchIrcServer.hpp"
#include <IrcCommand>
#include <cassert>
#include "Application.hpp"
#include "common/Common.hpp"
#include "common/Env.hpp"
@@ -20,8 +17,11 @@
#include "util/Helpers.hpp"
#include "util/PostToThread.hpp"
#include <IrcCommand>
#include <QMetaEnum>
#include <cassert>
// using namespace Communi;
using namespace std::chrono_literals;
src/providers/twitch/TwitchMessageBuilder.cpp
+2 -2
View File
@@ -1,6 +1,7 @@
#include "providers/twitch/TwitchMessageBuilder.hpp"
#include "Application.hpp"
#include "common/QLogging.hpp"
#include "controllers/accounts/AccountController.hpp"
#include "controllers/ignores/IgnoreController.hpp"
#include "controllers/ignores/IgnorePhrase.hpp"
@@ -23,13 +24,12 @@
#include "util/Qt.hpp"
#include "widgets/Window.hpp"
#include <boost/variant.hpp>
#include <QApplication>
#include <QColor>
#include <QDebug>
#include <QMediaPlayer>
#include <QStringRef>
#include <boost/variant.hpp>
#include "common/QLogging.hpp"
namespace {
src/providers/twitch/TwitchMessageBuilder.hpp
+1 -1
View File
@@ -4,10 +4,10 @@
#include "common/Outcome.hpp"
#include "messages/MessageThread.hpp"
#include "messages/SharedMessageBuilder.hpp"
#include "providers/twitch/api/Helix.hpp"
#include "providers/twitch/ChannelPointReward.hpp"
#include "providers/twitch/PubSubActions.hpp"
#include "providers/twitch/TwitchBadge.hpp"
#include "providers/twitch/api/Helix.hpp"
#include <IrcMessage>
#include <QString>
src/providers/twitch/TwitchUser.hpp
+2 -2
View File
@@ -3,9 +3,9 @@
#include "providers/twitch/api/Helix.hpp"
#include "util/RapidjsonHelpers.hpp"
#include <rapidjson/document.h>
#include <QString>
#include <pajlada/serialize.hpp>
#include <QString>
#include <rapidjson/document.h>
#include <cassert>
src/providers/twitch/api/Helix.cpp
+1 -1
View File
@@ -3,8 +3,8 @@
#include "common/Outcome.hpp"
#include "common/QLogging.hpp"
#include <QJsonDocument>
#include <magic_enum.hpp>
#include <QJsonDocument>
namespace {
src/providers/twitch/api/Helix.hpp
+1 -1
View File
@@ -5,12 +5,12 @@
#include "providers/twitch/TwitchEmotes.hpp"
#include "util/QStringHash.hpp"
#include <boost/optional.hpp>
#include <QJsonArray>
#include <QString>
#include <QStringList>
#include <QUrl>
#include <QUrlQuery>
#include <boost/optional.hpp>
#include <functional>
#include <unordered_set>
src/providers/twitch/pubsubmessages/AutoMod.hpp
+1 -2
View File
@@ -1,11 +1,10 @@
#pragma once
#include <magic_enum.hpp>
#include <QColor>
#include <QJsonObject>
#include <QString>
#include <magic_enum.hpp>
namespace chatterino {
struct PubSubAutoModQueueMessage {
src/providers/twitch/pubsubmessages/Base.hpp
+2 -4
View File
@@ -1,13 +1,11 @@
#pragma once
#include <boost/optional.hpp>
#include <magic_enum.hpp>
#include <QJsonDocument>
#include <QJsonObject>
#include <QString>
#include <magic_enum.hpp>
#include <boost/optional.hpp>
namespace chatterino {
struct PubSubMessage {
src/providers/twitch/pubsubmessages/ChannelPoints.hpp
+1 -2
View File
@@ -1,10 +1,9 @@
#pragma once
#include <magic_enum.hpp>
#include <QJsonObject>
#include <QString>
#include <magic_enum.hpp>
namespace chatterino {
struct PubSubCommunityPointsChannelV1Message {
src/providers/twitch/pubsubmessages/ChatModeratorAction.hpp
+1 -2
View File
@@ -1,10 +1,9 @@
#pragma once
#include <magic_enum.hpp>
#include <QJsonObject>
#include <QString>
#include <magic_enum.hpp>
namespace chatterino {
struct PubSubChatModeratorActionMessage {
src/providers/twitch/pubsubmessages/Message.hpp
+1 -2
View File
@@ -2,12 +2,11 @@
#include "common/QLogging.hpp"
#include <boost/optional.hpp>
#include <QJsonDocument>
#include <QJsonObject>
#include <QString>
#include <boost/optional.hpp>
namespace chatterino {
struct PubSubMessageMessage {
src/providers/twitch/pubsubmessages/Whisper.hpp
+1 -2
View File
@@ -1,11 +1,10 @@
#pragma once
#include <magic_enum.hpp>
#include <QColor>
#include <QJsonObject>
#include <QString>
#include <magic_enum.hpp>
namespace chatterino {
struct PubSubWhisperMessage {