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:
+25
-24
@@ -1,10 +1,16 @@
|
||||
#ifdef __cplusplus
|
||||
# include <irccommand.h>
|
||||
# include <ircconnection.h>
|
||||
# include <rapidjson/document.h>
|
||||
# include <rapidjson/error/en.h>
|
||||
# include <rapidjson/error/error.h>
|
||||
# include <boost/current_function.hpp>
|
||||
# include <boost/foreach.hpp>
|
||||
# include <boost/noncopyable.hpp>
|
||||
# include <boost/optional.hpp>
|
||||
# include <IrcCommand>
|
||||
# include <IrcConnection>
|
||||
# include <IrcMessage>
|
||||
# include <pajlada/serialize.hpp>
|
||||
# include <pajlada/settings/setting.hpp>
|
||||
# include <pajlada/settings/settinglistener.hpp>
|
||||
# include <pajlada/signals/connection.hpp>
|
||||
# include <pajlada/signals/signal.hpp>
|
||||
# include <QAbstractListModel>
|
||||
# include <QAbstractNativeEventFilter>
|
||||
# include <QAction>
|
||||
@@ -69,9 +75,9 @@
|
||||
# include <QNetworkReply>
|
||||
# include <QNetworkRequest>
|
||||
# include <QObject>
|
||||
# include <QPaintEvent>
|
||||
# include <QPainter>
|
||||
# include <QPainterPath>
|
||||
# include <QPaintEvent>
|
||||
# include <QPalette>
|
||||
# include <QPixmap>
|
||||
# include <QPoint>
|
||||
@@ -93,20 +99,13 @@
|
||||
# include <QStyle>
|
||||
# include <QStyleOption>
|
||||
# include <QTabWidget>
|
||||
# include <QtCore/QVariant>
|
||||
# include <QTextEdit>
|
||||
# include <QtGlobal>
|
||||
# include <QThread>
|
||||
# include <QThreadPool>
|
||||
# include <QTime>
|
||||
# include <QTimer>
|
||||
# include <QUrl>
|
||||
# include <QUuid>
|
||||
# include <QVBoxLayout>
|
||||
# include <QVariant>
|
||||
# include <QVector>
|
||||
# include <QWheelEvent>
|
||||
# include <QWidget>
|
||||
# include <QtCore/QVariant>
|
||||
# include <QtGlobal>
|
||||
# include <QtWidgets/QAction>
|
||||
# include <QtWidgets/QApplication>
|
||||
# include <QtWidgets/QButtonGroup>
|
||||
@@ -120,11 +119,18 @@
|
||||
# include <QtWidgets/QPushButton>
|
||||
# include <QtWidgets/QTabWidget>
|
||||
# include <QtWidgets/QVBoxLayout>
|
||||
# include <QUrl>
|
||||
# include <QUuid>
|
||||
# include <QVariant>
|
||||
# include <QVBoxLayout>
|
||||
# include <QVector>
|
||||
# include <QWheelEvent>
|
||||
# include <QWidget>
|
||||
# include <rapidjson/document.h>
|
||||
# include <rapidjson/error/en.h>
|
||||
# include <rapidjson/error/error.h>
|
||||
|
||||
# include <algorithm>
|
||||
# include <boost/current_function.hpp>
|
||||
# include <boost/foreach.hpp>
|
||||
# include <boost/noncopyable.hpp>
|
||||
# include <boost/optional.hpp>
|
||||
# include <cassert>
|
||||
# include <chrono>
|
||||
# include <cinttypes>
|
||||
@@ -138,11 +144,6 @@
|
||||
# include <map>
|
||||
# include <memory>
|
||||
# include <mutex>
|
||||
# include <pajlada/serialize.hpp>
|
||||
# include <pajlada/settings/setting.hpp>
|
||||
# include <pajlada/settings/settinglistener.hpp>
|
||||
# include <pajlada/signals/connection.hpp>
|
||||
# include <pajlada/signals/signal.hpp>
|
||||
# include <random>
|
||||
# include <set>
|
||||
# include <string>
|
||||
|
||||
Reference in New Issue
Block a user