Move opengl context attribute builders to utils directory

autotests/CMakeLists.txt

@@ -186,8 +186,8 @@ add_test(NAME kwin-testX11TimestampUpdate COMMAND testX11TimestampUpdate)
 ecm_mark_as_test(testX11TimestampUpdate)
 
 set(testOpenGLContextAttributeBuilder_SRCS
-    ../src/abstract_opengl_context_attribute_builder.cpp
-    ../src/egl_context_attribute_builder.cpp
+    ../src/utils/abstract_opengl_context_attribute_builder.cpp
+    ../src/utils/egl_context_attribute_builder.cpp
     opengl_context_attribute_builder_test.cpp
 )
 

autotests/opengl_context_attribute_builder_test.cpp

@@ -6,8 +6,8 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "abstract_opengl_context_attribute_builder.h"
-#include "egl_context_attribute_builder.h"
+#include "utils/abstract_opengl_context_attribute_builder.h"
+#include "utils/egl_context_attribute_builder.h"
 #include <QtTest>
 #include <epoxy/egl.h>
 

src/CMakeLists.txt

@@ -28,7 +28,6 @@ set_target_properties(kwin PROPERTIES
 target_sources(kwin PRIVATE
     3rdparty/xcursor.c
     abstract_client.cpp
-    abstract_opengl_context_attribute_builder.cpp
     abstract_output.cpp
     abstract_wayland_output.cpp
     activation.cpp
@@ -50,7 +49,6 @@ target_sources(kwin PRIVATE
     dpmsinputeventfilter.cpp
     effectloader.cpp
     effects.cpp
-    egl_context_attribute_builder.cpp
     events.cpp
     focuschain.cpp
     ftrace.cpp

src/backends/x11/standalone/glx_context_attribute_builder.h

@@ -7,7 +7,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #pragma once
-#include "abstract_opengl_context_attribute_builder.h"
+#include "utils/abstract_opengl_context_attribute_builder.h"
 
 namespace KWin
 {

src/effects/screenshot/screenshotdbusinterface1.cpp

@@ -7,7 +7,7 @@
 
 #include "screenshotdbusinterface1.h"
 #include "screenshotlogging.h"
-#include "../service_utils.h"
+#include "utils/serviceutils.h"
 
 #include <KLocalizedString>
 #include <KNotification>

src/effects/screenshot/screenshotdbusinterface2.cpp

@@ -7,9 +7,9 @@
 */
 
 #include "screenshotdbusinterface2.h"
-#include "../service_utils.h"
 #include "screenshot2adaptor.h"
 #include "screenshotlogging.h"
+#include "utils/serviceutils.h"
 
 #include <KLocalizedString>
 

src/platformsupport/scenes/opengl/abstract_egl_backend.cpp

@@ -9,9 +9,9 @@
 #include "abstract_egl_backend.h"
 #include "egl_dmabuf.h"
 #include "composite.h"
-#include "egl_context_attribute_builder.h"
 #include "options.h"
 #include "platform.h"
+#include "utils/egl_context_attribute_builder.h"
 #include "wayland_server.h"
 #include "abstract_wayland_output.h"
 #include <KWaylandServer/display.h>

src/plugins/qpa/eglplatformcontext.cpp

@@ -9,11 +9,11 @@
 */
 
 #include "eglplatformcontext.h"
-#include "egl_context_attribute_builder.h"
 #include "eglhelpers.h"
 #include "internal_client.h"
 #include "offscreensurface.h"
 #include "platform.h"
+#include "utils/egl_context_attribute_builder.h"
 #include "window.h"
 
 #include "logging.h"

src/utils/CMakeLists.txt

@@ -1,3 +1,5 @@
 target_sources(kwin PRIVATE
+    abstract_opengl_context_attribute_builder.cpp
+    egl_context_attribute_builder.cpp
     xcbutils.cpp
 )

src/wayland_server.cpp

@@ -21,8 +21,8 @@
 #include "workspace.h"
 #include "xdgshellclient.h"
 #include "xdgactivationv1.h"
-#include "service_utils.h"
 #include "unmanaged.h"
+#include "utils/serviceutils.h"
 #include "waylandoutput.h"
 #include "waylandoutputdevicev2.h"
 #include "virtualdesktops.h"