From 629a32a802a3e5bf8419c3ef4169ac6c745195d8 Mon Sep 17 00:00:00 2001 From: Xaver Hugl Date: Thu, 20 Oct 2022 17:05:31 +0200 Subject: [PATCH] backends/drm: rename drm object files --- src/backends/drm/CMakeLists.txt | 6 +++--- src/backends/drm/drm_backend.cpp | 6 +++--- .../drm/{drm_object_connector.cpp => drm_connector.cpp} | 4 ++-- .../drm/{drm_object_connector.h => drm_connector.h} | 0 src/backends/drm/{drm_object_crtc.cpp => drm_crtc.cpp} | 2 +- src/backends/drm/{drm_object_crtc.h => drm_crtc.h} | 4 ++-- src/backends/drm/drm_egl_layer_surface.h | 2 +- src/backends/drm/drm_gpu.cpp | 6 +++--- src/backends/drm/drm_output.cpp | 4 ++-- src/backends/drm/drm_output.h | 2 +- src/backends/drm/drm_pipeline.cpp | 6 +++--- src/backends/drm/drm_pipeline.h | 4 ++-- src/backends/drm/drm_pipeline_legacy.cpp | 4 ++-- src/backends/drm/{drm_object_plane.cpp => drm_plane.cpp} | 2 +- src/backends/drm/{drm_object_plane.h => drm_plane.h} | 0 src/backends/drm/drm_shadow_buffer.h | 2 +- 16 files changed, 27 insertions(+), 27 deletions(-) rename src/backends/drm/{drm_object_connector.cpp => drm_connector.cpp} (99%) rename src/backends/drm/{drm_object_connector.h => drm_connector.h} (100%) rename src/backends/drm/{drm_object_crtc.cpp => drm_crtc.cpp} (98%) rename src/backends/drm/{drm_object_crtc.h => drm_crtc.h} (95%) rename src/backends/drm/{drm_object_plane.cpp => drm_plane.cpp} (99%) rename src/backends/drm/{drm_object_plane.h => drm_plane.h} (100%) diff --git a/src/backends/drm/CMakeLists.txt b/src/backends/drm/CMakeLists.txt index 71f4b3aca8..21e8699dc8 100644 --- a/src/backends/drm/CMakeLists.txt +++ b/src/backends/drm/CMakeLists.txt @@ -3,6 +3,8 @@ target_sources(kwin PRIVATE drm_backend.cpp drm_buffer.cpp drm_buffer_gbm.cpp + drm_connector.cpp + drm_crtc.cpp drm_dmabuf_feedback.cpp drm_dumb_buffer.cpp drm_dumb_swapchain.cpp @@ -14,13 +16,11 @@ target_sources(kwin PRIVATE drm_gpu.cpp drm_layer.cpp drm_logging.cpp - drm_object_connector.cpp drm_object.cpp - drm_object_crtc.cpp - drm_object_plane.cpp drm_output.cpp drm_pipeline.cpp drm_pipeline_legacy.cpp + drm_plane.cpp drm_property.cpp drm_qpainter_backend.cpp drm_qpainter_layer.cpp diff --git a/src/backends/drm/drm_backend.cpp b/src/backends/drm/drm_backend.cpp index a3f6fc5839..6b6806fb3c 100644 --- a/src/backends/drm/drm_backend.cpp +++ b/src/backends/drm/drm_backend.cpp @@ -14,14 +14,14 @@ #include "core/outputconfiguration.h" #include "core/renderloop.h" #include "core/session.h" +#include "drm_connector.h" +#include "drm_crtc.h" #include "drm_egl_backend.h" #include "drm_gpu.h" #include "drm_logging.h" -#include "drm_object_connector.h" -#include "drm_object_crtc.h" -#include "drm_object_plane.h" #include "drm_output.h" #include "drm_pipeline.h" +#include "drm_plane.h" #include "drm_qpainter_backend.h" #include "drm_render_backend.h" #include "drm_virtual_output.h" diff --git a/src/backends/drm/drm_object_connector.cpp b/src/backends/drm/drm_connector.cpp similarity index 99% rename from src/backends/drm/drm_object_connector.cpp rename to src/backends/drm/drm_connector.cpp index 88d899552f..62eef7cb19 100644 --- a/src/backends/drm/drm_object_connector.cpp +++ b/src/backends/drm/drm_connector.cpp @@ -7,10 +7,10 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "drm_object_connector.h" +#include "drm_connector.h" +#include "drm_crtc.h" #include "drm_gpu.h" #include "drm_logging.h" -#include "drm_object_crtc.h" #include "drm_output.h" #include "drm_pipeline.h" #include "drm_pointer.h" diff --git a/src/backends/drm/drm_object_connector.h b/src/backends/drm/drm_connector.h similarity index 100% rename from src/backends/drm/drm_object_connector.h rename to src/backends/drm/drm_connector.h diff --git a/src/backends/drm/drm_object_crtc.cpp b/src/backends/drm/drm_crtc.cpp similarity index 98% rename from src/backends/drm/drm_object_crtc.cpp rename to src/backends/drm/drm_crtc.cpp index 466588cbb0..cd9d4a2f72 100644 --- a/src/backends/drm/drm_object_crtc.cpp +++ b/src/backends/drm/drm_crtc.cpp @@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "drm_object_crtc.h" +#include "drm_crtc.h" #include "drm_backend.h" #include "drm_buffer.h" #include "drm_gpu.h" diff --git a/src/backends/drm/drm_object_crtc.h b/src/backends/drm/drm_crtc.h similarity index 95% rename from src/backends/drm/drm_object_crtc.h rename to src/backends/drm/drm_crtc.h index dda0d55073..9a921af484 100644 --- a/src/backends/drm/drm_object_crtc.h +++ b/src/backends/drm/drm_crtc.h @@ -6,8 +6,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef KWIN_DRM_OBJECT_CRTC_H -#define KWIN_DRM_OBJECT_CRTC_H +#ifndef KWIN_drm_crtc_H +#define KWIN_drm_crtc_H #include "drm_object.h" diff --git a/src/backends/drm/drm_egl_layer_surface.h b/src/backends/drm/drm_egl_layer_surface.h index 74f6215dc3..2e3df6b269 100644 --- a/src/backends/drm/drm_egl_layer_surface.h +++ b/src/backends/drm/drm_egl_layer_surface.h @@ -14,7 +14,7 @@ #include #include "core/outputlayer.h" -#include "drm_object_plane.h" +#include "drm_plane.h" namespace KWaylandServer { diff --git a/src/backends/drm/drm_gpu.cpp b/src/backends/drm/drm_gpu.cpp index 4c2b5e8587..24b02e1741 100644 --- a/src/backends/drm/drm_gpu.cpp +++ b/src/backends/drm/drm_gpu.cpp @@ -14,14 +14,14 @@ #include "core/renderloop_p.h" #include "core/session.h" #include "drm_backend.h" +#include "drm_connector.h" +#include "drm_crtc.h" #include "drm_egl_backend.h" #include "drm_layer.h" #include "drm_logging.h" -#include "drm_object_connector.h" -#include "drm_object_crtc.h" -#include "drm_object_plane.h" #include "drm_output.h" #include "drm_pipeline.h" +#include "drm_plane.h" #include "drm_virtual_output.h" #include "gbm_dmabuf.h" #include "wayland/drmleasedevice_v1_interface.h" diff --git a/src/backends/drm/drm_output.cpp b/src/backends/drm/drm_output.cpp index 7d8451a19d..2ba96678f4 100644 --- a/src/backends/drm/drm_output.cpp +++ b/src/backends/drm/drm_output.cpp @@ -9,9 +9,9 @@ #include "drm_output.h" #include "drm_backend.h" #include "drm_buffer.h" +#include "drm_connector.h" +#include "drm_crtc.h" #include "drm_gpu.h" -#include "drm_object_connector.h" -#include "drm_object_crtc.h" #include "drm_pipeline.h" #include "core/outputconfiguration.h" diff --git a/src/backends/drm/drm_output.h b/src/backends/drm/drm_output.h index 17b869fef2..9101f0e3c9 100644 --- a/src/backends/drm/drm_output.h +++ b/src/backends/drm/drm_output.h @@ -11,7 +11,7 @@ #include "drm_abstract_output.h" #include "drm_object.h" -#include "drm_object_plane.h" +#include "drm_plane.h" #include #include diff --git a/src/backends/drm/drm_pipeline.cpp b/src/backends/drm/drm_pipeline.cpp index dd753e4346..79388f279f 100644 --- a/src/backends/drm/drm_pipeline.cpp +++ b/src/backends/drm/drm_pipeline.cpp @@ -16,14 +16,14 @@ #include "drm_backend.h" #include "drm_buffer.h" #include "drm_buffer_gbm.h" +#include "drm_connector.h" +#include "drm_crtc.h" #include "drm_egl_backend.h" #include "drm_gpu.h" #include "drm_layer.h" #include "drm_logging.h" -#include "drm_object_connector.h" -#include "drm_object_crtc.h" -#include "drm_object_plane.h" #include "drm_output.h" +#include "drm_plane.h" #include #include diff --git a/src/backends/drm/drm_pipeline.h b/src/backends/drm/drm_pipeline.h index eb9bc8f92d..17e1f0919a 100644 --- a/src/backends/drm/drm_pipeline.h +++ b/src/backends/drm/drm_pipeline.h @@ -19,8 +19,8 @@ #include "core/colorlut.h" #include "core/output.h" #include "core/renderloop_p.h" -#include "drm_object_plane.h" -#include "drm_object_connector.h" +#include "drm_connector.h" +#include "drm_plane.h" namespace KWin { diff --git a/src/backends/drm/drm_pipeline_legacy.cpp b/src/backends/drm/drm_pipeline_legacy.cpp index 60624e0ee4..26018f11ad 100644 --- a/src/backends/drm/drm_pipeline_legacy.cpp +++ b/src/backends/drm/drm_pipeline_legacy.cpp @@ -8,11 +8,11 @@ */ #include "drm_buffer.h" +#include "drm_connector.h" +#include "drm_crtc.h" #include "drm_gpu.h" #include "drm_layer.h" #include "drm_logging.h" -#include "drm_object_connector.h" -#include "drm_object_crtc.h" #include "drm_pipeline.h" #include diff --git a/src/backends/drm/drm_object_plane.cpp b/src/backends/drm/drm_plane.cpp similarity index 99% rename from src/backends/drm/drm_object_plane.cpp rename to src/backends/drm/drm_plane.cpp index dc615a39f4..d919b2d208 100644 --- a/src/backends/drm/drm_object_plane.cpp +++ b/src/backends/drm/drm_plane.cpp @@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "drm_object_plane.h" +#include "drm_plane.h" #include "config-kwin.h" diff --git a/src/backends/drm/drm_object_plane.h b/src/backends/drm/drm_plane.h similarity index 100% rename from src/backends/drm/drm_object_plane.h rename to src/backends/drm/drm_plane.h diff --git a/src/backends/drm/drm_shadow_buffer.h b/src/backends/drm/drm_shadow_buffer.h index eb09c552fd..8a58ca131a 100644 --- a/src/backends/drm/drm_shadow_buffer.h +++ b/src/backends/drm/drm_shadow_buffer.h @@ -12,7 +12,7 @@ #include #include "drm_egl_backend.h" -#include "drm_object_plane.h" +#include "drm_plane.h" namespace KWin {