From 1008904fb11df07174a30da7fa8c125853dfc770 Mon Sep 17 00:00:00 2001 From: Mm2PL Date: Sun, 6 Oct 2024 16:01:19 +0200 Subject: [PATCH] Move EventType to its own file For #include reasons --- docs/plugin-meta.lua | 4 ++++ src/CMakeLists.txt | 1 + src/controllers/plugins/LuaAPI.hpp | 5 +---- src/controllers/plugins/Plugin.hpp | 2 +- src/controllers/plugins/api/EventType.hpp | 14 ++++++++++++++ 5 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 src/controllers/plugins/api/EventType.hpp diff --git a/docs/plugin-meta.lua b/docs/plugin-meta.lua index 1e8b9b9cc..4192e5f1e 100644 --- a/docs/plugin-meta.lua +++ b/docs/plugin-meta.lua @@ -9,10 +9,14 @@ c2 = {} ---@type { Debug: c2.LogLevel, Info: c2.LogLevel, Warning: c2.LogLevel, Critical: c2.LogLevel } c2.LogLevel = {} +-- Begin src/controllers/plugins/api/EventType.hpp + ---@alias c2.EventType integer ---@type { CompletionRequested: c2.EventType } c2.EventType = {} +-- End src/controllers/plugins/api/EventType.hpp + ---@class CommandContext ---@field words string[] The words typed when executing the command. For example `/foo bar baz` will result in `{"/foo", "bar", "baz"}`. ---@field channel c2.Channel The channel the command was executed in. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 57b9c4060..68b108ec1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -233,6 +233,7 @@ set(SOURCE_FILES controllers/plugins/api/HTTPRequest.hpp controllers/plugins/api/HTTPResponse.cpp controllers/plugins/api/HTTPResponse.hpp + controllers/plugins/api/EventType.hpp controllers/plugins/LuaAPI.cpp controllers/plugins/LuaAPI.hpp controllers/plugins/LuaUtilities.cpp diff --git a/src/controllers/plugins/LuaAPI.hpp b/src/controllers/plugins/LuaAPI.hpp index 57f11966f..8d8e7e945 100644 --- a/src/controllers/plugins/LuaAPI.hpp +++ b/src/controllers/plugins/LuaAPI.hpp @@ -26,11 +26,8 @@ namespace chatterino::lua::api { enum class LogLevel { Debug, Info, Warning, Critical }; /** - * @exposeenum c2.EventType + * @includefile controllers/plugins/api/EventType.hpp */ -enum class EventType { - CompletionRequested, -}; /** * @lua@class CommandContext diff --git a/src/controllers/plugins/Plugin.hpp b/src/controllers/plugins/Plugin.hpp index 617737adf..c6fd10d94 100644 --- a/src/controllers/plugins/Plugin.hpp +++ b/src/controllers/plugins/Plugin.hpp @@ -4,7 +4,7 @@ # include "Application.hpp" # include "common/Common.hpp" # include "common/network/NetworkCommon.hpp" -# include "controllers/plugins/LuaAPI.hpp" +# include "controllers/plugins/api/EventType.hpp" # include "controllers/plugins/LuaUtilities.hpp" # include "controllers/plugins/PluginPermission.hpp" diff --git a/src/controllers/plugins/api/EventType.hpp b/src/controllers/plugins/api/EventType.hpp new file mode 100644 index 000000000..73b5df135 --- /dev/null +++ b/src/controllers/plugins/api/EventType.hpp @@ -0,0 +1,14 @@ +#pragma once +#ifdef CHATTERINO_HAVE_PLUGINS + +namespace chatterino::lua::api { + +/** + * @exposeenum c2.EventType + */ +enum class EventType { + CompletionRequested, +}; + +} // namespace chatterino::lua::api +#endif