From 032f290767eead7289304544bb325a3f28191f1f Mon Sep 17 00:00:00 2001 From: pajlada Date: Sun, 27 Nov 2022 19:32:53 +0100 Subject: [PATCH] Sort and force grouping of includes (#4172) 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) --- .github/workflows/check-formatting.yml | 2 +- src/.clang-format | 23 ++++++++- src/Application.cpp | 6 +-- src/Application.hpp | 7 +-- src/BaseSettings.cpp | 4 +- src/BaseSettings.hpp | 4 +- src/PrecompiledHeader.hpp | 49 ++++++++++--------- src/RunGui.cpp | 17 ++++--- src/common/Aliases.hpp | 1 + src/common/Args.hpp | 5 +- src/common/Atomic.hpp | 1 + src/common/Channel.hpp | 4 +- src/common/ChatterSet.cpp | 3 +- src/common/ChatterSet.hpp | 6 ++- src/common/ChatterinoSetting.hpp | 2 +- src/common/Common.hpp | 15 +++--- src/common/CompletionModel.cpp | 1 + src/common/Credentials.cpp | 2 +- src/common/NetworkCommon.hpp | 4 +- src/common/NetworkPrivate.cpp | 2 +- src/common/NetworkPrivate.hpp | 1 + src/common/NetworkRequest.cpp | 2 +- src/common/NetworkRequest.hpp | 1 + src/common/NetworkResult.cpp | 5 +- src/common/NetworkResult.hpp | 2 +- src/common/SignalVector.hpp | 9 ++-- src/common/SignalVectorModel.hpp | 5 +- src/common/WindowDescriptors.hpp | 1 + .../accounts/AccountController.hpp | 4 +- src/controllers/commands/Command.hpp | 2 +- .../commands/CommandController.cpp | 8 +-- .../commands/CommandController.hpp | 2 +- src/controllers/commands/CommandModel.hpp | 4 +- .../commands/builtin/twitch/ChatSettings.cpp | 2 +- src/controllers/filters/FilterModel.hpp | 4 +- src/controllers/filters/FilterRecord.hpp | 7 ++- src/controllers/filters/parser/Tokenizer.cpp | 1 + .../highlights/BadgeHighlightModel.hpp | 4 +- src/controllers/highlights/HighlightBadge.hpp | 4 +- .../highlights/HighlightBlacklistModel.hpp | 4 +- .../highlights/HighlightBlacklistUser.hpp | 4 +- .../highlights/HighlightController.hpp | 2 +- src/controllers/highlights/HighlightModel.hpp | 4 +- .../highlights/HighlightPhrase.hpp | 4 +- .../highlights/UserHighlightModel.hpp | 4 +- src/controllers/ignores/IgnoreModel.hpp | 4 +- src/controllers/ignores/IgnorePhrase.hpp | 5 +- .../moderationactions/ModerationAction.cpp | 3 +- .../moderationactions/ModerationAction.hpp | 6 +-- .../ModerationActionModel.hpp | 4 +- src/controllers/nicknames/Nickname.hpp | 4 +- src/controllers/nicknames/NicknamesModel.hpp | 4 +- .../notifications/NotificationController.cpp | 3 +- .../notifications/NotificationModel.hpp | 4 +- src/controllers/pings/MutedChannelModel.hpp | 4 +- src/controllers/userdata/UserData.hpp | 6 +-- .../userdata/UserDataController.hpp | 6 +-- src/debug/AssertInGuiThread.hpp | 1 + src/debug/Benchmark.cpp | 1 + src/debug/Benchmark.hpp | 2 +- src/main.cpp | 15 +++--- src/messages/Emote.hpp | 1 + src/messages/Image.cpp | 25 +++++----- src/messages/Image.hpp | 15 +++--- src/messages/Message.hpp | 3 +- src/messages/MessageBuilder.hpp | 1 + src/messages/MessageElement.hpp | 5 +- src/messages/SharedMessageBuilder.hpp | 3 +- src/messages/layouts/MessageLayout.cpp | 4 +- src/messages/layouts/MessageLayout.hpp | 3 +- .../layouts/MessageLayoutContainer.cpp | 2 +- .../layouts/MessageLayoutContainer.hpp | 13 ++--- src/messages/layouts/MessageLayoutElement.hpp | 4 +- src/messages/search/RegexPredicate.hpp | 2 +- src/providers/LinkResolver.hpp | 7 +-- src/providers/bttv/BttvEmotes.cpp | 6 +-- src/providers/bttv/BttvEmotes.hpp | 3 +- src/providers/bttv/LoadBttvChannelEmote.cpp | 9 ++-- src/providers/chatterino/ChatterinoBadges.cpp | 7 +-- src/providers/chatterino/ChatterinoBadges.hpp | 6 ++- src/providers/colors/ColorProvider.hpp | 4 +- src/providers/emoji/Emojis.cpp | 7 +-- src/providers/emoji/Emojis.hpp | 3 +- src/providers/ffz/FfzBadges.cpp | 8 +-- src/providers/ffz/FfzBadges.hpp | 2 +- src/providers/ffz/FfzEmotes.cpp | 4 +- src/providers/ffz/FfzEmotes.hpp | 3 +- src/providers/irc/AbstractIrcServer.hpp | 13 ++--- src/providers/irc/Irc2.cpp | 2 +- src/providers/irc/Irc2.hpp | 6 +-- src/providers/irc/IrcCommands.hpp | 3 +- src/providers/irc/IrcConnection2.hpp | 3 +- src/providers/irc/IrcServer.cpp | 6 +-- .../liveupdates/BasicPubSubClient.hpp | 11 +++-- .../liveupdates/BasicPubSubManager.hpp | 2 +- src/providers/seventv/SeventvEmotes.cpp | 1 + src/providers/seventv/SeventvEventAPI.cpp | 1 + .../eventapi/SeventvEventAPIClient.cpp | 4 +- .../eventapi/SeventvEventAPIDispatch.cpp | 4 +- .../eventapi/SeventvEventAPIMessage.hpp | 1 - .../eventapi/SeventvEventAPISubscription.hpp | 1 - src/providers/twitch/ChannelPointReward.cpp | 1 + .../twitch/ChatterinoWebSocketppLogger.hpp | 6 ++- src/providers/twitch/IrcMessageHandler.hpp | 3 +- src/providers/twitch/PubSubClient.hpp | 2 +- src/providers/twitch/PubSubHelpers.hpp | 10 ++-- src/providers/twitch/PubSubManager.hpp | 2 +- src/providers/twitch/TwitchAccount.cpp | 8 +-- src/providers/twitch/TwitchAccount.hpp | 2 +- src/providers/twitch/TwitchAccountManager.cpp | 2 +- src/providers/twitch/TwitchBadges.cpp | 10 ++-- src/providers/twitch/TwitchBadges.hpp | 11 ++--- src/providers/twitch/TwitchChannel.cpp | 6 +-- src/providers/twitch/TwitchChannel.hpp | 8 +-- src/providers/twitch/TwitchEmotes.hpp | 10 ++-- src/providers/twitch/TwitchHelpers.cpp | 1 + src/providers/twitch/TwitchIrcServer.cpp | 6 +-- src/providers/twitch/TwitchMessageBuilder.cpp | 4 +- src/providers/twitch/TwitchMessageBuilder.hpp | 2 +- src/providers/twitch/TwitchUser.hpp | 4 +- src/providers/twitch/api/Helix.cpp | 2 +- src/providers/twitch/api/Helix.hpp | 2 +- .../twitch/pubsubmessages/AutoMod.hpp | 3 +- src/providers/twitch/pubsubmessages/Base.hpp | 6 +-- .../twitch/pubsubmessages/ChannelPoints.hpp | 3 +- .../pubsubmessages/ChatModeratorAction.hpp | 3 +- .../twitch/pubsubmessages/Message.hpp | 3 +- .../twitch/pubsubmessages/Whisper.hpp | 3 +- src/singletons/Badges.hpp | 3 +- src/singletons/Emotes.hpp | 1 - src/singletons/Fonts.hpp | 4 +- src/singletons/Logging.cpp | 2 +- src/singletons/Logging.hpp | 1 - src/singletons/NativeMessaging.cpp | 8 +-- src/singletons/NativeMessaging.hpp | 4 +- src/singletons/Paths.cpp | 6 +-- src/singletons/Paths.hpp | 2 +- src/singletons/Settings.hpp | 6 +-- src/singletons/Theme.hpp | 2 +- src/singletons/Toasts.cpp | 2 +- src/singletons/Updates.cpp | 4 +- src/singletons/Updates.hpp | 2 +- src/singletons/WindowManager.cpp | 30 ++++++------ src/singletons/WindowManager.hpp | 4 +- src/singletons/helper/GifTimer.hpp | 2 +- src/singletons/helper/LoggingChannel.hpp | 2 +- src/util/Clipboard.cpp | 2 +- src/util/DebugCount.hpp | 6 +-- src/util/FunctionEventFilter.hpp | 1 + src/util/LayoutHelper.hpp | 2 +- src/util/NuulsUploader.cpp | 2 +- src/util/PersistSignalVector.hpp | 3 +- src/util/QObjectRef.hpp | 1 + src/util/RapidJsonSerializeQString.hpp | 2 +- src/util/RapidjsonHelpers.hpp | 2 +- src/util/StreamLink.cpp | 6 +-- src/util/StreamerMode.cpp | 6 ++- src/util/WindowsHelper.hpp | 2 + src/util/serialize/Container.hpp | 2 +- src/widgets/AccountSwitchPopup.cpp | 1 + src/widgets/AttachedWindow.cpp | 5 +- src/widgets/AttachedWindow.hpp | 1 + src/widgets/BaseWidget.cpp | 1 + src/widgets/BaseWidget.hpp | 4 +- src/widgets/BaseWindow.cpp | 5 +- src/widgets/BaseWindow.hpp | 5 +- src/widgets/FramelessEmbedWindow.cpp | 5 +- src/widgets/Notebook.cpp | 4 +- src/widgets/Notebook.hpp | 2 +- src/widgets/Scrollbar.hpp | 2 +- src/widgets/TooltipWidget.hpp | 2 +- src/widgets/Window.cpp | 7 +-- src/widgets/dialogs/BadgePickerDialog.cpp | 4 +- src/widgets/dialogs/BadgePickerDialog.hpp | 3 +- src/widgets/dialogs/ColorPickerDialog.hpp | 3 +- src/widgets/dialogs/EmotePopup.cpp | 4 +- src/widgets/dialogs/EmotePopup.hpp | 1 - src/widgets/dialogs/IrcConnectionEditor.cpp | 1 + src/widgets/dialogs/IrcConnectionEditor.hpp | 3 +- src/widgets/dialogs/LastRunCrashDialog.cpp | 8 +-- src/widgets/dialogs/LastRunCrashDialog.hpp | 2 +- src/widgets/dialogs/LoginDialog.cpp | 2 +- src/widgets/dialogs/LoginDialog.hpp | 2 +- src/widgets/dialogs/NotificationPopup.cpp | 1 - src/widgets/dialogs/QualityPopup.cpp | 1 + src/widgets/dialogs/ReplyThreadPopup.cpp | 2 +- src/widgets/dialogs/SelectChannelDialog.cpp | 14 +++--- src/widgets/dialogs/SelectChannelDialog.hpp | 4 +- src/widgets/dialogs/SettingsDialog.hpp | 8 +-- src/widgets/dialogs/UserInfoPopup.cpp | 8 +-- src/widgets/dialogs/switcher/NewPopupItem.cpp | 4 +- src/widgets/dialogs/switcher/NewTabItem.cpp | 4 +- .../dialogs/switcher/QuickSwitcherModel.hpp | 3 +- .../dialogs/switcher/QuickSwitcherPopup.cpp | 4 +- .../dialogs/switcher/QuickSwitcherPopup.hpp | 4 +- .../dialogs/switcher/SwitchSplitItem.hpp | 7 ++- src/widgets/helper/Button.cpp | 6 +-- src/widgets/helper/Button.hpp | 3 +- src/widgets/helper/ChannelView.cpp | 45 ++++++++--------- src/widgets/helper/ChannelView.hpp | 21 ++++---- src/widgets/helper/EditableModelView.cpp | 4 +- src/widgets/helper/EditableModelView.hpp | 3 +- src/widgets/helper/EffectLabel.hpp | 2 +- src/widgets/helper/NotebookButton.cpp | 6 +-- src/widgets/helper/NotebookTab.cpp | 6 +-- src/widgets/helper/NotebookTab.hpp | 6 +-- src/widgets/helper/QColorPicker.cpp | 3 +- src/widgets/helper/ResizingTextEdit.hpp | 2 +- src/widgets/helper/ScrollbarHighlight.hpp | 4 +- src/widgets/helper/SearchPopup.cpp | 8 +-- src/widgets/helper/SearchPopup.hpp | 2 +- src/widgets/helper/SettingsDialogTab.cpp | 1 + src/widgets/helper/SettingsDialogTab.hpp | 1 + src/widgets/helper/TitlebarButton.cpp | 4 +- src/widgets/listview/GenericListModel.hpp | 1 + src/widgets/settingspages/AccountsPage.cpp | 1 + src/widgets/settingspages/CommandPage.cpp | 14 +++--- src/widgets/settingspages/CommandPage.hpp | 4 +- src/widgets/settingspages/FiltersPage.cpp | 5 +- src/widgets/settingspages/GeneralPageView.hpp | 6 +-- .../settingspages/HighlightingPage.cpp | 2 +- src/widgets/settingspages/ModerationPage.cpp | 2 +- src/widgets/settingspages/ModerationPage.hpp | 4 +- src/widgets/settingspages/NicknamesPage.cpp | 5 +- src/widgets/settingspages/SettingsPage.hpp | 11 ++--- src/widgets/splits/ClosedSplits.hpp | 1 + src/widgets/splits/InputCompletionItem.hpp | 3 +- src/widgets/splits/InputCompletionPopup.hpp | 3 +- src/widgets/splits/Split.cpp | 8 +-- src/widgets/splits/Split.hpp | 2 +- src/widgets/splits/SplitContainer.cpp | 7 +-- src/widgets/splits/SplitContainer.hpp | 4 +- src/widgets/splits/SplitHeader.cpp | 5 +- src/widgets/splits/SplitHeader.hpp | 6 +-- src/widgets/splits/SplitInput.cpp | 8 +-- src/widgets/splits/SplitInput.hpp | 1 + src/widgets/splits/SplitOverlay.cpp | 12 ++--- src/widgets/splits/SplitOverlay.hpp | 6 +-- tests/.clang-format | 23 ++++++++- tests/src/HighlightController.cpp | 4 +- tests/src/LimitedQueue.cpp | 1 + tests/src/NetworkRequest.cpp | 5 +- tests/src/SeventvEventAPI.cpp | 2 +- tests/src/TwitchMessageBuilder.cpp | 4 +- tests/src/TwitchPubSubClient.cpp | 3 +- tests/src/main.cpp | 18 +++---- tools/clang-format-all.sh | 2 +- 247 files changed, 658 insertions(+), 566 deletions(-) diff --git a/.github/workflows/check-formatting.yml b/.github/workflows/check-formatting.yml index 67cfa762..19b54c6e 100644 --- a/.github/workflows/check-formatting.yml +++ b/.github/workflows/check-formatting.yml @@ -13,7 +13,7 @@ concurrency: jobs: check: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 diff --git a/src/.clang-format b/src/.clang-format index f34c1465..49f126a1 100644 --- a/src/.clang-format +++ b/src/.clang-format @@ -27,7 +27,28 @@ IndentCaseLabels: true IndentWidth: 4 IndentWrappedFunctionNames: true IndentPPDirectives: AfterHash -IncludeBlocks: Preserve +SortIncludes: CaseInsensitive +IncludeBlocks: Regroup +IncludeCategories: +# Project includes + - Regex: '^"[a-zA-Z\._-]+(/[a-zA-Z0-9\._-]+)*"$' + Priority: 1 +# Third party library includes + - Regex: '<[[:alnum:].]+/[a-zA-Z0-9\._\/-]+>' + Priority: 3 +# Qt includes + - Regex: '^$' + Priority: 3 + CaseSensitive: true +# LibCommuni includes + - Regex: '^$' + Priority: 3 +# Misc libraries + - Regex: '^<[a-zA-Z_0-9]+\.h(pp)?>$' + Priority: 3 +# Standard library includes + - Regex: '^<[a-zA-Z_]+>$' + Priority: 4 NamespaceIndentation: Inner PointerBindsToType: false SpacesBeforeTrailingComments: 2 diff --git a/src/Application.cpp b/src/Application.cpp index e50bfc4c..7e6dc2b6 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -1,7 +1,5 @@ #include "Application.hpp" -#include - #include "common/Args.hpp" #include "common/QLogging.hpp" #include "common/Version.hpp" @@ -40,11 +38,13 @@ #include "util/PostToThread.hpp" #include "util/RapidjsonHelpers.hpp" #include "widgets/Notebook.hpp" -#include "widgets/Window.hpp" #include "widgets/splits/Split.hpp" +#include "widgets/Window.hpp" #include +#include + namespace chatterino { static std::atomic isAppInitialized{false}; diff --git a/src/Application.hpp b/src/Application.hpp index 68c8bc59..6f6bc995 100644 --- a/src/Application.hpp +++ b/src/Application.hpp @@ -1,12 +1,13 @@ #pragma once -#include -#include - #include "common/SignalVector.hpp" #include "common/Singleton.hpp" #include "singletons/NativeMessaging.hpp" +#include + +#include + namespace chatterino { class TwitchIrcServer; diff --git a/src/BaseSettings.cpp b/src/BaseSettings.cpp index 141d6699..441ed08b 100644 --- a/src/BaseSettings.cpp +++ b/src/BaseSettings.cpp @@ -1,9 +1,9 @@ #include "BaseSettings.hpp" -#include - #include "util/Clamp.hpp" +#include + namespace chatterino { std::vector> _settings; diff --git a/src/BaseSettings.hpp b/src/BaseSettings.hpp index a747b67c..f70fa29c 100644 --- a/src/BaseSettings.hpp +++ b/src/BaseSettings.hpp @@ -3,9 +3,9 @@ #include "common/ChatterinoSetting.hpp" -#include -#include #include +#include +#include #include diff --git a/src/PrecompiledHeader.hpp b/src/PrecompiledHeader.hpp index fea276d0..b49cb431 100644 --- a/src/PrecompiledHeader.hpp +++ b/src/PrecompiledHeader.hpp @@ -1,10 +1,16 @@ #ifdef __cplusplus -# include -# include -# include -# include -# include +# include +# include +# include +# include +# include +# include # include +# include +# include +# include +# include +# include # include # include # include @@ -69,9 +75,9 @@ # include # include # include -# include # include # include +# include # include # include # include @@ -93,20 +99,13 @@ # include # include # include +# include # include +# include # include # include # include # include -# include -# include -# include -# include -# include -# include -# include -# include -# include # include # include # include @@ -120,11 +119,18 @@ # include # include # include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include + # include -# include -# include -# include -# include # include # include # include @@ -138,11 +144,6 @@ # include # include # include -# include -# include -# include -# include -# include # include # include # include diff --git a/src/RunGui.cpp b/src/RunGui.cpp index 5c4ea9f2..f5d64087 100644 --- a/src/RunGui.cpp +++ b/src/RunGui.cpp @@ -1,13 +1,5 @@ #include "RunGui.hpp" -#include -#include -#include -#include -#include -#include -#include - #include "Application.hpp" #include "common/Args.hpp" #include "common/Modes.hpp" @@ -20,6 +12,15 @@ #include "util/CombinePath.hpp" #include "widgets/dialogs/LastRunCrashDialog.hpp" +#include +#include +#include +#include +#include +#include + +#include + #ifdef USEWINSDK # include "util/WindowsHelper.hpp" #endif diff --git a/src/common/Aliases.hpp b/src/common/Aliases.hpp index 36fbc94f..847d807a 100644 --- a/src/common/Aliases.hpp +++ b/src/common/Aliases.hpp @@ -2,6 +2,7 @@ #include #include + #include #define QStringAlias(name) \ diff --git a/src/common/Args.hpp b/src/common/Args.hpp index 4087b336..386f6f50 100644 --- a/src/common/Args.hpp +++ b/src/common/Args.hpp @@ -1,9 +1,10 @@ #pragma once -#include -#include #include "common/WindowDescriptors.hpp" +#include +#include + namespace chatterino { /// Command line arguments passed to Chatterino. diff --git a/src/common/Atomic.hpp b/src/common/Atomic.hpp index 86603c08..4ea3e8ae 100644 --- a/src/common/Atomic.hpp +++ b/src/common/Atomic.hpp @@ -1,6 +1,7 @@ #pragma once #include + #include namespace chatterino { diff --git a/src/common/Channel.hpp b/src/common/Channel.hpp index ef8437ea..3c2a8201 100644 --- a/src/common/Channel.hpp +++ b/src/common/Channel.hpp @@ -4,11 +4,11 @@ #include "common/FlagsEnum.hpp" #include "messages/LimitedQueue.hpp" +#include +#include #include #include #include -#include -#include #include diff --git a/src/common/ChatterSet.cpp b/src/common/ChatterSet.cpp index b11b1dc7..46875b45 100644 --- a/src/common/ChatterSet.cpp +++ b/src/common/ChatterSet.cpp @@ -1,8 +1,9 @@ #include "common/ChatterSet.hpp" -#include #include "debug/Benchmark.hpp" +#include + namespace chatterino { ChatterSet::ChatterSet() diff --git a/src/common/ChatterSet.hpp b/src/common/ChatterSet.hpp index bf21c4f0..1d0b2818 100644 --- a/src/common/ChatterSet.hpp +++ b/src/common/ChatterSet.hpp @@ -1,12 +1,14 @@ #pragma once +#include "util/QStringHash.hpp" + +#include #include + #include #include #include #include -#include "lrucache/lrucache.hpp" -#include "util/QStringHash.hpp" namespace chatterino { diff --git a/src/common/ChatterinoSetting.hpp b/src/common/ChatterinoSetting.hpp index 2e48956b..4245626e 100644 --- a/src/common/ChatterinoSetting.hpp +++ b/src/common/ChatterinoSetting.hpp @@ -1,7 +1,7 @@ #pragma once -#include #include +#include namespace chatterino { diff --git a/src/common/Common.hpp b/src/common/Common.hpp index 2284fd0e..6dcfccaf 100644 --- a/src/common/Common.hpp +++ b/src/common/Common.hpp @@ -1,16 +1,17 @@ #pragma once -#include -#include -#include -#include -#include -#include - #include "common/Aliases.hpp" #include "common/Outcome.hpp" #include "common/ProviderId.hpp" +#include +#include +#include +#include + +#include +#include + namespace chatterino { enum class HighlightState { diff --git a/src/common/CompletionModel.cpp b/src/common/CompletionModel.cpp index 7a544b41..3fc3fb9f 100644 --- a/src/common/CompletionModel.cpp +++ b/src/common/CompletionModel.cpp @@ -15,6 +15,7 @@ #include "util/QStringHash.hpp" #include + #include namespace chatterino { diff --git a/src/common/Credentials.cpp b/src/common/Credentials.cpp index 5913e0d0..f3985701 100644 --- a/src/common/Credentials.cpp +++ b/src/common/Credentials.cpp @@ -16,8 +16,8 @@ # include "keychain.h" # endif #endif -#include #include +#include #define FORMAT_NAME \ ([&] { \ diff --git a/src/common/NetworkCommon.hpp b/src/common/NetworkCommon.hpp index cb37cf43..40b034cb 100644 --- a/src/common/NetworkCommon.hpp +++ b/src/common/NetworkCommon.hpp @@ -1,10 +1,10 @@ #pragma once +#include + #include #include -#include - class QNetworkReply; namespace chatterino { diff --git a/src/common/NetworkPrivate.cpp b/src/common/NetworkPrivate.cpp index dcca585e..44cb8710 100644 --- a/src/common/NetworkPrivate.cpp +++ b/src/common/NetworkPrivate.cpp @@ -3,6 +3,7 @@ #include "common/NetworkManager.hpp" #include "common/NetworkResult.hpp" #include "common/Outcome.hpp" +#include "common/QLogging.hpp" #include "debug/AssertInGuiThread.hpp" #include "singletons/Paths.hpp" #include "util/DebugCount.hpp" @@ -12,7 +13,6 @@ #include #include #include -#include "common/QLogging.hpp" namespace chatterino { diff --git a/src/common/NetworkPrivate.hpp b/src/common/NetworkPrivate.hpp index 050207ce..03d4a705 100644 --- a/src/common/NetworkPrivate.hpp +++ b/src/common/NetworkPrivate.hpp @@ -6,6 +6,7 @@ #include #include #include + #include #include diff --git a/src/common/NetworkRequest.cpp b/src/common/NetworkRequest.cpp index 70cfa497..6d66b977 100644 --- a/src/common/NetworkRequest.cpp +++ b/src/common/NetworkRequest.cpp @@ -2,6 +2,7 @@ #include "common/NetworkPrivate.hpp" #include "common/Outcome.hpp" +#include "common/QLogging.hpp" #include "common/Version.hpp" #include "debug/AssertInGuiThread.hpp" #include "providers/twitch/TwitchCommon.hpp" @@ -12,7 +13,6 @@ #include #include #include -#include "common/QLogging.hpp" #include diff --git a/src/common/NetworkRequest.hpp b/src/common/NetworkRequest.hpp index 51ee1e96..3d1140c3 100644 --- a/src/common/NetworkRequest.hpp +++ b/src/common/NetworkRequest.hpp @@ -4,6 +4,7 @@ #include "common/NetworkResult.hpp" #include + #include namespace chatterino { diff --git a/src/common/NetworkResult.cpp b/src/common/NetworkResult.cpp index c2cb45e1..0a5295fd 100644 --- a/src/common/NetworkResult.cpp +++ b/src/common/NetworkResult.cpp @@ -1,9 +1,10 @@ #include "common/NetworkResult.hpp" +#include "common/QLogging.hpp" + +#include #include #include -#include -#include "common/QLogging.hpp" namespace chatterino { diff --git a/src/common/NetworkResult.hpp b/src/common/NetworkResult.hpp index 4edd6ad4..64baed5e 100644 --- a/src/common/NetworkResult.hpp +++ b/src/common/NetworkResult.hpp @@ -1,8 +1,8 @@ #pragma once -#include #include #include +#include namespace chatterino { diff --git a/src/common/SignalVector.hpp b/src/common/SignalVector.hpp index 3eff6680..3de5be89 100644 --- a/src/common/SignalVector.hpp +++ b/src/common/SignalVector.hpp @@ -1,12 +1,13 @@ #pragma once -#include -#include +#include "debug/AssertInGuiThread.hpp" + #include #include -#include +#include +#include -#include "debug/AssertInGuiThread.hpp" +#include namespace chatterino { diff --git a/src/common/SignalVectorModel.hpp b/src/common/SignalVectorModel.hpp index 5054eaff..8a9a8f37 100644 --- a/src/common/SignalVectorModel.hpp +++ b/src/common/SignalVectorModel.hpp @@ -2,12 +2,11 @@ #include "common/SignalVector.hpp" +#include +#include #include #include #include -#include - -#include namespace chatterino { diff --git a/src/common/WindowDescriptors.hpp b/src/common/WindowDescriptors.hpp index 49d00aab..820916c3 100644 --- a/src/common/WindowDescriptors.hpp +++ b/src/common/WindowDescriptors.hpp @@ -8,6 +8,7 @@ #include #include +#include namespace chatterino { diff --git a/src/controllers/accounts/AccountController.hpp b/src/controllers/accounts/AccountController.hpp index e1ef3c70..1cf6ae93 100644 --- a/src/controllers/accounts/AccountController.hpp +++ b/src/controllers/accounts/AccountController.hpp @@ -1,12 +1,12 @@ #pragma once -#include - #include "common/SignalVector.hpp" #include "common/Singleton.hpp" #include "providers/twitch/TwitchAccountManager.hpp" #include "util/SharedPtrElementLess.hpp" +#include + namespace chatterino { class Account; diff --git a/src/controllers/commands/Command.hpp b/src/controllers/commands/Command.hpp index 1b365a23..774be6a6 100644 --- a/src/controllers/commands/Command.hpp +++ b/src/controllers/commands/Command.hpp @@ -2,8 +2,8 @@ #include "util/RapidjsonHelpers.hpp" -#include #include +#include namespace chatterino { diff --git a/src/controllers/commands/CommandController.cpp b/src/controllers/commands/CommandController.cpp index 1ca3c89b..1a439e2c 100644 --- a/src/controllers/commands/CommandController.cpp +++ b/src/controllers/commands/CommandController.cpp @@ -5,19 +5,19 @@ #include "common/QLogging.hpp" #include "common/SignalVector.hpp" #include "controllers/accounts/AccountController.hpp" +#include "controllers/commands/builtin/twitch/ChatSettings.hpp" #include "controllers/commands/Command.hpp" #include "controllers/commands/CommandModel.hpp" -#include "controllers/commands/builtin/twitch/ChatSettings.hpp" #include "controllers/userdata/UserDataController.hpp" #include "messages/Message.hpp" #include "messages/MessageBuilder.hpp" #include "messages/MessageElement.hpp" #include "providers/irc/IrcChannel2.hpp" #include "providers/irc/IrcServer.hpp" +#include "providers/twitch/api/Helix.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/Paths.hpp" #include "singletons/Settings.hpp" @@ -29,14 +29,14 @@ #include "util/Helpers.hpp" #include "util/IncognitoBrowser.hpp" #include "util/Qt.hpp" -#include "util/StreamLink.hpp" #include "util/StreamerMode.hpp" +#include "util/StreamLink.hpp" #include "util/Twitch.hpp" -#include "widgets/Window.hpp" #include "widgets/dialogs/ReplyThreadPopup.hpp" #include "widgets/dialogs/UserInfoPopup.hpp" #include "widgets/splits/Split.hpp" #include "widgets/splits/SplitContainer.hpp" +#include "widgets/Window.hpp" #include #include diff --git a/src/controllers/commands/CommandController.hpp b/src/controllers/commands/CommandController.hpp index 64a05222..f05e6c4e 100644 --- a/src/controllers/commands/CommandController.hpp +++ b/src/controllers/commands/CommandController.hpp @@ -7,8 +7,8 @@ #include "controllers/commands/CommandContext.hpp" #include "providers/twitch/TwitchChannel.hpp" -#include #include +#include #include #include diff --git a/src/controllers/commands/CommandModel.hpp b/src/controllers/commands/CommandModel.hpp index 701a65f3..30bf0f5e 100644 --- a/src/controllers/commands/CommandModel.hpp +++ b/src/controllers/commands/CommandModel.hpp @@ -1,10 +1,10 @@ #pragma once -#include - #include "common/SignalVectorModel.hpp" #include "controllers/commands/Command.hpp" +#include + namespace chatterino { class CommandController; diff --git a/src/controllers/commands/builtin/twitch/ChatSettings.cpp b/src/controllers/commands/builtin/twitch/ChatSettings.cpp index 3c596cf1..ebec21ba 100644 --- a/src/controllers/commands/builtin/twitch/ChatSettings.cpp +++ b/src/controllers/commands/builtin/twitch/ChatSettings.cpp @@ -3,8 +3,8 @@ #include "Application.hpp" #include "controllers/accounts/AccountController.hpp" #include "messages/MessageBuilder.hpp" -#include "providers/twitch/TwitchChannel.hpp" #include "providers/twitch/api/Helix.hpp" +#include "providers/twitch/TwitchChannel.hpp" #include "util/FormatTime.hpp" #include "util/Helpers.hpp" diff --git a/src/controllers/filters/FilterModel.hpp b/src/controllers/filters/FilterModel.hpp index b900ffcc..ffa4a106 100644 --- a/src/controllers/filters/FilterModel.hpp +++ b/src/controllers/filters/FilterModel.hpp @@ -1,10 +1,10 @@ #pragma once -#include - #include "common/SignalVectorModel.hpp" #include "controllers/filters/FilterRecord.hpp" +#include + namespace chatterino { class FilterModel : public SignalVectorModel diff --git a/src/controllers/filters/FilterRecord.hpp b/src/controllers/filters/FilterRecord.hpp index 5f0eb750..e18a1d48 100644 --- a/src/controllers/filters/FilterRecord.hpp +++ b/src/controllers/filters/FilterRecord.hpp @@ -1,15 +1,14 @@ #pragma once -#include "util/RapidJsonSerializeQString.hpp" -#include "util/RapidjsonHelpers.hpp" - #include "controllers/filters/parser/FilterParser.hpp" #include "controllers/filters/parser/Types.hpp" +#include "util/RapidjsonHelpers.hpp" +#include "util/RapidJsonSerializeQString.hpp" +#include #include #include #include -#include #include diff --git a/src/controllers/filters/parser/Tokenizer.cpp b/src/controllers/filters/parser/Tokenizer.cpp index e7da0324..e1bb28bc 100644 --- a/src/controllers/filters/parser/Tokenizer.cpp +++ b/src/controllers/filters/parser/Tokenizer.cpp @@ -1,4 +1,5 @@ #include "controllers/filters/parser/Tokenizer.hpp" + #include "common/QLogging.hpp" namespace filterparser { diff --git a/src/controllers/highlights/BadgeHighlightModel.hpp b/src/controllers/highlights/BadgeHighlightModel.hpp index 3038b2eb..0103dcb2 100644 --- a/src/controllers/highlights/BadgeHighlightModel.hpp +++ b/src/controllers/highlights/BadgeHighlightModel.hpp @@ -1,11 +1,11 @@ #pragma once -#include - #include "common/SignalVectorModel.hpp" #include "controllers/highlights/HighlightBadge.hpp" #include "providers/twitch/TwitchBadges.hpp" +#include + namespace chatterino { class HighlightController; diff --git a/src/controllers/highlights/HighlightBadge.hpp b/src/controllers/highlights/HighlightBadge.hpp index d20cbe81..0605fd8d 100644 --- a/src/controllers/highlights/HighlightBadge.hpp +++ b/src/controllers/highlights/HighlightBadge.hpp @@ -1,12 +1,12 @@ #pragma once #include "providers/twitch/TwitchBadge.hpp" -#include "util/RapidJsonSerializeQString.hpp" #include "util/RapidjsonHelpers.hpp" +#include "util/RapidJsonSerializeQString.hpp" +#include #include #include -#include namespace chatterino { class HighlightBadge diff --git a/src/controllers/highlights/HighlightBlacklistModel.hpp b/src/controllers/highlights/HighlightBlacklistModel.hpp index d4acc474..d18963cc 100644 --- a/src/controllers/highlights/HighlightBlacklistModel.hpp +++ b/src/controllers/highlights/HighlightBlacklistModel.hpp @@ -1,10 +1,10 @@ #pragma once -#include - #include "common/SignalVectorModel.hpp" #include "controllers/highlights/HighlightBlacklistUser.hpp" +#include + namespace chatterino { class HighlightController; diff --git a/src/controllers/highlights/HighlightBlacklistUser.hpp b/src/controllers/highlights/HighlightBlacklistUser.hpp index 08a56ba4..0875a161 100644 --- a/src/controllers/highlights/HighlightBlacklistUser.hpp +++ b/src/controllers/highlights/HighlightBlacklistUser.hpp @@ -1,11 +1,11 @@ #pragma once -#include "util/RapidJsonSerializeQString.hpp" #include "util/RapidjsonHelpers.hpp" +#include "util/RapidJsonSerializeQString.hpp" +#include #include #include -#include #include diff --git a/src/controllers/highlights/HighlightController.hpp b/src/controllers/highlights/HighlightController.hpp index ad7cc7ce..3f4b37e5 100644 --- a/src/controllers/highlights/HighlightController.hpp +++ b/src/controllers/highlights/HighlightController.hpp @@ -7,9 +7,9 @@ #include "singletons/Paths.hpp" #include "singletons/Settings.hpp" +#include #include #include -#include #include #include diff --git a/src/controllers/highlights/HighlightModel.hpp b/src/controllers/highlights/HighlightModel.hpp index f1407f18..2e715713 100644 --- a/src/controllers/highlights/HighlightModel.hpp +++ b/src/controllers/highlights/HighlightModel.hpp @@ -1,10 +1,10 @@ #pragma once -#include - #include "common/SignalVectorModel.hpp" #include "controllers/highlights/HighlightPhrase.hpp" +#include + namespace chatterino { class HighlightModel : public SignalVectorModel diff --git a/src/controllers/highlights/HighlightPhrase.hpp b/src/controllers/highlights/HighlightPhrase.hpp index 695fc93d..4cf9faff 100644 --- a/src/controllers/highlights/HighlightPhrase.hpp +++ b/src/controllers/highlights/HighlightPhrase.hpp @@ -1,14 +1,14 @@ #pragma once #include "providers/colors/ColorProvider.hpp" -#include "util/RapidJsonSerializeQString.hpp" #include "util/RapidjsonHelpers.hpp" +#include "util/RapidJsonSerializeQString.hpp" +#include #include #include #include #include -#include #include diff --git a/src/controllers/highlights/UserHighlightModel.hpp b/src/controllers/highlights/UserHighlightModel.hpp index de433243..11edd2c4 100644 --- a/src/controllers/highlights/UserHighlightModel.hpp +++ b/src/controllers/highlights/UserHighlightModel.hpp @@ -1,10 +1,10 @@ #pragma once -#include - #include "common/SignalVectorModel.hpp" #include "controllers/highlights/HighlightPhrase.hpp" +#include + namespace chatterino { class HighlightController; diff --git a/src/controllers/ignores/IgnoreModel.hpp b/src/controllers/ignores/IgnoreModel.hpp index 473b61b9..9904d787 100644 --- a/src/controllers/ignores/IgnoreModel.hpp +++ b/src/controllers/ignores/IgnoreModel.hpp @@ -1,10 +1,10 @@ #pragma once -#include - #include "common/SignalVectorModel.hpp" #include "controllers/ignores/IgnorePhrase.hpp" +#include + namespace chatterino { class IgnoreModel : public SignalVectorModel diff --git a/src/controllers/ignores/IgnorePhrase.hpp b/src/controllers/ignores/IgnorePhrase.hpp index ffd4c09e..387e8fb5 100644 --- a/src/controllers/ignores/IgnorePhrase.hpp +++ b/src/controllers/ignores/IgnorePhrase.hpp @@ -3,13 +3,12 @@ #include "Application.hpp" #include "controllers/accounts/AccountController.hpp" #include "singletons/Settings.hpp" - -#include "util/RapidJsonSerializeQString.hpp" #include "util/RapidjsonHelpers.hpp" +#include "util/RapidJsonSerializeQString.hpp" +#include #include #include -#include #include diff --git a/src/controllers/moderationactions/ModerationAction.cpp b/src/controllers/moderationactions/ModerationAction.cpp index 90b3e1de..7f4039f9 100644 --- a/src/controllers/moderationactions/ModerationAction.cpp +++ b/src/controllers/moderationactions/ModerationAction.cpp @@ -1,10 +1,11 @@ #include "ModerationAction.hpp" -#include #include "Application.hpp" #include "messages/Image.hpp" #include "singletons/Resources.hpp" +#include + namespace chatterino { // ModerationAction::ModerationAction(Image *_image, const QString &_action) diff --git a/src/controllers/moderationactions/ModerationAction.hpp b/src/controllers/moderationactions/ModerationAction.hpp index 5e08ddcf..2165a1d6 100644 --- a/src/controllers/moderationactions/ModerationAction.hpp +++ b/src/controllers/moderationactions/ModerationAction.hpp @@ -1,10 +1,10 @@ #pragma once -#include +#include "util/RapidjsonHelpers.hpp" + #include #include - -#include "util/RapidjsonHelpers.hpp" +#include #include diff --git a/src/controllers/moderationactions/ModerationActionModel.hpp b/src/controllers/moderationactions/ModerationActionModel.hpp index e13b3b27..eb62bab9 100644 --- a/src/controllers/moderationactions/ModerationActionModel.hpp +++ b/src/controllers/moderationactions/ModerationActionModel.hpp @@ -1,10 +1,10 @@ #pragma once -#include - #include "common/SignalVectorModel.hpp" #include "controllers/moderationactions/ModerationAction.hpp" +#include + namespace chatterino { class ModerationActionModel : public SignalVectorModel diff --git a/src/controllers/nicknames/Nickname.hpp b/src/controllers/nicknames/Nickname.hpp index 3fb0b23b..fa55339d 100644 --- a/src/controllers/nicknames/Nickname.hpp +++ b/src/controllers/nicknames/Nickname.hpp @@ -1,11 +1,11 @@ #pragma once #include "controllers/accounts/AccountController.hpp" -#include "util/RapidJsonSerializeQString.hpp" #include "util/RapidjsonHelpers.hpp" +#include "util/RapidJsonSerializeQString.hpp" -#include #include +#include #include diff --git a/src/controllers/nicknames/NicknamesModel.hpp b/src/controllers/nicknames/NicknamesModel.hpp index f7947a7f..7cd034ea 100644 --- a/src/controllers/nicknames/NicknamesModel.hpp +++ b/src/controllers/nicknames/NicknamesModel.hpp @@ -1,10 +1,10 @@ #pragma once -#include - #include "common/SignalVectorModel.hpp" #include "controllers/nicknames/Nickname.hpp" +#include + namespace chatterino { class NicknamesModel : public SignalVectorModel diff --git a/src/controllers/notifications/NotificationController.cpp b/src/controllers/notifications/NotificationController.cpp index d8215d64..79aef372 100644 --- a/src/controllers/notifications/NotificationController.cpp +++ b/src/controllers/notifications/NotificationController.cpp @@ -5,9 +5,9 @@ #include "common/Outcome.hpp" #include "common/QLogging.hpp" #include "controllers/notifications/NotificationModel.hpp" +#include "providers/twitch/api/Helix.hpp" #include "providers/twitch/TwitchIrcServer.hpp" #include "providers/twitch/TwitchMessageBuilder.hpp" -#include "providers/twitch/api/Helix.hpp" #include "singletons/Toasts.hpp" #include "singletons/WindowManager.hpp" #include "util/Helpers.hpp" @@ -21,6 +21,7 @@ #include #include #include + #include namespace chatterino { diff --git a/src/controllers/notifications/NotificationModel.hpp b/src/controllers/notifications/NotificationModel.hpp index 83d14ba0..6d4856a8 100644 --- a/src/controllers/notifications/NotificationModel.hpp +++ b/src/controllers/notifications/NotificationModel.hpp @@ -1,10 +1,10 @@ #pragma once -#include - #include "common/SignalVectorModel.hpp" #include "controllers/notifications/NotificationController.hpp" +#include + namespace chatterino { class NotificationController; diff --git a/src/controllers/pings/MutedChannelModel.hpp b/src/controllers/pings/MutedChannelModel.hpp index c53b3177..5cc036ec 100644 --- a/src/controllers/pings/MutedChannelModel.hpp +++ b/src/controllers/pings/MutedChannelModel.hpp @@ -1,10 +1,10 @@ #pragma once -#include - #include "common/SignalVectorModel.hpp" #include "controllers/notifications/NotificationController.hpp" +#include + namespace chatterino { class MutedChannelController; diff --git a/src/controllers/userdata/UserData.hpp b/src/controllers/userdata/UserData.hpp index ba3534e7..a5b460d7 100644 --- a/src/controllers/userdata/UserData.hpp +++ b/src/controllers/userdata/UserData.hpp @@ -1,12 +1,12 @@ #pragma once -#include "util/RapidJsonSerializeQString.hpp" #include "util/RapidjsonHelpers.hpp" +#include "util/RapidJsonSerializeQString.hpp" -#include -#include #include #include +#include +#include namespace chatterino { diff --git a/src/controllers/userdata/UserDataController.hpp b/src/controllers/userdata/UserDataController.hpp index 5ae0fe37..fe9b54b2 100644 --- a/src/controllers/userdata/UserDataController.hpp +++ b/src/controllers/userdata/UserDataController.hpp @@ -3,14 +3,14 @@ #include "common/Singleton.hpp" #include "controllers/userdata/UserData.hpp" #include "util/QStringHash.hpp" -#include "util/RapidJsonSerializeQString.hpp" #include "util/RapidjsonHelpers.hpp" +#include "util/RapidJsonSerializeQString.hpp" #include "util/serialize/Container.hpp" -#include -#include #include #include +#include +#include #include #include diff --git a/src/debug/AssertInGuiThread.hpp b/src/debug/AssertInGuiThread.hpp index 6dc14496..97da9fa4 100644 --- a/src/debug/AssertInGuiThread.hpp +++ b/src/debug/AssertInGuiThread.hpp @@ -2,6 +2,7 @@ #include #include + #include namespace chatterino { diff --git a/src/debug/Benchmark.cpp b/src/debug/Benchmark.cpp index 58c6cea4..5c93ac8e 100644 --- a/src/debug/Benchmark.cpp +++ b/src/debug/Benchmark.cpp @@ -1,4 +1,5 @@ #include "Benchmark.hpp" + #include "common/QLogging.hpp" namespace chatterino { diff --git a/src/debug/Benchmark.hpp b/src/debug/Benchmark.hpp index cb7660b5..4b0d4767 100644 --- a/src/debug/Benchmark.hpp +++ b/src/debug/Benchmark.hpp @@ -1,8 +1,8 @@ #pragma once +#include #include #include -#include namespace chatterino { diff --git a/src/main.cpp b/src/main.cpp index 44e75495..31e30e55 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,22 +1,23 @@ -#include -#include -#include -#include -#include - #include "BrowserExtension.hpp" -#include "RunGui.hpp" #include "common/Args.hpp" #include "common/Modes.hpp" #include "common/QLogging.hpp" #include "common/Version.hpp" #include "providers/IvrApi.hpp" #include "providers/twitch/api/Helix.hpp" +#include "RunGui.hpp" #include "singletons/Paths.hpp" #include "singletons/Settings.hpp" #include "util/AttachToConsole.hpp" #include "util/IncognitoBrowser.hpp" +#include +#include +#include +#include + +#include + using namespace chatterino; int main(int argc, char **argv) diff --git a/src/messages/Emote.hpp b/src/messages/Emote.hpp index a736a980..2648c337 100644 --- a/src/messages/Emote.hpp +++ b/src/messages/Emote.hpp @@ -5,6 +5,7 @@ #include "messages/ImageSet.hpp" #include + #include #include #include diff --git a/src/messages/Image.cpp b/src/messages/Image.cpp index 13d2ebf0..ffc0ffa5 100644 --- a/src/messages/Image.cpp +++ b/src/messages/Image.cpp @@ -1,27 +1,28 @@ #include "messages/Image.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "Application.hpp" #include "common/Common.hpp" #include "common/NetworkRequest.hpp" #include "common/QLogging.hpp" #include "debug/AssertInGuiThread.hpp" #include "debug/Benchmark.hpp" + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include #ifndef CHATTERINO_TEST # include "singletons/Emotes.hpp" #endif -#include "singletons/WindowManager.hpp" #include "singletons/helper/GifTimer.hpp" +#include "singletons/WindowManager.hpp" #include "util/DebugCount.hpp" #include "util/PostToThread.hpp" diff --git a/src/messages/Image.hpp b/src/messages/Image.hpp index d47532ac..7498116e 100644 --- a/src/messages/Image.hpp +++ b/src/messages/Image.hpp @@ -1,22 +1,23 @@ #pragma once +#include "common/Aliases.hpp" +#include "common/Common.hpp" + +#include +#include +#include +#include #include #include #include #include #include + #include -#include -#include -#include #include #include #include #include -#include - -#include "common/Aliases.hpp" -#include "common/Common.hpp" namespace chatterino { namespace detail { diff --git a/src/messages/Message.hpp b/src/messages/Message.hpp index 6a36cf87..baba77e5 100644 --- a/src/messages/Message.hpp +++ b/src/messages/Message.hpp @@ -5,8 +5,9 @@ #include "util/QStringHash.hpp" #include "widgets/helper/ScrollbarHighlight.hpp" -#include #include +#include + #include #include #include diff --git a/src/messages/MessageBuilder.hpp b/src/messages/MessageBuilder.hpp index 88d57eb6..12e21f76 100644 --- a/src/messages/MessageBuilder.hpp +++ b/src/messages/MessageBuilder.hpp @@ -3,6 +3,7 @@ #include "messages/MessageElement.hpp" #include + #include #include diff --git a/src/messages/MessageElement.hpp b/src/messages/MessageElement.hpp index 9cc9d8bb..0ce8443f 100644 --- a/src/messages/MessageElement.hpp +++ b/src/messages/MessageElement.hpp @@ -6,13 +6,14 @@ #include "messages/MessageColor.hpp" #include "singletons/Fonts.hpp" +#include +#include #include #include #include -#include + #include #include -#include #include namespace chatterino { diff --git a/src/messages/SharedMessageBuilder.hpp b/src/messages/SharedMessageBuilder.hpp index 3de4531c..db055775 100644 --- a/src/messages/SharedMessageBuilder.hpp +++ b/src/messages/SharedMessageBuilder.hpp @@ -1,7 +1,6 @@ -#include "messages/MessageBuilder.hpp" - #include "common/Aliases.hpp" #include "common/Outcome.hpp" +#include "messages/MessageBuilder.hpp" #include "messages/MessageColor.hpp" #include "providers/twitch/TwitchBadge.hpp" diff --git a/src/messages/layouts/MessageLayout.cpp b/src/messages/layouts/MessageLayout.cpp index 5fd24dd4..e7448098 100644 --- a/src/messages/layouts/MessageLayout.cpp +++ b/src/messages/layouts/MessageLayout.cpp @@ -2,9 +2,9 @@ #include "Application.hpp" #include "debug/Benchmark.hpp" +#include "messages/layouts/MessageLayoutContainer.hpp" #include "messages/Message.hpp" #include "messages/MessageElement.hpp" -#include "messages/layouts/MessageLayoutContainer.hpp" #include "singletons/Emotes.hpp" #include "singletons/Settings.hpp" #include "singletons/Theme.hpp" @@ -15,8 +15,8 @@ #include #include #include -#include #include +#include #define MARGIN_LEFT (int)(8 * this->scale) #define MARGIN_RIGHT (int)(8 * this->scale) diff --git a/src/messages/layouts/MessageLayout.hpp b/src/messages/layouts/MessageLayout.hpp index 7d20cbb6..5bbf437e 100644 --- a/src/messages/layouts/MessageLayout.hpp +++ b/src/messages/layouts/MessageLayout.hpp @@ -3,8 +3,9 @@ #include "common/Common.hpp" #include "common/FlagsEnum.hpp" -#include #include +#include + #include #include diff --git a/src/messages/layouts/MessageLayoutContainer.cpp b/src/messages/layouts/MessageLayoutContainer.cpp index 037c15b3..28050782 100644 --- a/src/messages/layouts/MessageLayoutContainer.cpp +++ b/src/messages/layouts/MessageLayoutContainer.cpp @@ -1,10 +1,10 @@ #include "MessageLayoutContainer.hpp" #include "Application.hpp" +#include "messages/layouts/MessageLayoutElement.hpp" #include "messages/Message.hpp" #include "messages/MessageElement.hpp" #include "messages/Selection.hpp" -#include "messages/layouts/MessageLayoutElement.hpp" #include "singletons/Fonts.hpp" #include "singletons/Settings.hpp" #include "singletons/Theme.hpp" diff --git a/src/messages/layouts/MessageLayoutContainer.hpp b/src/messages/layouts/MessageLayoutContainer.hpp index d17df31e..d9200d8e 100644 --- a/src/messages/layouts/MessageLayoutContainer.hpp +++ b/src/messages/layouts/MessageLayoutContainer.hpp @@ -1,14 +1,15 @@ #pragma once -#include -#include -#include -#include - #include "common/Common.hpp" #include "common/FlagsEnum.hpp" -#include "messages/Selection.hpp" #include "messages/layouts/MessageLayoutElement.hpp" +#include "messages/Selection.hpp" + +#include +#include + +#include +#include class QPainter; diff --git a/src/messages/layouts/MessageLayoutElement.hpp b/src/messages/layouts/MessageLayoutElement.hpp index 4dd69233..13ea77c0 100644 --- a/src/messages/layouts/MessageLayoutElement.hpp +++ b/src/messages/layouts/MessageLayoutElement.hpp @@ -5,12 +5,12 @@ #include "messages/MessageColor.hpp" #include "messages/MessageElement.hpp" +#include +#include #include #include #include #include -#include -#include #include #include diff --git a/src/messages/search/RegexPredicate.hpp b/src/messages/search/RegexPredicate.hpp index bacf1e6d..fcf5d262 100644 --- a/src/messages/search/RegexPredicate.hpp +++ b/src/messages/search/RegexPredicate.hpp @@ -1,7 +1,7 @@ #pragma once -#include "QRegularExpression" #include "messages/search/MessagePredicate.hpp" +#include "QRegularExpression" namespace chatterino { diff --git a/src/providers/LinkResolver.hpp b/src/providers/LinkResolver.hpp index d1b24d69..9d52ce38 100644 --- a/src/providers/LinkResolver.hpp +++ b/src/providers/LinkResolver.hpp @@ -1,11 +1,12 @@ #pragma once -#include -#include - #include "messages/Image.hpp" #include "messages/Link.hpp" +#include + +#include + namespace chatterino { class LinkResolver diff --git a/src/providers/bttv/BttvEmotes.cpp b/src/providers/bttv/BttvEmotes.cpp index 6785eced..c84862c6 100644 --- a/src/providers/bttv/BttvEmotes.cpp +++ b/src/providers/bttv/BttvEmotes.cpp @@ -1,8 +1,5 @@ #include "providers/bttv/BttvEmotes.hpp" -#include -#include - #include "common/Common.hpp" #include "common/NetworkRequest.hpp" #include "common/QLogging.hpp" @@ -13,6 +10,9 @@ #include "providers/twitch/TwitchChannel.hpp" #include "singletons/Settings.hpp" +#include +#include + namespace chatterino { namespace { diff --git a/src/providers/bttv/BttvEmotes.hpp b/src/providers/bttv/BttvEmotes.hpp index 81a86bca..52fc9b6a 100644 --- a/src/providers/bttv/BttvEmotes.hpp +++ b/src/providers/bttv/BttvEmotes.hpp @@ -1,11 +1,12 @@ #pragma once -#include #include "boost/optional.hpp" #include "common/Aliases.hpp" #include "common/Atomic.hpp" #include "providers/twitch/TwitchChannel.hpp" +#include + namespace chatterino { struct Emote; diff --git a/src/providers/bttv/LoadBttvChannelEmote.cpp b/src/providers/bttv/LoadBttvChannelEmote.cpp index f5116cb0..5ceee36c 100644 --- a/src/providers/bttv/LoadBttvChannelEmote.cpp +++ b/src/providers/bttv/LoadBttvChannelEmote.cpp @@ -1,14 +1,15 @@ #include "LoadBttvChannelEmote.hpp" -#include -#include -#include -#include #include "common/Common.hpp" #include "common/NetworkRequest.hpp" #include "common/UniqueAccess.hpp" #include "messages/Emote.hpp" +#include +#include +#include +#include + namespace chatterino { } // namespace chatterino diff --git a/src/providers/chatterino/ChatterinoBadges.cpp b/src/providers/chatterino/ChatterinoBadges.cpp index 446dfb10..91f2d300 100644 --- a/src/providers/chatterino/ChatterinoBadges.cpp +++ b/src/providers/chatterino/ChatterinoBadges.cpp @@ -1,13 +1,14 @@ #include "ChatterinoBadges.hpp" +#include "common/NetworkRequest.hpp" +#include "common/Outcome.hpp" +#include "messages/Emote.hpp" + #include #include #include #include #include -#include "common/NetworkRequest.hpp" -#include "common/Outcome.hpp" -#include "messages/Emote.hpp" namespace chatterino { void ChatterinoBadges::initialize(Settings &settings, Paths &paths) diff --git a/src/providers/chatterino/ChatterinoBadges.hpp b/src/providers/chatterino/ChatterinoBadges.hpp index ec79c056..aad04876 100644 --- a/src/providers/chatterino/ChatterinoBadges.hpp +++ b/src/providers/chatterino/ChatterinoBadges.hpp @@ -1,13 +1,15 @@ #pragma once +#include "common/Aliases.hpp" +#include "util/QStringHash.hpp" + #include #include + #include #include #include #include -#include "common/Aliases.hpp" -#include "util/QStringHash.hpp" namespace chatterino { diff --git a/src/providers/colors/ColorProvider.hpp b/src/providers/colors/ColorProvider.hpp index b2143c4c..efb2e6ff 100644 --- a/src/providers/colors/ColorProvider.hpp +++ b/src/providers/colors/ColorProvider.hpp @@ -1,10 +1,10 @@ #pragma once +#include + #include #include -#include - namespace chatterino { enum class ColorType { diff --git a/src/providers/emoji/Emojis.cpp b/src/providers/emoji/Emojis.cpp index 4979c2cf..f08bab52 100644 --- a/src/providers/emoji/Emojis.cpp +++ b/src/providers/emoji/Emojis.cpp @@ -1,16 +1,17 @@ #include "providers/emoji/Emojis.hpp" #include "Application.hpp" +#include "common/QLogging.hpp" #include "messages/Emote.hpp" #include "singletons/Settings.hpp" +#include +#include #include #include #include -#include -#include + #include -#include "common/QLogging.hpp" namespace chatterino { namespace { diff --git a/src/providers/emoji/Emojis.hpp b/src/providers/emoji/Emojis.hpp index e010c468..323c53d9 100644 --- a/src/providers/emoji/Emojis.hpp +++ b/src/providers/emoji/Emojis.hpp @@ -2,9 +2,10 @@ #include "util/ConcurrentMap.hpp" +#include #include #include -#include + #include #include #include diff --git a/src/providers/ffz/FfzBadges.cpp b/src/providers/ffz/FfzBadges.cpp index ef836374..8818ccab 100644 --- a/src/providers/ffz/FfzBadges.cpp +++ b/src/providers/ffz/FfzBadges.cpp @@ -1,15 +1,17 @@ #include "FfzBadges.hpp" +#include "common/NetworkRequest.hpp" +#include "common/Outcome.hpp" +#include "messages/Emote.hpp" + #include #include #include #include #include + #include #include -#include "common/NetworkRequest.hpp" -#include "common/Outcome.hpp" -#include "messages/Emote.hpp" namespace chatterino { diff --git a/src/providers/ffz/FfzBadges.hpp b/src/providers/ffz/FfzBadges.hpp index 038ad36c..1c6a6b83 100644 --- a/src/providers/ffz/FfzBadges.hpp +++ b/src/providers/ffz/FfzBadges.hpp @@ -4,9 +4,9 @@ #include "common/UniqueAccess.hpp" #include "util/QStringHash.hpp" -#include #include #include +#include #include #include diff --git a/src/providers/ffz/FfzEmotes.cpp b/src/providers/ffz/FfzEmotes.cpp index 8a6ccdea..a7061015 100644 --- a/src/providers/ffz/FfzEmotes.cpp +++ b/src/providers/ffz/FfzEmotes.cpp @@ -1,7 +1,5 @@ #include "providers/ffz/FfzEmotes.hpp" -#include - #include "common/NetworkRequest.hpp" #include "common/Outcome.hpp" #include "common/QLogging.hpp" @@ -11,6 +9,8 @@ #include "providers/twitch/TwitchChannel.hpp" #include "singletons/Settings.hpp" +#include + namespace chatterino { namespace { diff --git a/src/providers/ffz/FfzEmotes.hpp b/src/providers/ffz/FfzEmotes.hpp index 12377767..63da0796 100644 --- a/src/providers/ffz/FfzEmotes.hpp +++ b/src/providers/ffz/FfzEmotes.hpp @@ -1,11 +1,12 @@ #pragma once -#include #include "boost/optional.hpp" #include "common/Aliases.hpp" #include "common/Atomic.hpp" #include "providers/twitch/TwitchChannel.hpp" +#include + namespace chatterino { struct Emote; diff --git a/src/providers/irc/AbstractIrcServer.hpp b/src/providers/irc/AbstractIrcServer.hpp index 796bfa80..9de20489 100644 --- a/src/providers/irc/AbstractIrcServer.hpp +++ b/src/providers/irc/AbstractIrcServer.hpp @@ -1,15 +1,16 @@ #pragma once -#include -#include -#include -#include -#include - #include "common/Common.hpp" #include "providers/irc/IrcConnection2.hpp" #include "util/RatelimitBucket.hpp" +#include +#include +#include + +#include +#include + namespace chatterino { class Channel; diff --git a/src/providers/irc/Irc2.cpp b/src/providers/irc/Irc2.cpp index 61a8a2cd..2d5eebea 100644 --- a/src/providers/irc/Irc2.cpp +++ b/src/providers/irc/Irc2.cpp @@ -1,6 +1,5 @@ #include "Irc2.hpp" -#include #include "common/Credentials.hpp" #include "common/SignalVectorModel.hpp" #include "singletons/Paths.hpp" @@ -8,6 +7,7 @@ #include "util/RapidjsonHelpers.hpp" #include "util/StandardItemHelper.hpp" +#include #include #include diff --git a/src/providers/irc/Irc2.hpp b/src/providers/irc/Irc2.hpp index c4ae8c73..0b20783c 100644 --- a/src/providers/irc/Irc2.hpp +++ b/src/providers/irc/Irc2.hpp @@ -1,11 +1,11 @@ #pragma once -#include -#include - +#include "common/SignalVector.hpp" #include "providers/irc/IrcChannel2.hpp" #include "providers/irc/IrcServer.hpp" +#include + class QAbstractTableModel; namespace chatterino { diff --git a/src/providers/irc/IrcCommands.hpp b/src/providers/irc/IrcCommands.hpp index 32679e59..38f7db17 100644 --- a/src/providers/irc/IrcCommands.hpp +++ b/src/providers/irc/IrcCommands.hpp @@ -1,8 +1,9 @@ #pragma once -#include #include "common/Outcome.hpp" +#include + namespace chatterino { class IrcChannel; diff --git a/src/providers/irc/IrcConnection2.hpp b/src/providers/irc/IrcConnection2.hpp index 1149bbeb..1a31ea5c 100644 --- a/src/providers/irc/IrcConnection2.hpp +++ b/src/providers/irc/IrcConnection2.hpp @@ -2,9 +2,8 @@ #include "util/ExponentialBackoff.hpp" -#include - #include +#include #include namespace chatterino { diff --git a/src/providers/irc/IrcServer.cpp b/src/providers/irc/IrcServer.cpp index ad0883f1..363bf045 100644 --- a/src/providers/irc/IrcServer.cpp +++ b/src/providers/irc/IrcServer.cpp @@ -1,8 +1,5 @@ #include "IrcServer.hpp" -#include -#include - #include "common/QLogging.hpp" #include "messages/Message.hpp" #include "messages/MessageColor.hpp" @@ -17,6 +14,9 @@ #include +#include +#include + namespace chatterino { IrcServer::IrcServer(const IrcServerData &data) diff --git a/src/providers/liveupdates/BasicPubSubClient.hpp b/src/providers/liveupdates/BasicPubSubClient.hpp index 70ee6252..31532c1d 100644 --- a/src/providers/liveupdates/BasicPubSubClient.hpp +++ b/src/providers/liveupdates/BasicPubSubClient.hpp @@ -1,16 +1,17 @@ #pragma once -#include -#include -#include -#include - #include "common/QLogging.hpp" #include "providers/liveupdates/BasicPubSubWebsocket.hpp" #include "singletons/Settings.hpp" #include "util/DebugCount.hpp" #include "util/Helpers.hpp" +#include + +#include +#include +#include + namespace chatterino { /** diff --git a/src/providers/liveupdates/BasicPubSubManager.hpp b/src/providers/liveupdates/BasicPubSubManager.hpp index 664e8c42..dce96357 100644 --- a/src/providers/liveupdates/BasicPubSubManager.hpp +++ b/src/providers/liveupdates/BasicPubSubManager.hpp @@ -8,9 +8,9 @@ #include "util/DebugCount.hpp" #include "util/ExponentialBackoff.hpp" +#include #include #include -#include #include #include diff --git a/src/providers/seventv/SeventvEmotes.cpp b/src/providers/seventv/SeventvEmotes.cpp index e853a8ad..740b0c89 100644 --- a/src/providers/seventv/SeventvEmotes.cpp +++ b/src/providers/seventv/SeventvEmotes.cpp @@ -13,6 +13,7 @@ #include #include #include + #include /** diff --git a/src/providers/seventv/SeventvEventAPI.cpp b/src/providers/seventv/SeventvEventAPI.cpp index 4193ffbc..88a843ba 100644 --- a/src/providers/seventv/SeventvEventAPI.cpp +++ b/src/providers/seventv/SeventvEventAPI.cpp @@ -4,6 +4,7 @@ #include "providers/seventv/eventapi/SeventvEventAPIMessage.hpp" #include + #include namespace chatterino { diff --git a/src/providers/seventv/eventapi/SeventvEventAPIClient.cpp b/src/providers/seventv/eventapi/SeventvEventAPIClient.cpp index 01c52ac6..21a3e134 100644 --- a/src/providers/seventv/eventapi/SeventvEventAPIClient.cpp +++ b/src/providers/seventv/eventapi/SeventvEventAPIClient.cpp @@ -1,9 +1,9 @@ -#include - #include "providers/seventv/eventapi/SeventvEventAPIClient.hpp" #include "providers/twitch/PubSubHelpers.hpp" +#include + namespace chatterino { SeventvEventAPIClient::SeventvEventAPIClient( diff --git a/src/providers/seventv/eventapi/SeventvEventAPIDispatch.cpp b/src/providers/seventv/eventapi/SeventvEventAPIDispatch.cpp index 0c46c827..52d4bde6 100644 --- a/src/providers/seventv/eventapi/SeventvEventAPIDispatch.cpp +++ b/src/providers/seventv/eventapi/SeventvEventAPIDispatch.cpp @@ -1,7 +1,7 @@ -#include - #include "providers/seventv/eventapi/SeventvEventAPIDispatch.hpp" +#include + namespace chatterino { SeventvEventAPIDispatch::SeventvEventAPIDispatch(QJsonObject obj) diff --git a/src/providers/seventv/eventapi/SeventvEventAPIMessage.hpp b/src/providers/seventv/eventapi/SeventvEventAPIMessage.hpp index 5240df77..b8b04f54 100644 --- a/src/providers/seventv/eventapi/SeventvEventAPIMessage.hpp +++ b/src/providers/seventv/eventapi/SeventvEventAPIMessage.hpp @@ -4,7 +4,6 @@ #include #include - #include #include #include diff --git a/src/providers/seventv/eventapi/SeventvEventAPISubscription.hpp b/src/providers/seventv/eventapi/SeventvEventAPISubscription.hpp index 7270df36..55c233da 100644 --- a/src/providers/seventv/eventapi/SeventvEventAPISubscription.hpp +++ b/src/providers/seventv/eventapi/SeventvEventAPISubscription.hpp @@ -1,7 +1,6 @@ #pragma once #include - #include #include #include diff --git a/src/providers/twitch/ChannelPointReward.cpp b/src/providers/twitch/ChannelPointReward.cpp index 319dba8c..28e169ec 100644 --- a/src/providers/twitch/ChannelPointReward.cpp +++ b/src/providers/twitch/ChannelPointReward.cpp @@ -1,4 +1,5 @@ #include "ChannelPointReward.hpp" + #include "common/QLogging.hpp" namespace chatterino { diff --git a/src/providers/twitch/ChatterinoWebSocketppLogger.hpp b/src/providers/twitch/ChatterinoWebSocketppLogger.hpp index 951149dd..d82e4307 100644 --- a/src/providers/twitch/ChatterinoWebSocketppLogger.hpp +++ b/src/providers/twitch/ChatterinoWebSocketppLogger.hpp @@ -28,11 +28,13 @@ #ifndef CHATTERINOWEBSOCKETPPLOGGER_HPP #define CHATTERINOWEBSOCKETPPLOGGER_HPP -#include +#include "common/QLogging.hpp" + #include #include #include -#include "common/QLogging.hpp" + +#include namespace websocketpp { namespace log { diff --git a/src/providers/twitch/IrcMessageHandler.hpp b/src/providers/twitch/IrcMessageHandler.hpp index db3fb8c4..77b5d370 100644 --- a/src/providers/twitch/IrcMessageHandler.hpp +++ b/src/providers/twitch/IrcMessageHandler.hpp @@ -1,11 +1,12 @@ #pragma once -#include #include "common/Channel.hpp" #include "messages/Message.hpp" #include "providers/twitch/TwitchChannel.hpp" #include "providers/twitch/TwitchMessageBuilder.hpp" +#include + #include namespace chatterino { diff --git a/src/providers/twitch/PubSubClient.hpp b/src/providers/twitch/PubSubClient.hpp index 84832861..3899e133 100644 --- a/src/providers/twitch/PubSubClient.hpp +++ b/src/providers/twitch/PubSubClient.hpp @@ -4,8 +4,8 @@ #include "providers/twitch/PubSubMessages.hpp" #include "providers/twitch/PubSubWebsocket.hpp" -#include #include +#include #include #include diff --git a/src/providers/twitch/PubSubHelpers.hpp b/src/providers/twitch/PubSubHelpers.hpp index d1e616c6..8ad54540 100644 --- a/src/providers/twitch/PubSubHelpers.hpp +++ b/src/providers/twitch/PubSubHelpers.hpp @@ -1,12 +1,14 @@ #pragma once -#include -#include -#include -#include #include "common/QLogging.hpp" #include "util/RapidjsonHelpers.hpp" +#include +#include +#include + +#include + namespace chatterino { class TwitchAccount; diff --git a/src/providers/twitch/PubSubManager.hpp b/src/providers/twitch/PubSubManager.hpp index f1cecd44..0e3e9652 100644 --- a/src/providers/twitch/PubSubManager.hpp +++ b/src/providers/twitch/PubSubManager.hpp @@ -9,9 +9,9 @@ #include "providers/twitch/TwitchAccount.hpp" #include "util/ExponentialBackoff.hpp" +#include #include #include -#include #include #include diff --git a/src/providers/twitch/TwitchAccount.cpp b/src/providers/twitch/TwitchAccount.cpp index 733acea2..8e0c5446 100644 --- a/src/providers/twitch/TwitchAccount.cpp +++ b/src/providers/twitch/TwitchAccount.cpp @@ -1,7 +1,5 @@ #include "providers/twitch/TwitchAccount.hpp" -#include - #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 + namespace chatterino { TwitchAccount::TwitchAccount(const QString &username, const QString &oauthToken, diff --git a/src/providers/twitch/TwitchAccount.hpp b/src/providers/twitch/TwitchAccount.hpp index 4d1d6be6..1f101e54 100644 --- a/src/providers/twitch/TwitchAccount.hpp +++ b/src/providers/twitch/TwitchAccount.hpp @@ -9,10 +9,10 @@ #include "providers/twitch/TwitchUser.hpp" #include "util/QStringHash.hpp" -#include #include #include #include +#include #include #include diff --git a/src/providers/twitch/TwitchAccountManager.cpp b/src/providers/twitch/TwitchAccountManager.cpp index 573ba790..64125f49 100644 --- a/src/providers/twitch/TwitchAccountManager.cpp +++ b/src/providers/twitch/TwitchAccountManager.cpp @@ -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 { diff --git a/src/providers/twitch/TwitchBadges.cpp b/src/providers/twitch/TwitchBadges.cpp index 11fe07af..788deae9 100644 --- a/src/providers/twitch/TwitchBadges.cpp +++ b/src/providers/twitch/TwitchBadges.cpp @@ -1,5 +1,10 @@ #include "TwitchBadges.hpp" +#include "common/NetworkRequest.hpp" +#include "common/Outcome.hpp" +#include "common/QLogging.hpp" +#include "messages/Emote.hpp" + #include #include #include @@ -9,11 +14,6 @@ #include #include -#include "common/NetworkRequest.hpp" -#include "common/Outcome.hpp" -#include "common/QLogging.hpp" -#include "messages/Emote.hpp" - namespace chatterino { TwitchBadges::TwitchBadges() diff --git a/src/providers/twitch/TwitchBadges.hpp b/src/providers/twitch/TwitchBadges.hpp index abbd5aeb..6283765c 100644 --- a/src/providers/twitch/TwitchBadges.hpp +++ b/src/providers/twitch/TwitchBadges.hpp @@ -1,20 +1,19 @@ #pragma once -#include -#include -#include -#include - #include "common/UniqueAccess.hpp" #include "messages/Image.hpp" #include "util/DisplayBadge.hpp" #include "util/QStringHash.hpp" -#include "pajlada/signals/signal.hpp" +#include +#include +#include +#include #include #include #include +#include namespace chatterino { diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp index bd1eddb0..76309e27 100644 --- a/src/providers/twitch/TwitchChannel.cpp +++ b/src/providers/twitch/TwitchChannel.cpp @@ -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 #include #include #include #include #include #include +#include namespace chatterino { namespace { diff --git a/src/providers/twitch/TwitchChannel.hpp b/src/providers/twitch/TwitchChannel.hpp index 5d0442f2..f1e4c0a8 100644 --- a/src/providers/twitch/TwitchChannel.hpp +++ b/src/providers/twitch/TwitchChannel.hpp @@ -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 -#include -#include #include #include #include +#include +#include +#include #include #include diff --git a/src/providers/twitch/TwitchEmotes.hpp b/src/providers/twitch/TwitchEmotes.hpp index dca7e67f..d793ce72 100644 --- a/src/providers/twitch/TwitchEmotes.hpp +++ b/src/providers/twitch/TwitchEmotes.hpp @@ -1,14 +1,14 @@ #pragma once -#include -#include -#include -#include - #include "common/Aliases.hpp" #include "common/UniqueAccess.hpp" +#include +#include +#include + #include +#include // NB: "default" can be replaced with "static" to always get a non-animated // variant diff --git a/src/providers/twitch/TwitchHelpers.cpp b/src/providers/twitch/TwitchHelpers.cpp index e5fdddfe..2cf8853c 100644 --- a/src/providers/twitch/TwitchHelpers.cpp +++ b/src/providers/twitch/TwitchHelpers.cpp @@ -1,4 +1,5 @@ #include "providers/twitch/TwitchHelpers.hpp" + #include "common/QLogging.hpp" namespace chatterino { diff --git a/src/providers/twitch/TwitchIrcServer.cpp b/src/providers/twitch/TwitchIrcServer.cpp index 6006eb80..7dd704a5 100644 --- a/src/providers/twitch/TwitchIrcServer.cpp +++ b/src/providers/twitch/TwitchIrcServer.cpp @@ -1,8 +1,5 @@ #include "TwitchIrcServer.hpp" -#include -#include - #include "Application.hpp" #include "common/Common.hpp" #include "common/Env.hpp" @@ -20,8 +17,11 @@ #include "util/Helpers.hpp" #include "util/PostToThread.hpp" +#include #include +#include + // using namespace Communi; using namespace std::chrono_literals; diff --git a/src/providers/twitch/TwitchMessageBuilder.cpp b/src/providers/twitch/TwitchMessageBuilder.cpp index 71849bac..b6d627d8 100644 --- a/src/providers/twitch/TwitchMessageBuilder.cpp +++ b/src/providers/twitch/TwitchMessageBuilder.cpp @@ -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 #include #include #include #include #include -#include -#include "common/QLogging.hpp" namespace { diff --git a/src/providers/twitch/TwitchMessageBuilder.hpp b/src/providers/twitch/TwitchMessageBuilder.hpp index 74bb00a8..9a241570 100644 --- a/src/providers/twitch/TwitchMessageBuilder.hpp +++ b/src/providers/twitch/TwitchMessageBuilder.hpp @@ -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 #include diff --git a/src/providers/twitch/TwitchUser.hpp b/src/providers/twitch/TwitchUser.hpp index 53dde8d7..478383b9 100644 --- a/src/providers/twitch/TwitchUser.hpp +++ b/src/providers/twitch/TwitchUser.hpp @@ -3,9 +3,9 @@ #include "providers/twitch/api/Helix.hpp" #include "util/RapidjsonHelpers.hpp" -#include -#include #include +#include +#include #include diff --git a/src/providers/twitch/api/Helix.cpp b/src/providers/twitch/api/Helix.cpp index e9dc0308..fcad4545 100644 --- a/src/providers/twitch/api/Helix.cpp +++ b/src/providers/twitch/api/Helix.cpp @@ -3,8 +3,8 @@ #include "common/Outcome.hpp" #include "common/QLogging.hpp" -#include #include +#include namespace { diff --git a/src/providers/twitch/api/Helix.hpp b/src/providers/twitch/api/Helix.hpp index a63d3fea..92674ca7 100644 --- a/src/providers/twitch/api/Helix.hpp +++ b/src/providers/twitch/api/Helix.hpp @@ -5,12 +5,12 @@ #include "providers/twitch/TwitchEmotes.hpp" #include "util/QStringHash.hpp" +#include #include #include #include #include #include -#include #include #include diff --git a/src/providers/twitch/pubsubmessages/AutoMod.hpp b/src/providers/twitch/pubsubmessages/AutoMod.hpp index f44bd008..d0e52082 100644 --- a/src/providers/twitch/pubsubmessages/AutoMod.hpp +++ b/src/providers/twitch/pubsubmessages/AutoMod.hpp @@ -1,11 +1,10 @@ #pragma once +#include #include #include #include -#include - namespace chatterino { struct PubSubAutoModQueueMessage { diff --git a/src/providers/twitch/pubsubmessages/Base.hpp b/src/providers/twitch/pubsubmessages/Base.hpp index 3c8f28c0..c6d81771 100644 --- a/src/providers/twitch/pubsubmessages/Base.hpp +++ b/src/providers/twitch/pubsubmessages/Base.hpp @@ -1,13 +1,11 @@ #pragma once +#include +#include #include #include #include -#include - -#include - namespace chatterino { struct PubSubMessage { diff --git a/src/providers/twitch/pubsubmessages/ChannelPoints.hpp b/src/providers/twitch/pubsubmessages/ChannelPoints.hpp index 68b9a23f..c5a3ffe8 100644 --- a/src/providers/twitch/pubsubmessages/ChannelPoints.hpp +++ b/src/providers/twitch/pubsubmessages/ChannelPoints.hpp @@ -1,10 +1,9 @@ #pragma once +#include #include #include -#include - namespace chatterino { struct PubSubCommunityPointsChannelV1Message { diff --git a/src/providers/twitch/pubsubmessages/ChatModeratorAction.hpp b/src/providers/twitch/pubsubmessages/ChatModeratorAction.hpp index bd2038e6..5f29673e 100644 --- a/src/providers/twitch/pubsubmessages/ChatModeratorAction.hpp +++ b/src/providers/twitch/pubsubmessages/ChatModeratorAction.hpp @@ -1,10 +1,9 @@ #pragma once +#include #include #include -#include - namespace chatterino { struct PubSubChatModeratorActionMessage { diff --git a/src/providers/twitch/pubsubmessages/Message.hpp b/src/providers/twitch/pubsubmessages/Message.hpp index 2ce8a345..2f061d0b 100644 --- a/src/providers/twitch/pubsubmessages/Message.hpp +++ b/src/providers/twitch/pubsubmessages/Message.hpp @@ -2,12 +2,11 @@ #include "common/QLogging.hpp" +#include #include #include #include -#include - namespace chatterino { struct PubSubMessageMessage { diff --git a/src/providers/twitch/pubsubmessages/Whisper.hpp b/src/providers/twitch/pubsubmessages/Whisper.hpp index af29f74a..96179f07 100644 --- a/src/providers/twitch/pubsubmessages/Whisper.hpp +++ b/src/providers/twitch/pubsubmessages/Whisper.hpp @@ -1,11 +1,10 @@ #pragma once +#include #include #include #include -#include - namespace chatterino { struct PubSubWhisperMessage { diff --git a/src/singletons/Badges.hpp b/src/singletons/Badges.hpp index d049529e..8d53aa9e 100644 --- a/src/singletons/Badges.hpp +++ b/src/singletons/Badges.hpp @@ -1,9 +1,10 @@ #pragma once -#include #include "common/Singleton.hpp" #include "messages/Emote.hpp" +#include + namespace chatterino { class Badges : public Singleton diff --git a/src/singletons/Emotes.hpp b/src/singletons/Emotes.hpp index 13a2046f..deff15d3 100644 --- a/src/singletons/Emotes.hpp +++ b/src/singletons/Emotes.hpp @@ -1,7 +1,6 @@ #pragma once #include "common/Singleton.hpp" - #include "providers/bttv/BttvEmotes.hpp" #include "providers/emoji/Emojis.hpp" #include "providers/ffz/FfzEmotes.hpp" diff --git a/src/singletons/Fonts.hpp b/src/singletons/Fonts.hpp index bc700e5e..a3463500 100644 --- a/src/singletons/Fonts.hpp +++ b/src/singletons/Fonts.hpp @@ -3,11 +3,11 @@ #include "common/ChatterinoSetting.hpp" #include "common/Singleton.hpp" +#include +#include #include #include #include -#include -#include #include #include diff --git a/src/singletons/Logging.cpp b/src/singletons/Logging.cpp index 372c5820..4c4810e9 100644 --- a/src/singletons/Logging.cpp +++ b/src/singletons/Logging.cpp @@ -1,9 +1,9 @@ #include "singletons/Logging.hpp" #include "Application.hpp" +#include "singletons/helper/LoggingChannel.hpp" #include "singletons/Paths.hpp" #include "singletons/Settings.hpp" -#include "singletons/helper/LoggingChannel.hpp" #include #include diff --git a/src/singletons/Logging.hpp b/src/singletons/Logging.hpp index 5cca957e..a0b1be3e 100644 --- a/src/singletons/Logging.hpp +++ b/src/singletons/Logging.hpp @@ -1,7 +1,6 @@ #pragma once #include "common/Singleton.hpp" - #include "messages/Message.hpp" #include "singletons/helper/LoggingChannel.hpp" diff --git a/src/singletons/NativeMessaging.cpp b/src/singletons/NativeMessaging.cpp index e9b864ca..620e5ee3 100644 --- a/src/singletons/NativeMessaging.cpp +++ b/src/singletons/NativeMessaging.cpp @@ -6,6 +6,8 @@ #include "singletons/Paths.hpp" #include "util/PostToThread.hpp" +#include +#include #include #include #include @@ -13,15 +15,13 @@ #include #include -#include -#include - namespace ipc = boost::interprocess; #ifdef Q_OS_WIN +// clang-format off # include - # include +// clang-format on # include "singletons/WindowManager.hpp" # include "widgets/AttachedWindow.hpp" #endif diff --git a/src/singletons/NativeMessaging.hpp b/src/singletons/NativeMessaging.hpp index 2bb0107b..9733dfb1 100644 --- a/src/singletons/NativeMessaging.hpp +++ b/src/singletons/NativeMessaging.hpp @@ -1,9 +1,9 @@ #pragma once -#include -#include #include #include +#include +#include namespace chatterino { diff --git a/src/singletons/Paths.cpp b/src/singletons/Paths.cpp index 6844af02..437e2761 100644 --- a/src/singletons/Paths.cpp +++ b/src/singletons/Paths.cpp @@ -1,15 +1,15 @@ #include "singletons/Paths.hpp" +#include "common/Modes.hpp" #include "singletons/Settings.hpp" +#include "util/CombinePath.hpp" #include #include #include #include -#include -#include "common/Modes.hpp" -#include "util/CombinePath.hpp" +#include using namespace std::literals; diff --git a/src/singletons/Paths.hpp b/src/singletons/Paths.hpp index 62b1f2c2..aa717d89 100644 --- a/src/singletons/Paths.hpp +++ b/src/singletons/Paths.hpp @@ -1,7 +1,7 @@ #pragma once -#include #include +#include namespace chatterino { diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp index 94773fca..f35efc9d 100644 --- a/src/singletons/Settings.hpp +++ b/src/singletons/Settings.hpp @@ -1,8 +1,5 @@ #pragma once -#include -#include - #include "BaseSettings.hpp" #include "common/Channel.hpp" #include "common/SignalVector.hpp" @@ -16,6 +13,9 @@ #include "widgets/Notebook.hpp" #include "widgets/splits/SplitInput.hpp" +#include +#include + using TimeoutButton = std::pair; namespace chatterino { diff --git a/src/singletons/Theme.hpp b/src/singletons/Theme.hpp index bc8b4a10..92dd5e83 100644 --- a/src/singletons/Theme.hpp +++ b/src/singletons/Theme.hpp @@ -3,9 +3,9 @@ #include "common/Singleton.hpp" #include "util/RapidJsonSerializeQString.hpp" +#include #include #include -#include #include namespace chatterino { diff --git a/src/singletons/Toasts.cpp b/src/singletons/Toasts.cpp index 00a3285f..99740d16 100644 --- a/src/singletons/Toasts.cpp +++ b/src/singletons/Toasts.cpp @@ -4,10 +4,10 @@ #include "common/DownloadManager.hpp" #include "common/NetworkRequest.hpp" #include "controllers/notifications/NotificationController.hpp" +#include "providers/twitch/api/Helix.hpp" #include "providers/twitch/TwitchChannel.hpp" #include "providers/twitch/TwitchCommon.hpp" #include "providers/twitch/TwitchIrcServer.hpp" -#include "providers/twitch/api/Helix.hpp" #include "singletons/Paths.hpp" #include "util/StreamLink.hpp" #include "widgets/helper/CommonTexts.hpp" diff --git a/src/singletons/Updates.cpp b/src/singletons/Updates.cpp index ab50e55e..52c80ec6 100644 --- a/src/singletons/Updates.cpp +++ b/src/singletons/Updates.cpp @@ -1,10 +1,11 @@ #include "Updates.hpp" -#include "Settings.hpp" #include "common/Modes.hpp" #include "common/NetworkRequest.hpp" #include "common/Outcome.hpp" +#include "common/QLogging.hpp" #include "common/Version.hpp" +#include "Settings.hpp" #include "singletons/Paths.hpp" #include "util/CombinePath.hpp" #include "util/PostToThread.hpp" @@ -13,7 +14,6 @@ #include #include #include -#include "common/QLogging.hpp" namespace chatterino { namespace { diff --git a/src/singletons/Updates.hpp b/src/singletons/Updates.hpp index 9ad33b28..0b35f55b 100644 --- a/src/singletons/Updates.hpp +++ b/src/singletons/Updates.hpp @@ -1,7 +1,7 @@ #pragma once -#include #include +#include namespace chatterino { diff --git a/src/singletons/WindowManager.cpp b/src/singletons/WindowManager.cpp index 49b7e58d..c358bdf6 100644 --- a/src/singletons/WindowManager.cpp +++ b/src/singletons/WindowManager.cpp @@ -1,17 +1,5 @@ #include "singletons/WindowManager.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include #include "Application.hpp" #include "common/Args.hpp" #include "common/QLogging.hpp" @@ -28,13 +16,25 @@ #include "util/Clamp.hpp" #include "util/CombinePath.hpp" #include "widgets/AccountSwitchPopup.hpp" -#include "widgets/FramelessEmbedWindow.hpp" -#include "widgets/Notebook.hpp" -#include "widgets/Window.hpp" #include "widgets/dialogs/SettingsDialog.hpp" +#include "widgets/FramelessEmbedWindow.hpp" #include "widgets/helper/NotebookTab.hpp" +#include "widgets/Notebook.hpp" #include "widgets/splits/Split.hpp" #include "widgets/splits/SplitContainer.hpp" +#include "widgets/Window.hpp" + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include namespace chatterino { namespace { diff --git a/src/singletons/WindowManager.hpp b/src/singletons/WindowManager.hpp index 5b3ee7cc..6cac9241 100644 --- a/src/singletons/WindowManager.hpp +++ b/src/singletons/WindowManager.hpp @@ -1,14 +1,14 @@ #pragma once -#include #include "common/Channel.hpp" #include "common/FlagsEnum.hpp" #include "common/Singleton.hpp" #include "common/WindowDescriptors.hpp" - #include "pajlada/settings/settinglistener.hpp" #include "widgets/splits/SplitContainer.hpp" +#include + namespace chatterino { class Settings; diff --git a/src/singletons/helper/GifTimer.hpp b/src/singletons/helper/GifTimer.hpp index d24f2d11..ecb741be 100644 --- a/src/singletons/helper/GifTimer.hpp +++ b/src/singletons/helper/GifTimer.hpp @@ -1,7 +1,7 @@ #pragma once -#include #include +#include namespace chatterino { diff --git a/src/singletons/helper/LoggingChannel.hpp b/src/singletons/helper/LoggingChannel.hpp index e189995d..519dcdaf 100644 --- a/src/singletons/helper/LoggingChannel.hpp +++ b/src/singletons/helper/LoggingChannel.hpp @@ -2,10 +2,10 @@ #include "messages/Message.hpp" +#include #include #include #include -#include #include diff --git a/src/util/Clipboard.cpp b/src/util/Clipboard.cpp index b6875422..8cd60c5a 100644 --- a/src/util/Clipboard.cpp +++ b/src/util/Clipboard.cpp @@ -1,6 +1,6 @@ #include "util/Clipboard.hpp" -#include +#include #include namespace chatterino { diff --git a/src/util/DebugCount.hpp b/src/util/DebugCount.hpp index 99f70217..629cb5fb 100644 --- a/src/util/DebugCount.hpp +++ b/src/util/DebugCount.hpp @@ -2,12 +2,12 @@ #include "common/UniqueAccess.hpp" -#include -#include - #include #include +#include +#include + namespace chatterino { class DebugCount diff --git a/src/util/FunctionEventFilter.hpp b/src/util/FunctionEventFilter.hpp index bde2b51f..d76ef852 100644 --- a/src/util/FunctionEventFilter.hpp +++ b/src/util/FunctionEventFilter.hpp @@ -2,6 +2,7 @@ #include #include + #include namespace chatterino { diff --git a/src/util/LayoutHelper.hpp b/src/util/LayoutHelper.hpp index 1cf7f700..fe8e4614 100644 --- a/src/util/LayoutHelper.hpp +++ b/src/util/LayoutHelper.hpp @@ -1,7 +1,7 @@ #pragma once -#include #include +#include class QWidget; class QScrollArea; diff --git a/src/util/NuulsUploader.cpp b/src/util/NuulsUploader.cpp index f570023f..6063bd30 100644 --- a/src/util/NuulsUploader.cpp +++ b/src/util/NuulsUploader.cpp @@ -2,6 +2,7 @@ #include "common/Env.hpp" #include "common/NetworkRequest.hpp" +#include "common/QLogging.hpp" #include "providers/twitch/TwitchMessageBuilder.hpp" #include "singletons/Paths.hpp" #include "singletons/Settings.hpp" @@ -14,7 +15,6 @@ #include #include #include -#include "common/QLogging.hpp" #define UPLOAD_DELAY 2000 // Delay between uploads in milliseconds diff --git a/src/util/PersistSignalVector.hpp b/src/util/PersistSignalVector.hpp index b1dde778..34aafdf2 100644 --- a/src/util/PersistSignalVector.hpp +++ b/src/util/PersistSignalVector.hpp @@ -1,9 +1,10 @@ #pragma once -#include #include "common/ChatterinoSetting.hpp" #include "common/SignalVector.hpp" +#include + namespace chatterino { template diff --git a/src/util/QObjectRef.hpp b/src/util/QObjectRef.hpp index f434f4a3..07444d08 100644 --- a/src/util/QObjectRef.hpp +++ b/src/util/QObjectRef.hpp @@ -2,6 +2,7 @@ #include #include + #include namespace chatterino { diff --git a/src/util/RapidJsonSerializeQString.hpp b/src/util/RapidJsonSerializeQString.hpp index 1c685d16..320237e5 100644 --- a/src/util/RapidJsonSerializeQString.hpp +++ b/src/util/RapidJsonSerializeQString.hpp @@ -1,7 +1,7 @@ #pragma once -#include #include +#include namespace pajlada { diff --git a/src/util/RapidjsonHelpers.hpp b/src/util/RapidjsonHelpers.hpp index 403bbb58..a14631fb 100644 --- a/src/util/RapidjsonHelpers.hpp +++ b/src/util/RapidjsonHelpers.hpp @@ -2,8 +2,8 @@ #include "util/RapidJsonSerializeQString.hpp" -#include #include +#include #include #include diff --git a/src/util/StreamLink.cpp b/src/util/StreamLink.cpp index ecd6242d..379c2699 100644 --- a/src/util/StreamLink.cpp +++ b/src/util/StreamLink.cpp @@ -1,20 +1,20 @@ #include "util/StreamLink.hpp" #include "Application.hpp" +#include "common/QLogging.hpp" +#include "common/Version.hpp" #include "providers/irc/IrcMessageBuilder.hpp" #include "singletons/Settings.hpp" #include "singletons/WindowManager.hpp" #include "util/Helpers.hpp" #include "util/SplitCommand.hpp" -#include "widgets/Window.hpp" #include "widgets/dialogs/QualityPopup.hpp" #include "widgets/splits/Split.hpp" +#include "widgets/Window.hpp" #include #include #include -#include "common/QLogging.hpp" -#include "common/Version.hpp" #include diff --git a/src/util/StreamerMode.cpp b/src/util/StreamerMode.cpp index 2724ed73..932bdeb6 100644 --- a/src/util/StreamerMode.cpp +++ b/src/util/StreamerMode.cpp @@ -6,17 +6,19 @@ #include "providers/twitch/TwitchIrcServer.hpp" #include "singletons/Settings.hpp" #include "singletons/WindowManager.hpp" -#include "widgets/Notebook.hpp" -#include "widgets/Window.hpp" #include "widgets/helper/NotebookTab.hpp" +#include "widgets/Notebook.hpp" #include "widgets/splits/Split.hpp" +#include "widgets/Window.hpp" #ifdef USEWINSDK +// clang-format off # include # include # include # pragma comment(lib, "Wtsapi32.lib") +// clang-format on #endif #include diff --git a/src/util/WindowsHelper.hpp b/src/util/WindowsHelper.hpp index b40a8270..655cdbb6 100644 --- a/src/util/WindowsHelper.hpp +++ b/src/util/WindowsHelper.hpp @@ -2,8 +2,10 @@ #ifdef USEWINSDK +// clang-format off # include # include +// clang-format on namespace chatterino { diff --git a/src/util/serialize/Container.hpp b/src/util/serialize/Container.hpp index c9e59e5d..66b7f240 100644 --- a/src/util/serialize/Container.hpp +++ b/src/util/serialize/Container.hpp @@ -1,7 +1,7 @@ #pragma once -#include #include +#include #include diff --git a/src/widgets/AccountSwitchPopup.cpp b/src/widgets/AccountSwitchPopup.cpp index e940ef5d..90046b40 100644 --- a/src/widgets/AccountSwitchPopup.cpp +++ b/src/widgets/AccountSwitchPopup.cpp @@ -1,4 +1,5 @@ #include "widgets/AccountSwitchPopup.hpp" + #include "widgets/dialogs/SettingsDialog.hpp" #include diff --git a/src/widgets/AttachedWindow.cpp b/src/widgets/AttachedWindow.cpp index ecae39ec..88a8432d 100644 --- a/src/widgets/AttachedWindow.cpp +++ b/src/widgets/AttachedWindow.cpp @@ -1,23 +1,26 @@ #include "AttachedWindow.hpp" #include "Application.hpp" -#include "ForwardDecl.hpp" #include "common/QLogging.hpp" +#include "ForwardDecl.hpp" #include "singletons/Settings.hpp" #include "util/DebugCount.hpp" #include "widgets/splits/Split.hpp" #include #include + #include #ifdef USEWINSDK +// clang-format off # include "util/WindowsHelper.hpp" # include "Windows.h" // don't even think about reordering these # include "Psapi.h" # pragma comment(lib, "Dwmapi.lib") +// clang-format on #endif namespace chatterino { diff --git a/src/widgets/AttachedWindow.hpp b/src/widgets/AttachedWindow.hpp index 26d3333d..2f477450 100644 --- a/src/widgets/AttachedWindow.hpp +++ b/src/widgets/AttachedWindow.hpp @@ -4,6 +4,7 @@ #include #include + #include namespace chatterino { diff --git a/src/widgets/BaseWidget.cpp b/src/widgets/BaseWidget.cpp index 70aeb34e..c98c425c 100644 --- a/src/widgets/BaseWidget.cpp +++ b/src/widgets/BaseWidget.cpp @@ -11,6 +11,7 @@ #include #include #include + #include namespace chatterino { diff --git a/src/widgets/BaseWidget.hpp b/src/widgets/BaseWidget.hpp index 2b415a1d..8aee5881 100644 --- a/src/widgets/BaseWidget.hpp +++ b/src/widgets/BaseWidget.hpp @@ -1,10 +1,10 @@ #pragma once -#include -#include #include #include #include +#include +#include namespace chatterino { diff --git a/src/widgets/BaseWindow.cpp b/src/widgets/BaseWindow.cpp index ef0ca841..8527c608 100644 --- a/src/widgets/BaseWindow.cpp +++ b/src/widgets/BaseWindow.cpp @@ -6,15 +6,16 @@ #include "util/DebugCount.hpp" #include "util/PostToThread.hpp" #include "util/WindowsHelper.hpp" +#include "widgets/helper/EffectLabel.hpp" #include "widgets/Label.hpp" #include "widgets/TooltipWidget.hpp" -#include "widgets/helper/EffectLabel.hpp" #include #include #include #include #include + #include #ifdef CHATTERINO @@ -23,6 +24,7 @@ #endif #ifdef USEWINSDK +// clang-format off # include # include # include @@ -37,6 +39,7 @@ # include # define WM_DPICHANGED 0x02E0 +// clang-format on #endif #include "widgets/helper/TitlebarButton.hpp" diff --git a/src/widgets/BaseWindow.hpp b/src/widgets/BaseWindow.hpp index 9c9d9bc2..be95d360 100644 --- a/src/widgets/BaseWindow.hpp +++ b/src/widgets/BaseWindow.hpp @@ -1,10 +1,11 @@ #pragma once +#include "common/FlagsEnum.hpp" #include "widgets/BaseWidget.hpp" -#include #include -#include "common/FlagsEnum.hpp" + +#include class QHBoxLayout; struct tagMSG; diff --git a/src/widgets/FramelessEmbedWindow.cpp b/src/widgets/FramelessEmbedWindow.cpp index 482f7c1f..846a0d68 100644 --- a/src/widgets/FramelessEmbedWindow.cpp +++ b/src/widgets/FramelessEmbedWindow.cpp @@ -1,10 +1,11 @@ #include "FramelessEmbedWindow.hpp" -#include #include "Application.hpp" +#include "providers/twitch/TwitchIrcServer.hpp" #include "QJsonDocument" #include "QMessageBox" -#include "providers/twitch/TwitchIrcServer.hpp" + +#include //#include "widgets/helper/ChannelView.hpp" #include "common/Args.hpp" #include "widgets/splits/Split.hpp" diff --git a/src/widgets/Notebook.cpp b/src/widgets/Notebook.cpp index d3088645..0d095da7 100644 --- a/src/widgets/Notebook.cpp +++ b/src/widgets/Notebook.cpp @@ -8,14 +8,15 @@ #include "singletons/Theme.hpp" #include "singletons/WindowManager.hpp" #include "util/InitUpdateButton.hpp" -#include "widgets/Window.hpp" #include "widgets/dialogs/SettingsDialog.hpp" #include "widgets/helper/ChannelView.hpp" #include "widgets/helper/NotebookButton.hpp" #include "widgets/helper/NotebookTab.hpp" #include "widgets/splits/Split.hpp" #include "widgets/splits/SplitContainer.hpp" +#include "widgets/Window.hpp" +#include #include #include #include @@ -24,7 +25,6 @@ #include #include #include -#include namespace chatterino { diff --git a/src/widgets/Notebook.hpp b/src/widgets/Notebook.hpp index 408c4e67..11c96d30 100644 --- a/src/widgets/Notebook.hpp +++ b/src/widgets/Notebook.hpp @@ -3,11 +3,11 @@ #include "pajlada/signals/signal.hpp" #include "widgets/BaseWidget.hpp" +#include #include #include #include #include -#include namespace chatterino { diff --git a/src/widgets/Scrollbar.hpp b/src/widgets/Scrollbar.hpp index 764972d6..9590d50d 100644 --- a/src/widgets/Scrollbar.hpp +++ b/src/widgets/Scrollbar.hpp @@ -4,10 +4,10 @@ #include "widgets/BaseWidget.hpp" #include "widgets/helper/ScrollbarHighlight.hpp" +#include #include #include #include -#include namespace chatterino { diff --git a/src/widgets/TooltipWidget.hpp b/src/widgets/TooltipWidget.hpp index c693f1df..0cb51394 100644 --- a/src/widgets/TooltipWidget.hpp +++ b/src/widgets/TooltipWidget.hpp @@ -2,9 +2,9 @@ #include "widgets/BaseWindow.hpp" +#include #include #include -#include namespace chatterino { diff --git a/src/widgets/Window.cpp b/src/widgets/Window.cpp index 610a5d2e..1e87ec49 100644 --- a/src/widgets/Window.cpp +++ b/src/widgets/Window.cpp @@ -14,23 +14,24 @@ #include "singletons/WindowManager.hpp" #include "util/InitUpdateButton.hpp" #include "widgets/AccountSwitchPopup.hpp" -#include "widgets/Notebook.hpp" #include "widgets/dialogs/SettingsDialog.hpp" +#include "widgets/dialogs/switcher/QuickSwitcherPopup.hpp" #include "widgets/dialogs/UpdateDialog.hpp" #include "widgets/dialogs/WelcomeDialog.hpp" -#include "widgets/dialogs/switcher/QuickSwitcherPopup.hpp" #include "widgets/helper/EffectLabel.hpp" #include "widgets/helper/NotebookTab.hpp" #include "widgets/helper/TitlebarButton.hpp" +#include "widgets/Notebook.hpp" #include "widgets/splits/ClosedSplits.hpp" #include "widgets/splits/Split.hpp" #include "widgets/splits/SplitContainer.hpp" #ifndef NDEBUG -# include # include "providers/twitch/PubSubManager.hpp" # include "providers/twitch/PubSubMessages.hpp" # include "util/SampleData.hpp" + +# include #endif #include diff --git a/src/widgets/dialogs/BadgePickerDialog.cpp b/src/widgets/dialogs/BadgePickerDialog.cpp index a5506c97..16e90040 100644 --- a/src/widgets/dialogs/BadgePickerDialog.cpp +++ b/src/widgets/dialogs/BadgePickerDialog.cpp @@ -1,10 +1,10 @@ #include "BadgePickerDialog.hpp" -#include -#include "singletons/Resources.hpp" #include "providers/twitch/TwitchBadges.hpp" +#include "singletons/Resources.hpp" #include +#include #include namespace chatterino { diff --git a/src/widgets/dialogs/BadgePickerDialog.hpp b/src/widgets/dialogs/BadgePickerDialog.hpp index 67de7f48..8e5f266b 100644 --- a/src/widgets/dialogs/BadgePickerDialog.hpp +++ b/src/widgets/dialogs/BadgePickerDialog.hpp @@ -2,9 +2,10 @@ #include "util/DisplayBadge.hpp" +#include #include #include -#include + #include namespace chatterino { diff --git a/src/widgets/dialogs/ColorPickerDialog.hpp b/src/widgets/dialogs/ColorPickerDialog.hpp index 8b6b616e..ceccad7b 100644 --- a/src/widgets/dialogs/ColorPickerDialog.hpp +++ b/src/widgets/dialogs/ColorPickerDialog.hpp @@ -6,11 +6,10 @@ #include "widgets/helper/QColorPicker.hpp" #include +#include #include -#include - namespace chatterino { /** diff --git a/src/widgets/dialogs/EmotePopup.cpp b/src/widgets/dialogs/EmotePopup.cpp index 9645f8da..7443abe4 100644 --- a/src/widgets/dialogs/EmotePopup.cpp +++ b/src/widgets/dialogs/EmotePopup.cpp @@ -12,10 +12,10 @@ #include "providers/twitch/TwitchIrcServer.hpp" #include "singletons/Emotes.hpp" #include "singletons/WindowManager.hpp" -#include "widgets/Notebook.hpp" -#include "widgets/Scrollbar.hpp" #include "widgets/helper/ChannelView.hpp" #include "widgets/helper/TrimRegExpValidator.hpp" +#include "widgets/Notebook.hpp" +#include "widgets/Scrollbar.hpp" #include #include diff --git a/src/widgets/dialogs/EmotePopup.hpp b/src/widgets/dialogs/EmotePopup.hpp index 8985e520..5b4e11b0 100644 --- a/src/widgets/dialogs/EmotePopup.hpp +++ b/src/widgets/dialogs/EmotePopup.hpp @@ -6,7 +6,6 @@ #include "widgets/Notebook.hpp" #include - #include namespace chatterino { diff --git a/src/widgets/dialogs/IrcConnectionEditor.cpp b/src/widgets/dialogs/IrcConnectionEditor.cpp index c24b3ae8..63e6bfa2 100644 --- a/src/widgets/dialogs/IrcConnectionEditor.cpp +++ b/src/widgets/dialogs/IrcConnectionEditor.cpp @@ -1,4 +1,5 @@ #include "IrcConnectionEditor.hpp" + #include "ui_IrcConnectionEditor.h" namespace chatterino { diff --git a/src/widgets/dialogs/IrcConnectionEditor.hpp b/src/widgets/dialogs/IrcConnectionEditor.hpp index faff91d6..9cad20af 100644 --- a/src/widgets/dialogs/IrcConnectionEditor.hpp +++ b/src/widgets/dialogs/IrcConnectionEditor.hpp @@ -1,10 +1,9 @@ #pragma once -#include - #include "providers/irc/Irc2.hpp" #include "widgets/BaseWindow.hpp" +#include #include namespace Ui { diff --git a/src/widgets/dialogs/LastRunCrashDialog.cpp b/src/widgets/dialogs/LastRunCrashDialog.cpp index 7fb9d1f4..f3dc7792 100644 --- a/src/widgets/dialogs/LastRunCrashDialog.cpp +++ b/src/widgets/dialogs/LastRunCrashDialog.cpp @@ -1,14 +1,14 @@ #include "LastRunCrashDialog.hpp" +#include "singletons/Updates.hpp" +#include "util/LayoutCreator.hpp" +#include "util/PostToThread.hpp" + #include #include #include #include -#include "singletons/Updates.hpp" -#include "util/LayoutCreator.hpp" -#include "util/PostToThread.hpp" - namespace chatterino { LastRunCrashDialog::LastRunCrashDialog() diff --git a/src/widgets/dialogs/LastRunCrashDialog.hpp b/src/widgets/dialogs/LastRunCrashDialog.hpp index 22297484..ebd1e3a4 100644 --- a/src/widgets/dialogs/LastRunCrashDialog.hpp +++ b/src/widgets/dialogs/LastRunCrashDialog.hpp @@ -1,7 +1,7 @@ #pragma once -#include #include +#include namespace chatterino { diff --git a/src/widgets/dialogs/LoginDialog.cpp b/src/widgets/dialogs/LoginDialog.cpp index f4b1fa15..7a7fbaee 100644 --- a/src/widgets/dialogs/LoginDialog.cpp +++ b/src/widgets/dialogs/LoginDialog.cpp @@ -12,12 +12,12 @@ # include #endif +#include #include #include #include #include #include -#include namespace chatterino { diff --git a/src/widgets/dialogs/LoginDialog.hpp b/src/widgets/dialogs/LoginDialog.hpp index fadd86fe..d26b4a85 100644 --- a/src/widgets/dialogs/LoginDialog.hpp +++ b/src/widgets/dialogs/LoginDialog.hpp @@ -14,8 +14,8 @@ #include #include #include -#include #include +#include namespace chatterino { diff --git a/src/widgets/dialogs/NotificationPopup.cpp b/src/widgets/dialogs/NotificationPopup.cpp index 0e73969c..4df95c44 100644 --- a/src/widgets/dialogs/NotificationPopup.cpp +++ b/src/widgets/dialogs/NotificationPopup.cpp @@ -7,7 +7,6 @@ #include #include #include - #include namespace chatterino { diff --git a/src/widgets/dialogs/QualityPopup.cpp b/src/widgets/dialogs/QualityPopup.cpp index 52f7dba4..09229241 100644 --- a/src/widgets/dialogs/QualityPopup.cpp +++ b/src/widgets/dialogs/QualityPopup.cpp @@ -1,4 +1,5 @@ #include "QualityPopup.hpp" + #include "Application.hpp" #include "common/QLogging.hpp" #include "singletons/WindowManager.hpp" diff --git a/src/widgets/dialogs/ReplyThreadPopup.cpp b/src/widgets/dialogs/ReplyThreadPopup.cpp index 2e3cf25b..999ba994 100644 --- a/src/widgets/dialogs/ReplyThreadPopup.cpp +++ b/src/widgets/dialogs/ReplyThreadPopup.cpp @@ -6,9 +6,9 @@ #include "controllers/hotkeys/HotkeyController.hpp" #include "messages/MessageThread.hpp" #include "util/LayoutCreator.hpp" -#include "widgets/Scrollbar.hpp" #include "widgets/helper/ChannelView.hpp" #include "widgets/helper/ResizingTextEdit.hpp" +#include "widgets/Scrollbar.hpp" #include "widgets/splits/Split.hpp" #include "widgets/splits/SplitInput.hpp" diff --git a/src/widgets/dialogs/SelectChannelDialog.cpp b/src/widgets/dialogs/SelectChannelDialog.cpp index c83ea83e..8b2d5605 100644 --- a/src/widgets/dialogs/SelectChannelDialog.cpp +++ b/src/widgets/dialogs/SelectChannelDialog.cpp @@ -3,26 +3,24 @@ #include "Application.hpp" #include "common/QLogging.hpp" #include "controllers/hotkeys/HotkeyController.hpp" +#include "providers/irc/Irc2.hpp" #include "providers/twitch/TwitchIrcServer.hpp" #include "singletons/Theme.hpp" #include "util/LayoutCreator.hpp" -#include "widgets/Notebook.hpp" #include "widgets/dialogs/IrcConnectionEditor.hpp" +#include "widgets/helper/EditableModelView.hpp" #include "widgets/helper/NotebookTab.hpp" +#include "widgets/Notebook.hpp" #include #include #include +#include #include #include -#include - -#include -#include "providers/irc/Irc2.hpp" -#include "widgets/helper/EditableModelView.hpp" - -#include #include +#include +#include #define TAB_TWITCH 0 #define TAB_IRC 1 diff --git a/src/widgets/dialogs/SelectChannelDialog.hpp b/src/widgets/dialogs/SelectChannelDialog.hpp index 707ef32c..493a41f8 100644 --- a/src/widgets/dialogs/SelectChannelDialog.hpp +++ b/src/widgets/dialogs/SelectChannelDialog.hpp @@ -5,11 +5,9 @@ #include "widgets/BaseWindow.hpp" #include - #include -#include - #include +#include namespace chatterino { diff --git a/src/widgets/dialogs/SettingsDialog.hpp b/src/widgets/dialogs/SettingsDialog.hpp index b4705bc9..27789920 100644 --- a/src/widgets/dialogs/SettingsDialog.hpp +++ b/src/widgets/dialogs/SettingsDialog.hpp @@ -1,16 +1,16 @@ #pragma once #include "widgets/BaseWindow.hpp" +#include "widgets/helper/SettingsDialogTab.hpp" +#include +#include #include #include #include #include -#include -#include -#include "widgets/helper/SettingsDialogTab.hpp" -#include +#include class QLineEdit; diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp index 271c311d..893b20b8 100644 --- a/src/widgets/dialogs/UserInfoPopup.cpp +++ b/src/widgets/dialogs/UserInfoPopup.cpp @@ -10,9 +10,9 @@ #include "messages/Message.hpp" #include "messages/MessageBuilder.hpp" #include "providers/IvrApi.hpp" +#include "providers/twitch/api/Helix.hpp" #include "providers/twitch/TwitchChannel.hpp" #include "providers/twitch/TwitchIrcServer.hpp" -#include "providers/twitch/api/Helix.hpp" #include "singletons/Resources.hpp" #include "singletons/Settings.hpp" #include "singletons/Theme.hpp" @@ -22,13 +22,13 @@ #include "util/LayoutCreator.hpp" #include "util/PostToThread.hpp" #include "util/StreamerMode.hpp" -#include "widgets/Label.hpp" -#include "widgets/Scrollbar.hpp" -#include "widgets/Window.hpp" #include "widgets/helper/ChannelView.hpp" #include "widgets/helper/EffectLabel.hpp" #include "widgets/helper/Line.hpp" +#include "widgets/Label.hpp" +#include "widgets/Scrollbar.hpp" #include "widgets/splits/Split.hpp" +#include "widgets/Window.hpp" #include #include diff --git a/src/widgets/dialogs/switcher/NewPopupItem.cpp b/src/widgets/dialogs/switcher/NewPopupItem.cpp index 829d5d4a..cb008b84 100644 --- a/src/widgets/dialogs/switcher/NewPopupItem.cpp +++ b/src/widgets/dialogs/switcher/NewPopupItem.cpp @@ -5,10 +5,10 @@ #include "singletons/Fonts.hpp" #include "singletons/Theme.hpp" #include "singletons/WindowManager.hpp" -#include "widgets/Notebook.hpp" -#include "widgets/Window.hpp" #include "widgets/helper/NotebookTab.hpp" +#include "widgets/Notebook.hpp" #include "widgets/splits/Split.hpp" +#include "widgets/Window.hpp" namespace chatterino { diff --git a/src/widgets/dialogs/switcher/NewTabItem.cpp b/src/widgets/dialogs/switcher/NewTabItem.cpp index 1dd55ff6..69203f68 100644 --- a/src/widgets/dialogs/switcher/NewTabItem.cpp +++ b/src/widgets/dialogs/switcher/NewTabItem.cpp @@ -5,10 +5,10 @@ #include "singletons/Fonts.hpp" #include "singletons/Theme.hpp" #include "singletons/WindowManager.hpp" -#include "widgets/Notebook.hpp" -#include "widgets/Window.hpp" #include "widgets/helper/NotebookTab.hpp" +#include "widgets/Notebook.hpp" #include "widgets/splits/Split.hpp" +#include "widgets/Window.hpp" namespace chatterino { diff --git a/src/widgets/dialogs/switcher/QuickSwitcherModel.hpp b/src/widgets/dialogs/switcher/QuickSwitcherModel.hpp index be1a9c4a..cfa9448b 100644 --- a/src/widgets/dialogs/switcher/QuickSwitcherModel.hpp +++ b/src/widgets/dialogs/switcher/QuickSwitcherModel.hpp @@ -1,8 +1,9 @@ #pragma once -#include #include "widgets/listview/GenericListModel.hpp" +#include + namespace chatterino { using QuickSwitcherModel = GenericListModel; diff --git a/src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp b/src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp index 5447bd1d..06fce006 100644 --- a/src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp +++ b/src/widgets/dialogs/switcher/QuickSwitcherPopup.cpp @@ -4,13 +4,13 @@ #include "singletons/Theme.hpp" #include "singletons/WindowManager.hpp" #include "util/LayoutCreator.hpp" -#include "widgets/Notebook.hpp" -#include "widgets/Window.hpp" #include "widgets/dialogs/switcher/NewPopupItem.hpp" #include "widgets/dialogs/switcher/NewTabItem.hpp" #include "widgets/dialogs/switcher/SwitchSplitItem.hpp" #include "widgets/helper/NotebookTab.hpp" #include "widgets/listview/GenericListView.hpp" +#include "widgets/Notebook.hpp" +#include "widgets/Window.hpp" namespace chatterino { diff --git a/src/widgets/dialogs/switcher/QuickSwitcherPopup.hpp b/src/widgets/dialogs/switcher/QuickSwitcherPopup.hpp index 44c2b709..955f3f2d 100644 --- a/src/widgets/dialogs/switcher/QuickSwitcherPopup.hpp +++ b/src/widgets/dialogs/switcher/QuickSwitcherPopup.hpp @@ -6,10 +6,10 @@ #include "widgets/splits/Split.hpp" #include "widgets/splits/SplitContainer.hpp" -#include - #include +#include + namespace chatterino { class GenericListView; diff --git a/src/widgets/dialogs/switcher/SwitchSplitItem.hpp b/src/widgets/dialogs/switcher/SwitchSplitItem.hpp index 4baf421f..142d2582 100644 --- a/src/widgets/dialogs/switcher/SwitchSplitItem.hpp +++ b/src/widgets/dialogs/switcher/SwitchSplitItem.hpp @@ -1,12 +1,11 @@ #pragma once -#include "widgets/dialogs/switcher/AbstractSwitcherItem.hpp" - #include "singletons/WindowManager.hpp" -#include "widgets/Notebook.hpp" -#include "widgets/Window.hpp" +#include "widgets/dialogs/switcher/AbstractSwitcherItem.hpp" #include "widgets/helper/NotebookTab.hpp" +#include "widgets/Notebook.hpp" #include "widgets/splits/Split.hpp" +#include "widgets/Window.hpp" namespace chatterino { diff --git a/src/widgets/helper/Button.cpp b/src/widgets/helper/Button.cpp index 43c94366..9f371a49 100644 --- a/src/widgets/helper/Button.cpp +++ b/src/widgets/helper/Button.cpp @@ -1,13 +1,13 @@ #include "Button.hpp" +#include "singletons/Theme.hpp" +#include "util/FunctionEventFilter.hpp" + #include #include #include #include -#include "singletons/Theme.hpp" -#include "util/FunctionEventFilter.hpp" - namespace chatterino { namespace { diff --git a/src/widgets/helper/Button.hpp b/src/widgets/helper/Button.hpp index e0698b1e..79ca9576 100644 --- a/src/widgets/helper/Button.hpp +++ b/src/widgets/helper/Button.hpp @@ -1,9 +1,8 @@ #pragma once -#include - #include "widgets/BaseWidget.hpp" +#include #include #include #include diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp index b88a93dc..81ba6d4a 100644 --- a/src/widgets/helper/ChannelView.cpp +++ b/src/widgets/helper/ChannelView.cpp @@ -1,22 +1,5 @@ #include "ChannelView.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "Application.hpp" #include "common/Common.hpp" #include "common/QLogging.hpp" @@ -24,12 +7,12 @@ #include "controllers/commands/CommandController.hpp" #include "debug/Benchmark.hpp" #include "messages/Emote.hpp" +#include "messages/layouts/MessageLayout.hpp" +#include "messages/layouts/MessageLayoutElement.hpp" #include "messages/LimitedQueueSnapshot.hpp" #include "messages/Message.hpp" #include "messages/MessageBuilder.hpp" #include "messages/MessageElement.hpp" -#include "messages/layouts/MessageLayout.hpp" -#include "messages/layouts/MessageLayoutElement.hpp" #include "providers/LinkResolver.hpp" #include "providers/twitch/TwitchChannel.hpp" #include "providers/twitch/TwitchIrcServer.hpp" @@ -44,16 +27,34 @@ #include "util/IncognitoBrowser.hpp" #include "util/StreamerMode.hpp" #include "util/Twitch.hpp" -#include "widgets/Scrollbar.hpp" -#include "widgets/TooltipWidget.hpp" -#include "widgets/Window.hpp" #include "widgets/dialogs/ReplyThreadPopup.hpp" #include "widgets/dialogs/SettingsDialog.hpp" #include "widgets/dialogs/UserInfoPopup.hpp" #include "widgets/helper/EffectLabel.hpp" #include "widgets/helper/SearchPopup.hpp" +#include "widgets/Scrollbar.hpp" #include "widgets/splits/Split.hpp" #include "widgets/splits/SplitInput.hpp" +#include "widgets/TooltipWidget.hpp" +#include "widgets/Window.hpp" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include #define DRAW_WIDTH (this->width()) #define SELECTION_RESUME_SCROLLING_MSG_THRESHOLD 3 diff --git a/src/widgets/helper/ChannelView.hpp b/src/widgets/helper/ChannelView.hpp index 3562169f..9fae53e4 100644 --- a/src/widgets/helper/ChannelView.hpp +++ b/src/widgets/helper/ChannelView.hpp @@ -1,15 +1,5 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "common/FlagsEnum.hpp" #include "controllers/filters/FilterSet.hpp" #include "messages/Image.hpp" @@ -18,6 +8,17 @@ #include "messages/Selection.hpp" #include "widgets/BaseWidget.hpp" +#include +#include +#include +#include +#include +#include +#include + +#include +#include + namespace chatterino { enum class HighlightState; diff --git a/src/widgets/helper/EditableModelView.cpp b/src/widgets/helper/EditableModelView.cpp index f331cdd1..1a81852d 100644 --- a/src/widgets/helper/EditableModelView.cpp +++ b/src/widgets/helper/EditableModelView.cpp @@ -1,17 +1,17 @@ #include "EditableModelView.hpp" + #include "widgets/helper/RegExpItemDelegate.hpp" #include #include #include #include +#include #include #include #include #include -#include - namespace chatterino { EditableModelView::EditableModelView(QAbstractTableModel *model, bool movable) diff --git a/src/widgets/helper/EditableModelView.hpp b/src/widgets/helper/EditableModelView.hpp index bfaf049f..64c6783f 100644 --- a/src/widgets/helper/EditableModelView.hpp +++ b/src/widgets/helper/EditableModelView.hpp @@ -1,8 +1,7 @@ #pragma once -#include - #include +#include class QAbstractTableModel; class QTableView; diff --git a/src/widgets/helper/EffectLabel.hpp b/src/widgets/helper/EffectLabel.hpp index ea13671a..f1fbc5df 100644 --- a/src/widgets/helper/EffectLabel.hpp +++ b/src/widgets/helper/EffectLabel.hpp @@ -1,9 +1,9 @@ #pragma once #include "widgets/BaseWidget.hpp" -#include "widgets/Label.hpp" #include "widgets/helper/Button.hpp" #include "widgets/helper/SignalLabel.hpp" +#include "widgets/Label.hpp" #include #include diff --git a/src/widgets/helper/NotebookButton.cpp b/src/widgets/helper/NotebookButton.cpp index bb8342fa..64bf0391 100644 --- a/src/widgets/helper/NotebookButton.cpp +++ b/src/widgets/helper/NotebookButton.cpp @@ -1,17 +1,17 @@ #include "widgets/helper/NotebookButton.hpp" + #include "singletons/Theme.hpp" -#include "widgets/Notebook.hpp" #include "widgets/helper/Button.hpp" +#include "widgets/Notebook.hpp" #include "widgets/splits/Split.hpp" #include "widgets/splits/SplitContainer.hpp" +#include #include #include #include #include -#include - #define nuuls nullptr namespace chatterino { diff --git a/src/widgets/helper/NotebookTab.cpp b/src/widgets/helper/NotebookTab.cpp index 9aea1a18..732da815 100644 --- a/src/widgets/helper/NotebookTab.cpp +++ b/src/widgets/helper/NotebookTab.cpp @@ -10,19 +10,19 @@ #include "singletons/WindowManager.hpp" #include "util/Clamp.hpp" #include "util/Helpers.hpp" -#include "widgets/Notebook.hpp" #include "widgets/dialogs/SettingsDialog.hpp" +#include "widgets/Notebook.hpp" #include "widgets/splits/SplitContainer.hpp" +#include #include #include #include #include -#include #include +#include #include #include -#include namespace chatterino { namespace { diff --git a/src/widgets/helper/NotebookTab.hpp b/src/widgets/helper/NotebookTab.hpp index 6fd4db9e..31e7563c 100644 --- a/src/widgets/helper/NotebookTab.hpp +++ b/src/widgets/helper/NotebookTab.hpp @@ -2,13 +2,13 @@ #include "common/Common.hpp" #include "widgets/BaseWidget.hpp" -#include "widgets/Notebook.hpp" #include "widgets/helper/Button.hpp" +#include "widgets/Notebook.hpp" -#include -#include #include #include +#include +#include namespace chatterino { diff --git a/src/widgets/helper/QColorPicker.cpp b/src/widgets/helper/QColorPicker.cpp index a50f6e92..50086efc 100644 --- a/src/widgets/helper/QColorPicker.cpp +++ b/src/widgets/helper/QColorPicker.cpp @@ -38,11 +38,10 @@ ****************************************************************************/ #include "widgets/helper/QColorPicker.hpp" +#include #include #include -#include - /* * These classes are literally copied from the Qt source. * Unfortunately, they are private to the QColorDialog class so we cannot use diff --git a/src/widgets/helper/ResizingTextEdit.hpp b/src/widgets/helper/ResizingTextEdit.hpp index 4b371e9a..71d4d152 100644 --- a/src/widgets/helper/ResizingTextEdit.hpp +++ b/src/widgets/helper/ResizingTextEdit.hpp @@ -1,9 +1,9 @@ #pragma once +#include #include #include #include -#include namespace chatterino { diff --git a/src/widgets/helper/ScrollbarHighlight.hpp b/src/widgets/helper/ScrollbarHighlight.hpp index fb08286c..420f2caa 100644 --- a/src/widgets/helper/ScrollbarHighlight.hpp +++ b/src/widgets/helper/ScrollbarHighlight.hpp @@ -1,9 +1,9 @@ #pragma once -#include - #include +#include + namespace chatterino { class ScrollbarHighlight diff --git a/src/widgets/helper/SearchPopup.cpp b/src/widgets/helper/SearchPopup.cpp index 5c42d920..c8aecb15 100644 --- a/src/widgets/helper/SearchPopup.cpp +++ b/src/widgets/helper/SearchPopup.cpp @@ -1,9 +1,5 @@ #include "SearchPopup.hpp" -#include -#include -#include - #include "common/Channel.hpp" #include "controllers/hotkeys/HotkeyController.hpp" #include "messages/search/AuthorPredicate.hpp" @@ -17,6 +13,10 @@ #include "singletons/WindowManager.hpp" #include "widgets/helper/ChannelView.hpp" +#include +#include +#include + namespace chatterino { ChannelPtr SearchPopup::filter(const QString &text, const QString &channelName, diff --git a/src/widgets/helper/SearchPopup.hpp b/src/widgets/helper/SearchPopup.hpp index 7a0b3677..e95fcf0c 100644 --- a/src/widgets/helper/SearchPopup.hpp +++ b/src/widgets/helper/SearchPopup.hpp @@ -1,7 +1,7 @@ #pragma once -#include "ForwardDecl.hpp" #include "controllers/filters/FilterSet.hpp" +#include "ForwardDecl.hpp" #include "messages/LimitedQueueSnapshot.hpp" #include "messages/search/MessagePredicate.hpp" #include "widgets/BasePopup.hpp" diff --git a/src/widgets/helper/SettingsDialogTab.cpp b/src/widgets/helper/SettingsDialogTab.cpp index 2b54a256..ca8d7caa 100644 --- a/src/widgets/helper/SettingsDialogTab.cpp +++ b/src/widgets/helper/SettingsDialogTab.cpp @@ -1,4 +1,5 @@ #include "widgets/helper/SettingsDialogTab.hpp" + #include "widgets/dialogs/SettingsDialog.hpp" #include "widgets/settingspages/SettingsPage.hpp" diff --git a/src/widgets/helper/SettingsDialogTab.hpp b/src/widgets/helper/SettingsDialogTab.hpp index 97c17f93..a6c72bdb 100644 --- a/src/widgets/helper/SettingsDialogTab.hpp +++ b/src/widgets/helper/SettingsDialogTab.hpp @@ -5,6 +5,7 @@ #include #include #include + #include namespace chatterino { diff --git a/src/widgets/helper/TitlebarButton.cpp b/src/widgets/helper/TitlebarButton.cpp index 1d9a2b81..b4d85939 100644 --- a/src/widgets/helper/TitlebarButton.cpp +++ b/src/widgets/helper/TitlebarButton.cpp @@ -1,9 +1,9 @@ #include "TitlebarButton.hpp" -#include - #include "singletons/Theme.hpp" +#include + namespace chatterino { TitleBarButton::TitleBarButton() diff --git a/src/widgets/listview/GenericListModel.hpp b/src/widgets/listview/GenericListModel.hpp index 1765dc86..ae64f285 100644 --- a/src/widgets/listview/GenericListModel.hpp +++ b/src/widgets/listview/GenericListModel.hpp @@ -2,6 +2,7 @@ #include #include + #include namespace chatterino { diff --git a/src/widgets/settingspages/AccountsPage.cpp b/src/widgets/settingspages/AccountsPage.cpp index e6991851..9b2abb8a 100644 --- a/src/widgets/settingspages/AccountsPage.cpp +++ b/src/widgets/settingspages/AccountsPage.cpp @@ -12,6 +12,7 @@ #include #include #include + #include namespace chatterino { diff --git a/src/widgets/settingspages/CommandPage.cpp b/src/widgets/settingspages/CommandPage.cpp index a202f46a..fd971b9e 100644 --- a/src/widgets/settingspages/CommandPage.cpp +++ b/src/widgets/settingspages/CommandPage.cpp @@ -1,18 +1,18 @@ #include "CommandPage.hpp" -#include -#include -#include -#include -#include -#include - #include "Application.hpp" #include "controllers/commands/CommandController.hpp" #include "controllers/commands/CommandModel.hpp" #include "util/LayoutCreator.hpp" #include "util/StandardItemHelper.hpp" #include "widgets/helper/EditableModelView.hpp" + +#include +#include +#include +#include +#include +#include //#include "widgets/helper/ComboBoxItemDelegate.hpp" #include "util/CombinePath.hpp" #include "util/Qt.hpp" diff --git a/src/widgets/settingspages/CommandPage.hpp b/src/widgets/settingspages/CommandPage.hpp index ab967c96..ea97440b 100644 --- a/src/widgets/settingspages/CommandPage.hpp +++ b/src/widgets/settingspages/CommandPage.hpp @@ -1,10 +1,10 @@ #pragma once +#include "widgets/settingspages/SettingsPage.hpp" + #include #include -#include "widgets/settingspages/SettingsPage.hpp" - namespace chatterino { class CommandPage : public SettingsPage diff --git a/src/widgets/settingspages/FiltersPage.cpp b/src/widgets/settingspages/FiltersPage.cpp index 245fc8fd..d4262064 100644 --- a/src/widgets/settingspages/FiltersPage.cpp +++ b/src/widgets/settingspages/FiltersPage.cpp @@ -4,13 +4,12 @@ #include "singletons/Settings.hpp" #include "singletons/WindowManager.hpp" #include "util/LayoutCreator.hpp" -#include "widgets/Window.hpp" #include "widgets/dialogs/ChannelFilterEditorDialog.hpp" #include "widgets/helper/EditableModelView.hpp" - -#include +#include "widgets/Window.hpp" #include +#include #define FILTERS_DOCUMENTATION "https://wiki.chatterino.com/Filters" diff --git a/src/widgets/settingspages/GeneralPageView.hpp b/src/widgets/settingspages/GeneralPageView.hpp index bbfded9f..fcc51eb6 100644 --- a/src/widgets/settingspages/GeneralPageView.hpp +++ b/src/widgets/settingspages/GeneralPageView.hpp @@ -1,15 +1,15 @@ #pragma once -#include -#include -#include #include "Application.hpp" #include "common/ChatterinoSetting.hpp" #include "singletons/WindowManager.hpp" #include "widgets/helper/SignalLabel.hpp" +#include +#include #include #include +#include #include #include diff --git a/src/widgets/settingspages/HighlightingPage.cpp b/src/widgets/settingspages/HighlightingPage.cpp index 02d45f2f..5adfd27a 100644 --- a/src/widgets/settingspages/HighlightingPage.cpp +++ b/src/widgets/settingspages/HighlightingPage.cpp @@ -17,8 +17,8 @@ #include #include #include -#include #include +#include #include #define ENABLE_HIGHLIGHTS "Enable Highlighting" diff --git a/src/widgets/settingspages/ModerationPage.cpp b/src/widgets/settingspages/ModerationPage.cpp index cb4b3e62..41b70f14 100644 --- a/src/widgets/settingspages/ModerationPage.cpp +++ b/src/widgets/settingspages/ModerationPage.cpp @@ -17,9 +17,9 @@ #include #include #include +#include #include #include -#include namespace chatterino { diff --git a/src/widgets/settingspages/ModerationPage.hpp b/src/widgets/settingspages/ModerationPage.hpp index 0e919d98..24662ec0 100644 --- a/src/widgets/settingspages/ModerationPage.hpp +++ b/src/widgets/settingspages/ModerationPage.hpp @@ -1,9 +1,9 @@ #pragma once -#include - #include "widgets/settingspages/SettingsPage.hpp" +#include + class QTabWidget; class QPushButton; diff --git a/src/widgets/settingspages/NicknamesPage.cpp b/src/widgets/settingspages/NicknamesPage.cpp index d328ac4b..277007f6 100644 --- a/src/widgets/settingspages/NicknamesPage.cpp +++ b/src/widgets/settingspages/NicknamesPage.cpp @@ -4,12 +4,11 @@ #include "singletons/Settings.hpp" #include "singletons/WindowManager.hpp" #include "util/LayoutCreator.hpp" -#include "widgets/Window.hpp" #include "widgets/helper/EditableModelView.hpp" - -#include +#include "widgets/Window.hpp" #include +#include namespace chatterino { diff --git a/src/widgets/settingspages/SettingsPage.hpp b/src/widgets/settingspages/SettingsPage.hpp index 47b125e0..1a12af1f 100644 --- a/src/widgets/settingspages/SettingsPage.hpp +++ b/src/widgets/settingspages/SettingsPage.hpp @@ -1,16 +1,15 @@ #pragma once -#include -#include -#include -#include -#include - #include "singletons/Settings.hpp" +#include +#include +#include #include +#include #include #include +#include #define SETTINGS_PAGE_WIDGET_BOILERPLATE(type, parent) \ class type : public parent \ diff --git a/src/widgets/splits/ClosedSplits.hpp b/src/widgets/splits/ClosedSplits.hpp index 079b74f8..de692a67 100644 --- a/src/widgets/splits/ClosedSplits.hpp +++ b/src/widgets/splits/ClosedSplits.hpp @@ -4,6 +4,7 @@ #include "widgets/helper/NotebookTab.hpp" #include + #include #include #include diff --git a/src/widgets/splits/InputCompletionItem.hpp b/src/widgets/splits/InputCompletionItem.hpp index 9ea1260a..30707463 100644 --- a/src/widgets/splits/InputCompletionItem.hpp +++ b/src/widgets/splits/InputCompletionItem.hpp @@ -1,9 +1,10 @@ #pragma once -#include #include "messages/Emote.hpp" #include "widgets/listview/GenericListItem.hpp" +#include + namespace chatterino { class InputCompletionItem : public GenericListItem diff --git a/src/widgets/splits/InputCompletionPopup.hpp b/src/widgets/splits/InputCompletionPopup.hpp index 6329a8a6..7a7937f0 100644 --- a/src/widgets/splits/InputCompletionPopup.hpp +++ b/src/widgets/splits/InputCompletionPopup.hpp @@ -1,10 +1,11 @@ #pragma once -#include #include "common/Channel.hpp" #include "widgets/BasePopup.hpp" #include "widgets/listview/GenericListModel.hpp" +#include + namespace chatterino { class GenericListView; diff --git a/src/widgets/splits/Split.cpp b/src/widgets/splits/Split.cpp index d7c16a96..c8e9e35a 100644 --- a/src/widgets/splits/Split.cpp +++ b/src/widgets/splits/Split.cpp @@ -22,10 +22,6 @@ #include "util/Helpers.hpp" #include "util/NuulsUploader.hpp" #include "util/StreamLink.hpp" -#include "widgets/Notebook.hpp" -#include "widgets/Scrollbar.hpp" -#include "widgets/TooltipWidget.hpp" -#include "widgets/Window.hpp" #include "widgets/dialogs/QualityPopup.hpp" #include "widgets/dialogs/SelectChannelDialog.hpp" #include "widgets/dialogs/SelectChannelFiltersDialog.hpp" @@ -35,10 +31,14 @@ #include "widgets/helper/NotebookTab.hpp" #include "widgets/helper/ResizingTextEdit.hpp" #include "widgets/helper/SearchPopup.hpp" +#include "widgets/Notebook.hpp" +#include "widgets/Scrollbar.hpp" #include "widgets/splits/SplitContainer.hpp" #include "widgets/splits/SplitHeader.hpp" #include "widgets/splits/SplitInput.hpp" #include "widgets/splits/SplitOverlay.hpp" +#include "widgets/TooltipWidget.hpp" +#include "widgets/Window.hpp" #include #include diff --git a/src/widgets/splits/Split.hpp b/src/widgets/splits/Split.hpp index 25190a79..9727400b 100644 --- a/src/widgets/splits/Split.hpp +++ b/src/widgets/splits/Split.hpp @@ -6,11 +6,11 @@ #include "pajlada/signals/signalholder.hpp" #include "widgets/BaseWidget.hpp" +#include #include #include #include #include -#include namespace chatterino { diff --git a/src/widgets/splits/SplitContainer.cpp b/src/widgets/splits/SplitContainer.cpp index 42437b30..9f72631f 100644 --- a/src/widgets/splits/SplitContainer.cpp +++ b/src/widgets/splits/SplitContainer.cpp @@ -8,13 +8,14 @@ #include "singletons/WindowManager.hpp" #include "util/Helpers.hpp" #include "util/LayoutCreator.hpp" -#include "widgets/Notebook.hpp" -#include "widgets/Window.hpp" #include "widgets/helper/ChannelView.hpp" #include "widgets/helper/NotebookTab.hpp" +#include "widgets/Notebook.hpp" #include "widgets/splits/ClosedSplits.hpp" #include "widgets/splits/Split.hpp" +#include "widgets/Window.hpp" +#include #include #include #include @@ -25,8 +26,8 @@ #include #include #include + #include -#include namespace chatterino { diff --git a/src/widgets/splits/SplitContainer.hpp b/src/widgets/splits/SplitContainer.hpp index 3923c489..bab73e31 100644 --- a/src/widgets/splits/SplitContainer.hpp +++ b/src/widgets/splits/SplitContainer.hpp @@ -3,6 +3,8 @@ #include "common/WindowDescriptors.hpp" #include "widgets/BaseWidget.hpp" +#include +#include #include #include #include @@ -12,8 +14,6 @@ #include #include -#include -#include #include #include diff --git a/src/widgets/splits/SplitHeader.cpp b/src/widgets/splits/SplitHeader.cpp index b782e72a..fe7a72f3 100644 --- a/src/widgets/splits/SplitHeader.cpp +++ b/src/widgets/splits/SplitHeader.cpp @@ -18,13 +18,13 @@ #include "util/LayoutCreator.hpp" #include "util/LayoutHelper.hpp" #include "util/StreamerMode.hpp" -#include "widgets/Label.hpp" -#include "widgets/TooltipWidget.hpp" #include "widgets/dialogs/SettingsDialog.hpp" #include "widgets/helper/CommonTexts.hpp" #include "widgets/helper/EffectLabel.hpp" +#include "widgets/Label.hpp" #include "widgets/splits/Split.hpp" #include "widgets/splits/SplitContainer.hpp" +#include "widgets/TooltipWidget.hpp" #include #include @@ -33,6 +33,7 @@ #include #include #include + #include #ifdef USEWEBENGINE diff --git a/src/widgets/splits/SplitHeader.hpp b/src/widgets/splits/SplitHeader.hpp index f242f0ea..a9a8a189 100644 --- a/src/widgets/splits/SplitHeader.hpp +++ b/src/widgets/splits/SplitHeader.hpp @@ -2,13 +2,13 @@ #include "widgets/BaseWidget.hpp" -#include -#include -#include #include #include #include #include +#include +#include +#include #include #include diff --git a/src/widgets/splits/SplitInput.cpp b/src/widgets/splits/SplitInput.cpp index 053d7591..e92f5d58 100644 --- a/src/widgets/splits/SplitInput.cpp +++ b/src/widgets/splits/SplitInput.cpp @@ -12,22 +12,22 @@ #include "util/Clamp.hpp" #include "util/Helpers.hpp" #include "util/LayoutCreator.hpp" -#include "widgets/Notebook.hpp" -#include "widgets/Scrollbar.hpp" #include "widgets/dialogs/EmotePopup.hpp" #include "widgets/helper/ChannelView.hpp" #include "widgets/helper/EffectLabel.hpp" #include "widgets/helper/ResizingTextEdit.hpp" +#include "widgets/Notebook.hpp" +#include "widgets/Scrollbar.hpp" #include "widgets/splits/InputCompletionPopup.hpp" #include "widgets/splits/Split.hpp" #include "widgets/splits/SplitContainer.hpp" #include "widgets/splits/SplitInput.hpp" -#include - #include #include +#include + namespace chatterino { SplitInput::SplitInput(Split *_chatWidget, bool enableInlineReplying) diff --git a/src/widgets/splits/SplitInput.hpp b/src/widgets/splits/SplitInput.hpp index 1cba4140..ae3afd63 100644 --- a/src/widgets/splits/SplitInput.hpp +++ b/src/widgets/splits/SplitInput.hpp @@ -11,6 +11,7 @@ #include #include #include + #include namespace chatterino { diff --git a/src/widgets/splits/SplitOverlay.cpp b/src/widgets/splits/SplitOverlay.cpp index ca2a1c63..3ddf0220 100644 --- a/src/widgets/splits/SplitOverlay.cpp +++ b/src/widgets/splits/SplitOverlay.cpp @@ -1,5 +1,11 @@ #include "SplitOverlay.hpp" +#include "Application.hpp" +#include "singletons/Resources.hpp" +#include "singletons/Theme.hpp" +#include "widgets/splits/Split.hpp" +#include "widgets/splits/SplitContainer.hpp" + #include #include #include @@ -8,12 +14,6 @@ #include #include -#include "Application.hpp" -#include "singletons/Resources.hpp" -#include "singletons/Theme.hpp" -#include "widgets/splits/Split.hpp" -#include "widgets/splits/SplitContainer.hpp" - namespace chatterino { SplitOverlay::SplitOverlay(Split *parent) diff --git a/src/widgets/splits/SplitOverlay.hpp b/src/widgets/splits/SplitOverlay.hpp index 929e4112..66a3669e 100644 --- a/src/widgets/splits/SplitOverlay.hpp +++ b/src/widgets/splits/SplitOverlay.hpp @@ -1,11 +1,11 @@ #pragma once -#include -#include - #include "pajlada/signals/signalholder.hpp" #include "widgets/BaseWidget.hpp" +#include +#include + namespace chatterino { class Split; diff --git a/tests/.clang-format b/tests/.clang-format index f34c1465..49f126a1 100644 --- a/tests/.clang-format +++ b/tests/.clang-format @@ -27,7 +27,28 @@ IndentCaseLabels: true IndentWidth: 4 IndentWrappedFunctionNames: true IndentPPDirectives: AfterHash -IncludeBlocks: Preserve +SortIncludes: CaseInsensitive +IncludeBlocks: Regroup +IncludeCategories: +# Project includes + - Regex: '^"[a-zA-Z\._-]+(/[a-zA-Z0-9\._-]+)*"$' + Priority: 1 +# Third party library includes + - Regex: '<[[:alnum:].]+/[a-zA-Z0-9\._\/-]+>' + Priority: 3 +# Qt includes + - Regex: '^$' + Priority: 3 + CaseSensitive: true +# LibCommuni includes + - Regex: '^$' + Priority: 3 +# Misc libraries + - Regex: '^<[a-zA-Z_0-9]+\.h(pp)?>$' + Priority: 3 +# Standard library includes + - Regex: '^<[a-zA-Z_]+>$' + Priority: 4 NamespaceIndentation: Inner PointerBindsToType: false SpacesBeforeTrailingComments: 2 diff --git a/tests/src/HighlightController.cpp b/tests/src/HighlightController.cpp index 077a981d..6db834d1 100644 --- a/tests/src/HighlightController.cpp +++ b/tests/src/HighlightController.cpp @@ -4,16 +4,16 @@ #include "BaseSettings.hpp" #include "messages/MessageBuilder.hpp" // for MessageParseArgs #include "mocks/UserData.hpp" -#include "providers/twitch/TwitchBadge.hpp" // for Badge #include "providers/twitch/api/Helix.hpp" +#include "providers/twitch/TwitchBadge.hpp" // for Badge +#include #include #include #include #include #include #include -#include using namespace chatterino; using ::testing::Exactly; diff --git a/tests/src/LimitedQueue.cpp b/tests/src/LimitedQueue.cpp index 9ecf6203..39a8bba8 100644 --- a/tests/src/LimitedQueue.cpp +++ b/tests/src/LimitedQueue.cpp @@ -1,6 +1,7 @@ #include "messages/LimitedQueue.hpp" #include + #include using namespace chatterino; diff --git a/tests/src/NetworkRequest.cpp b/tests/src/NetworkRequest.cpp index 9c788ece..8f10180a 100644 --- a/tests/src/NetworkRequest.cpp +++ b/tests/src/NetworkRequest.cpp @@ -1,11 +1,10 @@ #include "common/NetworkRequest.hpp" + #include "common/NetworkManager.hpp" #include "common/NetworkResult.hpp" -#include "common/Outcome.hpp" -#include "providers/twitch/api/Helix.hpp" - #include "common/Outcome.hpp" #include "common/QLogging.hpp" +#include "providers/twitch/api/Helix.hpp" #include diff --git a/tests/src/SeventvEventAPI.cpp b/tests/src/SeventvEventAPI.cpp index 4731dc06..6df94210 100644 --- a/tests/src/SeventvEventAPI.cpp +++ b/tests/src/SeventvEventAPI.cpp @@ -1,8 +1,8 @@ #include "providers/seventv/SeventvEventAPI.hpp" +#include #include #include -#include using namespace chatterino; using namespace std::chrono_literals; diff --git a/tests/src/TwitchMessageBuilder.cpp b/tests/src/TwitchMessageBuilder.cpp index 408d2dff..b1ce38eb 100644 --- a/tests/src/TwitchMessageBuilder.cpp +++ b/tests/src/TwitchMessageBuilder.cpp @@ -7,11 +7,11 @@ #include "providers/twitch/TwitchBadge.hpp" #include "singletons/Emotes.hpp" -#include "ircconnection.h" - #include +#include #include #include + #include #include diff --git a/tests/src/TwitchPubSubClient.cpp b/tests/src/TwitchPubSubClient.cpp index f2b81e9a..d3f05cc5 100644 --- a/tests/src/TwitchPubSubClient.cpp +++ b/tests/src/TwitchPubSubClient.cpp @@ -1,6 +1,5 @@ -#include "providers/twitch/PubSubManager.hpp" - #include "providers/twitch/PubSubActions.hpp" +#include "providers/twitch/PubSubManager.hpp" #include diff --git a/tests/src/main.cpp b/tests/src/main.cpp index 38db1575..d6452c5a 100644 --- a/tests/src/main.cpp +++ b/tests/src/main.cpp @@ -1,25 +1,19 @@ #include "common/NetworkManager.hpp" #include "common/NetworkRequest.hpp" #include "common/NetworkResult.hpp" -#include "common/Outcome.hpp" -#include "providers/twitch/api/Helix.hpp" - #include "common/Outcome.hpp" #include "common/QLogging.hpp" - -#include - -#include -#include - -#include -#include -#include "common/NetworkManager.hpp" +#include "providers/twitch/api/Helix.hpp" #include #include +#include +#include #include +#include +#include + using namespace chatterino; #define SUPPORT_QT_NETWORK_TESTS diff --git a/tools/clang-format-all.sh b/tools/clang-format-all.sh index 4cd30240..dc300e33 100755 --- a/tools/clang-format-all.sh +++ b/tools/clang-format-all.sh @@ -1,6 +1,6 @@ #!/bin/bash -read -p "Are you sure you want to run clang-format on all files in src/? (y/n) " -n 1 -r +read -p "Are you sure you want to run clang-format on all source files? (y/n) " -n 1 -r echo if [[ $REPLY =~ ^[Yy]$ ]]; then find src/ \( -iname "*.hpp" -o -iname "*.cpp" \) -exec clang-format -i {} \;