backends/drm: rename drm object files

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

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"

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"

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"

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"
 

src/backends/drm/drm_egl_layer_surface.h

@@ -14,7 +14,7 @@
 #include <optional>
 
 #include "core/outputlayer.h"
-#include "drm_object_plane.h"
+#include "drm_plane.h"
 
 namespace KWaylandServer
 {

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"

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"

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 <QObject>
 #include <QPoint>

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 <drm_fourcc.h>
 #include <gbm.h>

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
 {

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 <errno.h>

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"
 

src/backends/drm/drm_shadow_buffer.h

@@ -12,7 +12,7 @@
 #include <kwinglutils.h>
 
 #include "drm_egl_backend.h"
-#include "drm_object_plane.h"
+#include "drm_plane.h"
 
 namespace KWin
 {