From 24b1eab228e58ab4fe9689fe7543cff4ab613ba2 Mon Sep 17 00:00:00 2001
From: Xaver Hugl <xaver.hugl@gmail.com>
Date: Fri, 22 Jul 2022 15:16:09 +0200
Subject: [PATCH] backends/wayland: rename files to be more consistent

---
 src/backends/wayland/CMakeLists.txt                         | 6 +++---
 src/backends/wayland/wayland_backend.cpp                    | 6 +++---
 .../{egl_wayland_backend.cpp => wayland_egl_backend.cpp}    | 4 ++--
 .../{egl_wayland_backend.h => wayland_egl_backend.h}        | 0
 src/backends/wayland/{logging.cpp => wayland_logging.cpp}   | 2 +-
 src/backends/wayland/{logging.h => wayland_logging.h}       | 0
 ...ter_wayland_backend.cpp => wayland_qpainter_backend.cpp} | 4 ++--
 ...painter_wayland_backend.h => wayland_qpainter_backend.h} | 0
 8 files changed, 11 insertions(+), 11 deletions(-)
 rename src/backends/wayland/{egl_wayland_backend.cpp => wayland_egl_backend.cpp} (99%)
 rename src/backends/wayland/{egl_wayland_backend.h => wayland_egl_backend.h} (100%)
 rename src/backends/wayland/{logging.cpp => wayland_logging.cpp} (90%)
 rename src/backends/wayland/{logging.h => wayland_logging.h} (100%)
 rename src/backends/wayland/{scene_qpainter_wayland_backend.cpp => wayland_qpainter_backend.cpp} (98%)
 rename src/backends/wayland/{scene_qpainter_wayland_backend.h => wayland_qpainter_backend.h} (100%)

diff --git a/src/backends/wayland/CMakeLists.txt b/src/backends/wayland/CMakeLists.txt
index 14d911e7d2..96d815e150 100644
--- a/src/backends/wayland/CMakeLists.txt
+++ b/src/backends/wayland/CMakeLists.txt
@@ -1,12 +1,12 @@
 target_sources(kwin PRIVATE
-    logging.cpp
-    scene_qpainter_wayland_backend.cpp
     wayland_backend.cpp
+    wayland_logging.cpp
     wayland_output.cpp
+    wayland_qpainter_backend.cpp
 )
 
 if (HAVE_WAYLAND_EGL)
-    target_sources(kwin PRIVATE egl_wayland_backend.cpp)
+    target_sources(kwin PRIVATE wayland_egl_backend.cpp)
 endif()
 
 target_link_libraries(kwin KF5::WaylandClient)
diff --git a/src/backends/wayland/wayland_backend.cpp b/src/backends/wayland/wayland_backend.cpp
index 29cdc177fa..f8f24fd663 100644
--- a/src/backends/wayland/wayland_backend.cpp
+++ b/src/backends/wayland/wayland_backend.cpp
@@ -10,14 +10,14 @@
 #include "wayland_backend.h"
 
 #if HAVE_WAYLAND_EGL
-#include "egl_wayland_backend.h"
+#include "wayland_egl_backend.h"
 #include <gbm.h>
 #endif
-#include "logging.h"
 #include "renderloop_p.h"
-#include "scene_qpainter_wayland_backend.h"
 #include "session.h"
+#include "wayland_logging.h"
 #include "wayland_output.h"
+#include "wayland_qpainter_backend.h"
 
 #include "composite.h"
 #include "cursor.h"
diff --git a/src/backends/wayland/egl_wayland_backend.cpp b/src/backends/wayland/wayland_egl_backend.cpp
similarity index 99%
rename from src/backends/wayland/egl_wayland_backend.cpp
rename to src/backends/wayland/wayland_egl_backend.cpp
index f42f488559..3a214f1fab 100644
--- a/src/backends/wayland/egl_wayland_backend.cpp
+++ b/src/backends/wayland/wayland_egl_backend.cpp
@@ -9,7 +9,7 @@
 */
 #define WL_EGL_PLATFORM 1
 
-#include "egl_wayland_backend.h"
+#include "wayland_egl_backend.h"
 #include "basiceglsurfacetexture_internal.h"
 #include "basiceglsurfacetexture_wayland.h"
 
@@ -18,8 +18,8 @@
 
 #include "composite.h"
 #include "kwinglutils.h"
-#include "logging.h"
 #include "options.h"
+#include "wayland_logging.h"
 #include "wayland_server.h"
 
 #include <fcntl.h>
diff --git a/src/backends/wayland/egl_wayland_backend.h b/src/backends/wayland/wayland_egl_backend.h
similarity index 100%
rename from src/backends/wayland/egl_wayland_backend.h
rename to src/backends/wayland/wayland_egl_backend.h
diff --git a/src/backends/wayland/logging.cpp b/src/backends/wayland/wayland_logging.cpp
similarity index 90%
rename from src/backends/wayland/logging.cpp
rename to src/backends/wayland/wayland_logging.cpp
index cdbff07e48..79446f6cfd 100644
--- a/src/backends/wayland/logging.cpp
+++ b/src/backends/wayland/wayland_logging.cpp
@@ -6,5 +6,5 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "logging.h"
+#include "wayland_logging.h"
 Q_LOGGING_CATEGORY(KWIN_WAYLAND_BACKEND, "kwin_wayland_backend", QtWarningMsg)
diff --git a/src/backends/wayland/logging.h b/src/backends/wayland/wayland_logging.h
similarity index 100%
rename from src/backends/wayland/logging.h
rename to src/backends/wayland/wayland_logging.h
diff --git a/src/backends/wayland/scene_qpainter_wayland_backend.cpp b/src/backends/wayland/wayland_qpainter_backend.cpp
similarity index 98%
rename from src/backends/wayland/scene_qpainter_wayland_backend.cpp
rename to src/backends/wayland/wayland_qpainter_backend.cpp
index 50d3cde620..f4bbaf6815 100644
--- a/src/backends/wayland/scene_qpainter_wayland_backend.cpp
+++ b/src/backends/wayland/wayland_qpainter_backend.cpp
@@ -7,13 +7,13 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "scene_qpainter_wayland_backend.h"
+#include "wayland_qpainter_backend.h"
 #include "wayland_backend.h"
 #include "wayland_output.h"
 
 #include "composite.h"
 #include "kwineffects.h"
-#include "logging.h"
+#include "wayland_logging.h"
 
 #include <KWayland/Client/buffer.h>
 #include <KWayland/Client/shm_pool.h>
diff --git a/src/backends/wayland/scene_qpainter_wayland_backend.h b/src/backends/wayland/wayland_qpainter_backend.h
similarity index 100%
rename from src/backends/wayland/scene_qpainter_wayland_backend.h
rename to src/backends/wayland/wayland_qpainter_backend.h