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)
This commit is contained in:
pajlada
2022-11-27 19:32:53 +01:00
committed by GitHub
parent f2b35fb7dc
commit 032f290767
247 changed files with 658 additions and 566 deletions
+1
View File
@@ -4,6 +4,7 @@
#include "widgets/helper/NotebookTab.hpp"
#include <QUuid>
#include <deque>
#include <mutex>
#include <utility>
+2 -1
View File
@@ -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
+2 -1
View File
@@ -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;
+4 -4
View File
@@ -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>
+1 -1
View File
@@ -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 {
+4 -3
View File
@@ -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 {
+2 -2
View File
@@ -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>
+3 -2
View File
@@ -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
+3 -3
View File
@@ -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>
+4 -4
View File
@@ -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)
+1
View File
@@ -11,6 +11,7 @@
#include <QTextEdit>
#include <QVBoxLayout>
#include <QWidget>
#include <memory>
namespace chatterino {
+6 -6
View File
@@ -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)
+3 -3
View File
@@ -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;