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)
2022-11-27 19:32:53 +01:00
parent f2b35fb7dc
commit 032f290767
247 changed files with 658 additions and 566 deletions
@@ -1,4 +1,5 @@
 #include "widgets/AccountSwitchPopup.hpp"
+
 #include "widgets/dialogs/SettingsDialog.hpp"

 #include <QHBoxLayout>
@@ -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 <QTimer>
 #include <QVBoxLayout>
+
 #include <memory>

 #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 {
@@ -4,6 +4,7 @@

 #include <QTimer>
 #include <QWidget>
+
 #include <memory>

 namespace chatterino {
@@ -11,6 +11,7 @@
 #include <QIcon>
 #include <QLayout>
 #include <QtGlobal>
+
 #include <algorithm>

 namespace chatterino {
@@ -1,10 +1,10 @@
 #pragma once

-#include <QShortcut>
-#include <QWidget>
 #include <boost/optional.hpp>
 #include <pajlada/signals/signal.hpp>
 #include <pajlada/signals/signalholder.hpp>
+#include <QShortcut>
+#include <QWidget>

 namespace chatterino {

@@ -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 <QApplication>
 #include <QDebug>
 #include <QDesktopWidget>
 #include <QFont>
 #include <QIcon>
+
 #include <functional>

 #ifdef CHATTERINO
@@ -23,6 +24,7 @@
 #endif

 #ifdef USEWINSDK
+// clang-format off
 #    include <ObjIdl.h>
 #    include <VersionHelpers.h>
 #    include <Windows.h>
@@ -37,6 +39,7 @@
 #    include <QVBoxLayout>

 #    define WM_DPICHANGED 0x02E0
+// clang-format on
 #endif

 #include "widgets/helper/TitlebarButton.hpp"
@@ -1,10 +1,11 @@
 #pragma once

+#include "common/FlagsEnum.hpp"
 #include "widgets/BaseWidget.hpp"

-#include <functional>
 #include <pajlada/signals/signalholder.hpp>
-#include "common/FlagsEnum.hpp"
+
+#include <functional>

 class QHBoxLayout;
 struct tagMSG;
@@ -1,10 +1,11 @@
 #include "FramelessEmbedWindow.hpp"

-#include <QHBoxLayout>
 #include "Application.hpp"
+#include "providers/twitch/TwitchIrcServer.hpp"
 #include "QJsonDocument"
 #include "QMessageBox"
-#include "providers/twitch/TwitchIrcServer.hpp"
+
+#include <QHBoxLayout>
 //#include "widgets/helper/ChannelView.hpp"
 #include "common/Args.hpp"
 #include "widgets/splits/Split.hpp"
@@ -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 <boost/foreach.hpp>
 #include <QDebug>
 #include <QFile>
 #include <QFormLayout>
@@ -24,7 +25,6 @@
 #include <QStandardPaths>
 #include <QUuid>
 #include <QWidget>
-#include <boost/foreach.hpp>

 namespace chatterino {

@@ -3,11 +3,11 @@
 #include "pajlada/signals/signal.hpp"
 #include "widgets/BaseWidget.hpp"

+#include <pajlada/signals/signalholder.hpp>
 #include <QList>
 #include <QMenu>
 #include <QMessageBox>
 #include <QWidget>
-#include <pajlada/signals/signalholder.hpp>

 namespace chatterino {

@@ -4,10 +4,10 @@
 #include "widgets/BaseWidget.hpp"
 #include "widgets/helper/ScrollbarHighlight.hpp"

+#include <pajlada/signals/signal.hpp>
 #include <QMutex>
 #include <QPropertyAnimation>
 #include <QWidget>
-#include <pajlada/signals/signal.hpp>

 namespace chatterino {

@@ -2,9 +2,9 @@

 #include "widgets/BaseWindow.hpp"

+#include <pajlada/signals/signal.hpp>
 #include <QLabel>
 #include <QWidget>
-#include <pajlada/signals/signal.hpp>

 namespace chatterino {

@@ -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 <rapidjson/document.h>
 #    include "providers/twitch/PubSubManager.hpp"
 #    include "providers/twitch/PubSubMessages.hpp"
 #    include "util/SampleData.hpp"
+
+#    include <rapidjson/document.h>
 #endif

 #include <QApplication>
@@ -1,10 +1,10 @@
 #include "BadgePickerDialog.hpp"
-#include <QSizePolicy>
-#include "singletons/Resources.hpp"

 #include "providers/twitch/TwitchBadges.hpp"
+#include "singletons/Resources.hpp"

 #include <QDialogButtonBox>
+#include <QSizePolicy>
 #include <QVBoxLayout>

 namespace chatterino {
@@ -2,9 +2,10 @@

 #include "util/DisplayBadge.hpp"

+#include <boost/optional.hpp>
 #include <QComboBox>
 #include <QDialog>
-#include <boost/optional.hpp>
+
 #include <memory>

 namespace chatterino {
@@ -6,11 +6,10 @@
 #include "widgets/helper/QColorPicker.hpp"

 #include <pajlada/signals/signal.hpp>
+#include <QLabel>

 #include <array>

-#include <QLabel>
-
 namespace chatterino {

 /**
@@ -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 <QAbstractButton>
 #include <QHBoxLayout>
@@ -6,7 +6,6 @@
 #include "widgets/Notebook.hpp"

 #include <pajlada/signals/signal.hpp>
-
 #include <QLineEdit>

 namespace chatterino {
@@ -1,4 +1,5 @@
 #include "IrcConnectionEditor.hpp"
+
 #include "ui_IrcConnectionEditor.h"

 namespace chatterino {
@@ -1,10 +1,9 @@
 #pragma once

-#include <boost/optional.hpp>
-
 #include "providers/irc/Irc2.hpp"
 #include "widgets/BaseWindow.hpp"

+#include <boost/optional.hpp>
 #include <QDialog>

 namespace Ui {
@@ -1,14 +1,14 @@
 #include "LastRunCrashDialog.hpp"

+#include "singletons/Updates.hpp"
+#include "util/LayoutCreator.hpp"
+#include "util/PostToThread.hpp"
+
 #include <QDialogButtonBox>
 #include <QLabel>
 #include <QPushButton>
 #include <QVBoxLayout>

-#include "singletons/Updates.hpp"
-#include "util/LayoutCreator.hpp"
-#include "util/PostToThread.hpp"
-
 namespace chatterino {

 LastRunCrashDialog::LastRunCrashDialog()
@@ -1,7 +1,7 @@
 #pragma once

-#include <QDialog>
 #include <pajlada/signals/signalholder.hpp>
+#include <QDialog>

 namespace chatterino {

@@ -12,12 +12,12 @@
 #    include <Windows.h>
 #endif

+#include <pajlada/settings/setting.hpp>
 #include <QClipboard>
 #include <QDebug>
 #include <QDesktopServices>
 #include <QMessageBox>
 #include <QUrl>
-#include <pajlada/settings/setting.hpp>

 namespace chatterino {

@@ -14,8 +14,8 @@
 #include <QLineEdit>
 #include <QPushButton>
 #include <QTabWidget>
-#include <QVBoxLayout>
 #include <QtCore/QVariant>
+#include <QVBoxLayout>

 namespace chatterino {

@@ -7,7 +7,6 @@
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QScreen>
-
 #include <QVBoxLayout>

 namespace chatterino {
@@ -1,4 +1,5 @@
 #include "QualityPopup.hpp"
+
 #include "Application.hpp"
 #include "common/QLogging.hpp"
 #include "singletons/WindowManager.hpp"
@@ -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"

@@ -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 <QDialogButtonBox>
 #include <QFormLayout>
 #include <QGroupBox>
+#include <QHeaderView>
 #include <QLabel>
 #include <QLineEdit>
-#include <QVBoxLayout>
-
-#include <QTableView>
-#include "providers/irc/Irc2.hpp"
-#include "widgets/helper/EditableModelView.hpp"
-
-#include <QHeaderView>
 #include <QPushButton>
+#include <QTableView>
+#include <QVBoxLayout>

 #define TAB_TWITCH 0
 #define TAB_IRC 1
@@ -5,11 +5,9 @@
 #include "widgets/BaseWindow.hpp"

 #include <pajlada/signals/signal.hpp>
-
 #include <QLabel>
-#include <QRadioButton>
-
 #include <QLineEdit>
+#include <QRadioButton>

 namespace chatterino {

@@ -1,16 +1,16 @@
 #pragma once

 #include "widgets/BaseWindow.hpp"
+#include "widgets/helper/SettingsDialogTab.hpp"

+#include <pajlada/settings/setting.hpp>
+#include <QFrame>
 #include <QPushButton>
 #include <QStackedLayout>
 #include <QVBoxLayout>
 #include <QWidget>
-#include <functional>
-#include <pajlada/settings/setting.hpp>
-#include "widgets/helper/SettingsDialogTab.hpp"

-#include <QFrame>
+#include <functional>

 class QLineEdit;

@@ -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 <QCheckBox>
 #include <QDesktopServices>
@@ -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 {

@@ -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 {

@@ -1,8 +1,9 @@
 #pragma once

-#include <memory>
 #include "widgets/listview/GenericListModel.hpp"

+#include <memory>
+
 namespace chatterino {

 using QuickSwitcherModel = GenericListModel;
@@ -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 {

@@ -6,10 +6,10 @@
 #include "widgets/splits/Split.hpp"
 #include "widgets/splits/SplitContainer.hpp"

-#include <functional>
-
 #include <QLineEdit>

+#include <functional>
+
 namespace chatterino {

 class GenericListView;
@@ -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 {

@@ -1,13 +1,13 @@
 #include "Button.hpp"

+#include "singletons/Theme.hpp"
+#include "util/FunctionEventFilter.hpp"
+
 #include <QApplication>
 #include <QDebug>
 #include <QDesktopWidget>
 #include <QPainter>

-#include "singletons/Theme.hpp"
-#include "util/FunctionEventFilter.hpp"
-
 namespace chatterino {
 namespace {

@@ -1,9 +1,8 @@
 #pragma once

-#include <boost/optional.hpp>
-
 #include "widgets/BaseWidget.hpp"

+#include <boost/optional.hpp>
 #include <QMenu>
 #include <QMouseEvent>
 #include <QPainter>
@@ -1,22 +1,5 @@
 #include "ChannelView.hpp"

-#include <QClipboard>
-#include <QColor>
-#include <QDate>
-#include <QDebug>
-#include <QDesktopServices>
-#include <QEasingCurve>
-#include <QGraphicsBlurEffect>
-#include <QMessageBox>
-#include <QPainter>
-#include <QScreen>
-#include <QVariantAnimation>
-#include <algorithm>
-#include <chrono>
-#include <cmath>
-#include <functional>
-#include <memory>
-
 #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 <QClipboard>
+#include <QColor>
+#include <QDate>
+#include <QDebug>
+#include <QDesktopServices>
+#include <QEasingCurve>
+#include <QGraphicsBlurEffect>
+#include <QMessageBox>
+#include <QPainter>
+#include <QScreen>
+#include <QVariantAnimation>
+
+#include <algorithm>
+#include <chrono>
+#include <cmath>
+#include <functional>
+#include <memory>

 #define DRAW_WIDTH (this->width())
 #define SELECTION_RESUME_SCROLLING_MSG_THRESHOLD 3
@@ -1,15 +1,5 @@
 #pragma once

-#include <QPaintEvent>
-#include <QScroller>
-#include <QTimer>
-#include <QVariantAnimation>
-#include <QWheelEvent>
-#include <QWidget>
-#include <pajlada/signals/signal.hpp>
-#include <unordered_map>
-#include <unordered_set>
-
 #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 <pajlada/signals/signal.hpp>
+#include <QPaintEvent>
+#include <QScroller>
+#include <QTimer>
+#include <QVariantAnimation>
+#include <QWheelEvent>
+#include <QWidget>
+
+#include <unordered_map>
+#include <unordered_set>
+
 namespace chatterino {
 enum class HighlightState;

@@ -1,17 +1,17 @@
 #include "EditableModelView.hpp"
+
 #include "widgets/helper/RegExpItemDelegate.hpp"

 #include <QAbstractItemView>
 #include <QAbstractTableModel>
 #include <QHBoxLayout>
 #include <QHeaderView>
+#include <QLabel>
 #include <QModelIndex>
 #include <QPushButton>
 #include <QTableView>
 #include <QVBoxLayout>

-#include <QLabel>
-
 namespace chatterino {

 EditableModelView::EditableModelView(QAbstractTableModel *model, bool movable)
@@ -1,8 +1,7 @@
 #pragma once

-#include <QWidget>
-
 #include <pajlada/signals/signal.hpp>
+#include <QWidget>

 class QAbstractTableModel;
 class QTableView;
@@ -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 <QHBoxLayout>
 #include <QLabel>
@@ -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 <QMimeData>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QPainterPath>
 #include <QRadialGradient>

-#include <QMimeData>
-
 #define nuuls nullptr

 namespace chatterino {
@@ -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 <boost/bind/bind.hpp>
 #include <QApplication>
 #include <QDebug>
 #include <QDialogButtonBox>
 #include <QLabel>
-#include <QLineEdit>
 #include <QLinearGradient>
+#include <QLineEdit>
 #include <QMimeData>
 #include <QPainter>
-#include <boost/bind/bind.hpp>

 namespace chatterino {
 namespace {
@@ -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 <QMenu>
-#include <QPropertyAnimation>
 #include <pajlada/settings/setting.hpp>
 #include <pajlada/signals/signalholder.hpp>
+#include <QMenu>
+#include <QPropertyAnimation>

 namespace chatterino {

@@ -38,11 +38,10 @@
 ****************************************************************************/
 #include "widgets/helper/QColorPicker.hpp"

+#include <qdrawutil.h>
 #include <QMouseEvent>
 #include <QPainter>

-#include <qdrawutil.h>
-
 /*
 * These classes are literally copied from the Qt source.
 * Unfortunately, they are private to the QColorDialog class so we cannot use
@@ -1,9 +1,9 @@
 #pragma once

+#include <pajlada/signals/signal.hpp>
 #include <QCompleter>
 #include <QKeyEvent>
 #include <QTextEdit>
-#include <pajlada/signals/signal.hpp>

 namespace chatterino {

@@ -1,9 +1,9 @@
 #pragma once

-#include <memory>
-
 #include <QColor>

+#include <memory>
+
 namespace chatterino {

 class ScrollbarHighlight
@@ -1,9 +1,5 @@
 #include "SearchPopup.hpp"

-#include <QHBoxLayout>
-#include <QLineEdit>
-#include <QPushButton>
-
 #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 <QHBoxLayout>
+#include <QLineEdit>
+#include <QPushButton>
+
 namespace chatterino {

 ChannelPtr SearchPopup::filter(const QString &text, const QString &channelName,
@@ -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"
@@ -1,4 +1,5 @@
 #include "widgets/helper/SettingsDialogTab.hpp"
+
 #include "widgets/dialogs/SettingsDialog.hpp"
 #include "widgets/settingspages/SettingsPage.hpp"

@@ -5,6 +5,7 @@
 #include <QIcon>
 #include <QPaintEvent>
 #include <QWidget>
+
 #include <functional>

 namespace chatterino {
@@ -1,9 +1,9 @@
 #include "TitlebarButton.hpp"

-#include <QPainterPath>
-
 #include "singletons/Theme.hpp"

+#include <QPainterPath>
+
 namespace chatterino {

 TitleBarButton::TitleBarButton()
@@ -2,6 +2,7 @@

 #include <QAbstractListModel>
 #include <QWidget>
+
 #include <memory>

 namespace chatterino {
@@ -12,6 +12,7 @@
 #include <QHeaderView>
 #include <QTableView>
 #include <QVBoxLayout>
+
 #include <algorithm>

 namespace chatterino {
@@ -1,18 +1,18 @@
 #include "CommandPage.hpp"

-#include <QHeaderView>
-#include <QLabel>
-#include <QPushButton>
-#include <QStandardItemModel>
-#include <QTableView>
-#include <QTextEdit>
-
 #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 <QHeaderView>
+#include <QLabel>
+#include <QPushButton>
+#include <QStandardItemModel>
+#include <QTableView>
+#include <QTextEdit>
 //#include "widgets/helper/ComboBoxItemDelegate.hpp"
 #include "util/CombinePath.hpp"
 #include "util/Qt.hpp"
@@ -1,10 +1,10 @@
 #pragma once

+#include "widgets/settingspages/SettingsPage.hpp"
+
 #include <QTextEdit>
 #include <QTimer>

-#include "widgets/settingspages/SettingsPage.hpp"
-
 namespace chatterino {

 class CommandPage : public SettingsPage
@@ -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 <QTableView>
+#include "widgets/Window.hpp"

 #include <QHeaderView>
+#include <QTableView>

 #define FILTERS_DOCUMENTATION "https://wiki.chatterino.com/Filters"

@@ -1,15 +1,15 @@
 #pragma once

-#include <QDebug>
-#include <boost/variant.hpp>
-#include <pajlada/signals/signalholder.hpp>
 #include "Application.hpp"
 #include "common/ChatterinoSetting.hpp"
 #include "singletons/WindowManager.hpp"
 #include "widgets/helper/SignalLabel.hpp"

+#include <boost/variant.hpp>
+#include <pajlada/signals/signalholder.hpp>
 #include <QCheckBox>
 #include <QComboBox>
+#include <QDebug>
 #include <QPushButton>
 #include <QSpinBox>

@@ -17,8 +17,8 @@
 #include <QListWidget>
 #include <QPushButton>
 #include <QStandardItemModel>
-#include <QTabWidget>
 #include <QTableView>
+#include <QTabWidget>
 #include <QTextEdit>

 #define ENABLE_HIGHLIGHTS "Enable Highlighting"
@@ -17,9 +17,9 @@
 #include <QListView>
 #include <QPushButton>
 #include <QTableView>
+#include <QtConcurrent/QtConcurrent>
 #include <QTextEdit>
 #include <QVBoxLayout>
-#include <QtConcurrent/QtConcurrent>

 namespace chatterino {

@@ -1,9 +1,9 @@
 #pragma once

-#include <QTimer>
-
 #include "widgets/settingspages/SettingsPage.hpp"

+#include <QTimer>
+
 class QTabWidget;
 class QPushButton;

@@ -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 <QTableView>
+#include "widgets/Window.hpp"

 #include <QHeaderView>
+#include <QTableView>

 namespace chatterino {

@@ -1,16 +1,15 @@
 #pragma once

-#include <QCheckBox>
-#include <QComboBox>
-#include <QLineEdit>
-#include <QSpinBox>
-#include <pajlada/signals/signal.hpp>
-
 #include "singletons/Settings.hpp"

+#include <pajlada/signals/signal.hpp>
+#include <QCheckBox>
+#include <QComboBox>
 #include <QLabel>
+#include <QLineEdit>
 #include <QPainter>
 #include <QPushButton>
+#include <QSpinBox>

 #define SETTINGS_PAGE_WIDGET_BOILERPLATE(type, parent) \
    class type : public parent                         \
@@ -4,6 +4,7 @@
 #include "widgets/helper/NotebookTab.hpp"

 #include <QUuid>
+
 #include <deque>
 #include <mutex>
 #include <utility>
@@ -1,9 +1,10 @@
 #pragma once

-#include <functional>
 #include "messages/Emote.hpp"
 #include "widgets/listview/GenericListItem.hpp"

+#include <functional>
+
 namespace chatterino {

 class InputCompletionItem : public GenericListItem
@@ -1,10 +1,11 @@
 #pragma once

-#include <functional>
 #include "common/Channel.hpp"
 #include "widgets/BasePopup.hpp"
 #include "widgets/listview/GenericListModel.hpp"

+#include <functional>
+
 namespace chatterino {

 class GenericListView;
@@ -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 <QApplication>
 #include <QClipboard>
@@ -6,11 +6,11 @@
 #include "pajlada/signals/signalholder.hpp"
 #include "widgets/BaseWidget.hpp"

+#include <boost/signals2.hpp>
 #include <QFont>
 #include <QShortcut>
 #include <QVBoxLayout>
 #include <QWidget>
-#include <boost/signals2.hpp>

 namespace chatterino {

@@ -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 <boost/foreach.hpp>
 #include <QApplication>
 #include <QDebug>
 #include <QHBoxLayout>
@@ -25,8 +26,8 @@
 #include <QPainter>
 #include <QVBoxLayout>
 #include <QWidget>
+
 #include <algorithm>
-#include <boost/foreach.hpp>

 namespace chatterino {

@@ -3,6 +3,8 @@
 #include "common/WindowDescriptors.hpp"
 #include "widgets/BaseWidget.hpp"

+#include <pajlada/signals/signal.hpp>
+#include <pajlada/signals/signalholder.hpp>
 #include <QDragEnterEvent>
 #include <QHBoxLayout>
 #include <QRect>
@@ -12,8 +14,6 @@

 #include <algorithm>
 #include <functional>
-#include <pajlada/signals/signal.hpp>
-#include <pajlada/signals/signalholder.hpp>
 #include <unordered_map>
 #include <vector>

@@ -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 <QDesktopWidget>
 #include <QDrag>
@@ -33,6 +33,7 @@
 #include <QMenu>
 #include <QMimeData>
 #include <QPainter>
+
 #include <cmath>

 #ifdef USEWEBENGINE
@@ -2,13 +2,13 @@

 #include "widgets/BaseWidget.hpp"

-#include <QElapsedTimer>
-#include <QMenu>
-#include <QPoint>
 #include <boost/signals2.hpp>
 #include <pajlada/settings/setting.hpp>
 #include <pajlada/signals/connection.hpp>
 #include <pajlada/signals/signalholder.hpp>
+#include <QElapsedTimer>
+#include <QMenu>
+#include <QPoint>

 #include <memory>
 #include <vector>
@@ -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 <functional>
-
 #include <QCompleter>
 #include <QPainter>

+#include <functional>
+
 namespace chatterino {

 SplitInput::SplitInput(Split *_chatWidget, bool enableInlineReplying)
@@ -11,6 +11,7 @@
 #include <QTextEdit>
 #include <QVBoxLayout>
 #include <QWidget>
+
 #include <memory>

 namespace chatterino {
@@ -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 <QEvent>
 #include <QGraphicsBlurEffect>
 #include <QGraphicsEffect>
@@ -8,12 +14,6 @@
 #include <QPainter>
 #include <QPushButton>

-#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)
@@ -1,11 +1,11 @@
 #pragma once

-#include <QGridLayout>
-#include <QPushButton>
-
 #include "pajlada/signals/signalholder.hpp"
 #include "widgets/BaseWidget.hpp"

+#include <QGridLayout>
+#include <QPushButton>
+
 namespace chatterino {

 class Split;