From 467a1b3b494feb9437b0f330c01f263ecee2a2ab Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Thu, 11 May 2023 10:11:43 +0300 Subject: [PATCH] Move cursor delegates to scene/ They've been overlooked. --- src/CMakeLists.txt | 4 ++-- src/composite.cpp | 4 ++-- src/{ => scene}/cursordelegate_opengl.cpp | 2 +- src/{ => scene}/cursordelegate_opengl.h | 0 src/{ => scene}/cursordelegate_qpainter.cpp | 2 +- src/{ => scene}/cursordelegate_qpainter.h | 0 6 files changed, 6 insertions(+), 6 deletions(-) rename src/{ => scene}/cursordelegate_opengl.cpp (98%) rename src/{ => scene}/cursordelegate_opengl.h (100%) rename src/{ => scene}/cursordelegate_qpainter.cpp (97%) rename src/{ => scene}/cursordelegate_qpainter.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 69e133a2a1..6487663805 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -60,8 +60,6 @@ target_sources(kwin PRIVATE core/session_noop.cpp core/shmgraphicsbufferallocator.cpp cursor.cpp - cursordelegate_opengl.cpp - cursordelegate_qpainter.cpp cursorsource.cpp dbusinterface.cpp debug_console.cpp @@ -122,6 +120,8 @@ target_sources(kwin PRIVATE rootinfo_filter.cpp rulebooksettings.cpp rules.cpp + scene/cursordelegate_opengl.cpp + scene/cursordelegate_qpainter.cpp scene/cursoritem.cpp scene/cursorscene.cpp scene/decorationitem.cpp diff --git a/src/composite.cpp b/src/composite.cpp index 8533cee457..883f76c1a0 100644 --- a/src/composite.cpp +++ b/src/composite.cpp @@ -16,8 +16,6 @@ #include "core/overlaywindow.h" #include "core/renderlayer.h" #include "core/renderloop.h" -#include "cursordelegate_opengl.h" -#include "cursordelegate_qpainter.h" #include "dbusinterface.h" #include "decorations/decoratedclient.h" #include "effects.h" @@ -25,6 +23,8 @@ #include "internalwindow.h" #include "platformsupport/scenes/opengl/openglbackend.h" #include "platformsupport/scenes/qpainter/qpainterbackend.h" +#include "scene/cursordelegate_opengl.h" +#include "scene/cursordelegate_qpainter.h" #include "scene/cursorscene.h" #include "scene/itemrenderer_opengl.h" #include "scene/itemrenderer_qpainter.h" diff --git a/src/cursordelegate_opengl.cpp b/src/scene/cursordelegate_opengl.cpp similarity index 98% rename from src/cursordelegate_opengl.cpp rename to src/scene/cursordelegate_opengl.cpp index c828104520..6e277a6e4d 100644 --- a/src/cursordelegate_opengl.cpp +++ b/src/scene/cursordelegate_opengl.cpp @@ -4,7 +4,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "cursordelegate_opengl.h" +#include "scene/cursordelegate_opengl.h" #include "composite.h" #include "core/output.h" #include "core/renderlayer.h" diff --git a/src/cursordelegate_opengl.h b/src/scene/cursordelegate_opengl.h similarity index 100% rename from src/cursordelegate_opengl.h rename to src/scene/cursordelegate_opengl.h diff --git a/src/cursordelegate_qpainter.cpp b/src/scene/cursordelegate_qpainter.cpp similarity index 97% rename from src/cursordelegate_qpainter.cpp rename to src/scene/cursordelegate_qpainter.cpp index 76ce756366..4f4f1cafb4 100644 --- a/src/cursordelegate_qpainter.cpp +++ b/src/scene/cursordelegate_qpainter.cpp @@ -4,7 +4,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "cursordelegate_qpainter.h" +#include "scene/cursordelegate_qpainter.h" #include "composite.h" #include "core/output.h" #include "core/renderlayer.h" diff --git a/src/cursordelegate_qpainter.h b/src/scene/cursordelegate_qpainter.h similarity index 100% rename from src/cursordelegate_qpainter.h rename to src/scene/cursordelegate_qpainter.h