From 1a1656ddbfef6ec9d6458b30db02ec8a4d1885ff Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Thu, 27 Apr 2023 13:55:13 +0100 Subject: [PATCH] Revert "internal: include headers from protocols/" This reverts commit 550700bed01c114b2a200ab177ed4bc295a2c7dd. We can't cuz meson --- src/helpers/WLClasses.hpp | 2 +- src/includes.hpp | 2 +- src/protocols/FractionalScale.hpp | 2 +- src/protocols/GlobalShortcuts.hpp | 2 +- src/protocols/Screencopy.hpp | 2 +- src/protocols/TextInputV1.hpp | 2 +- src/protocols/ToplevelExport.hpp | 4 ++-- src/render/Renderer.cpp | 2 +- src/wlrunstable/wlr_ext_workspace_v1.cpp | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/helpers/WLClasses.hpp b/src/helpers/WLClasses.hpp index c1bc0edc..0e5138b3 100644 --- a/src/helpers/WLClasses.hpp +++ b/src/helpers/WLClasses.hpp @@ -2,7 +2,7 @@ #include "../events/Events.hpp" #include "../defines.hpp" -#include "protocols/wlr-layer-shell-unstable-v1-protocol.h" +#include "wlr-layer-shell-unstable-v1-protocol.h" #include "../Window.hpp" #include "SubsurfaceTree.hpp" #include "AnimatedVariable.hpp" diff --git a/src/includes.hpp b/src/includes.hpp index d1bdd4d6..6a4b05a5 100644 --- a/src/includes.hpp +++ b/src/includes.hpp @@ -144,4 +144,4 @@ extern "C" { #include "helpers/Vector2D.hpp" -#include "protocols/ext-workspace-unstable-v1-protocol.h" +#include "ext-workspace-unstable-v1-protocol.h" diff --git a/src/protocols/FractionalScale.hpp b/src/protocols/FractionalScale.hpp index 22638b8b..71b2c858 100644 --- a/src/protocols/FractionalScale.hpp +++ b/src/protocols/FractionalScale.hpp @@ -1,7 +1,7 @@ #pragma once #include "../defines.hpp" -#include "protocols/fractional-scale-v1-protocol.h" +#include "fractional-scale-v1-protocol.h" #include #include diff --git a/src/protocols/GlobalShortcuts.hpp b/src/protocols/GlobalShortcuts.hpp index 240fe276..07c484c6 100644 --- a/src/protocols/GlobalShortcuts.hpp +++ b/src/protocols/GlobalShortcuts.hpp @@ -1,6 +1,6 @@ #pragma once #include "../defines.hpp" -#include "protocols/hyprland-global-shortcuts-v1-protocol.h" +#include "hyprland-global-shortcuts-v1-protocol.h" #include struct SShortcut { diff --git a/src/protocols/Screencopy.hpp b/src/protocols/Screencopy.hpp index 45da9fed..f0634427 100644 --- a/src/protocols/Screencopy.hpp +++ b/src/protocols/Screencopy.hpp @@ -1,7 +1,7 @@ #pragma once #include "../defines.hpp" -#include "protocols/wlr-screencopy-unstable-v1-protocol.h" +#include "wlr-screencopy-unstable-v1-protocol.h" #include #include diff --git a/src/protocols/TextInputV1.hpp b/src/protocols/TextInputV1.hpp index f3ef6a94..f714b24c 100644 --- a/src/protocols/TextInputV1.hpp +++ b/src/protocols/TextInputV1.hpp @@ -1,7 +1,7 @@ #pragma once #include "../defines.hpp" -#include "protocols/text-input-unstable-v1-protocol.h" +#include "text-input-unstable-v1-protocol.h" #include diff --git a/src/protocols/ToplevelExport.hpp b/src/protocols/ToplevelExport.hpp index 9a9cf115..45e979f6 100644 --- a/src/protocols/ToplevelExport.hpp +++ b/src/protocols/ToplevelExport.hpp @@ -1,8 +1,8 @@ #pragma once #include "../defines.hpp" -#include "protocols/wlr-foreign-toplevel-management-unstable-v1-protocol.h" -#include "protocols/hyprland-toplevel-export-v1-protocol.h" +#include "wlr-foreign-toplevel-management-unstable-v1-protocol.h" +#include "hyprland-toplevel-export-v1-protocol.h" #include "Screencopy.hpp" #include diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp index df9a8a57..0be12fa7 100644 --- a/src/render/Renderer.cpp +++ b/src/render/Renderer.cpp @@ -1,6 +1,6 @@ #include "Renderer.hpp" #include "../Compositor.hpp" -#include "protocols/linux-dmabuf-unstable-v1-protocol.h" +#include "linux-dmabuf-unstable-v1-protocol.h" void renderSurface(struct wlr_surface* surface, int x, int y, void* data) { const auto TEXTURE = wlr_surface_get_texture(surface); diff --git a/src/wlrunstable/wlr_ext_workspace_v1.cpp b/src/wlrunstable/wlr_ext_workspace_v1.cpp index cbea6c56..c86000e8 100644 --- a/src/wlrunstable/wlr_ext_workspace_v1.cpp +++ b/src/wlrunstable/wlr_ext_workspace_v1.cpp @@ -1,6 +1,6 @@ #include "../includes.hpp" #include "../helpers/MiscFunctions.hpp" -#include "protocols/ext-workspace-unstable-v1-protocol.h" +#include "ext-workspace-unstable-v1-protocol.h" #include #include