Update magic_enum from v0.9.3 to v0.9.5 (#4992)

* Fix include path for magic enum
* Update .clang-format to ensure magic enum is caught as a third party library
This commit is contained in:
pajlada
2023-12-01 15:03:04 +01:00
committed by GitHub
parent 6d02bb7304
commit e327ed4166
20 changed files with 28 additions and 39 deletions
+3 -6
View File
@@ -32,9 +32,6 @@ 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: '^<Q[a-zA-Z0-9\._\/-]+>$'
Priority: 3
@@ -42,12 +39,12 @@ IncludeCategories:
# LibCommuni includes
- Regex: "^<Irc[a-zA-Z]+>$"
Priority: 3
# Misc libraries
- Regex: '^<[a-zA-Z_0-9]+\.h(pp)?>$'
Priority: 3
# Standard library includes
- Regex: "^<[a-zA-Z_]+>$"
Priority: 4
# Third party library includes
- Regex: "^<([a-zA-Z_0-9-]+/)*[a-zA-Z_0-9-]+.h(pp)?>$"
Priority: 3
NamespaceIndentation: Inner
PointerBindsToType: false
SpacesBeforeTrailingComments: 2
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>
#include <pajlada/settings.hpp>
#include <QString>
+1 -1
View File
@@ -4,7 +4,7 @@
# include <lua.h>
# include <lualib.h>
# include <magic_enum.hpp>
# include <magic_enum/magic_enum.hpp>
# include <QList>
# include <string>
+1 -1
View File
@@ -4,7 +4,7 @@
# include "controllers/commands/CommandController.hpp"
# include <lua.h>
# include <magic_enum.hpp>
# include <magic_enum/magic_enum.hpp>
# include <QJsonArray>
# include <QJsonObject>
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>
namespace chatterino::seventv {
+1 -1
View File
@@ -2,7 +2,7 @@
#include "providers/seventv/eventapi/Subscription.hpp"
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>
#include <QJsonDocument>
#include <QJsonObject>
#include <QString>
@@ -1,6 +1,6 @@
#pragma once
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>
#include <QByteArray>
#include <QHash>
#include <QJsonObject>
+1 -1
View File
@@ -6,7 +6,7 @@
#include "common/QLogging.hpp"
#include "util/CancellationToken.hpp"
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>
#include <QJsonDocument>
namespace {
@@ -1,6 +1,6 @@
#pragma once
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>
#include <QColor>
#include <QJsonObject>
#include <QString>
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>
#include <QJsonDocument>
#include <QJsonObject>
#include <QString>
@@ -1,6 +1,6 @@
#pragma once
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>
#include <QJsonObject>
#include <QString>
@@ -1,6 +1,6 @@
#pragma once
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>
#include <QJsonObject>
#include <QString>
@@ -1,6 +1,6 @@
#pragma once
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>
#include <QColor>
#include <QJsonObject>
#include <QString>
+1 -1
View File
@@ -21,7 +21,7 @@
#include "widgets/settingspages/GeneralPageView.hpp"
#include "widgets/splits/SplitInput.hpp"
#include <magic_enum.hpp>
#include <magic_enum/magic_enum.hpp>
#include <QDesktopServices>
#include <QFileDialog>
#include <QFontDialog>