backends/x11/standalone: rename files to be more consistent

autotests/CMakeLists.txt

@@ -194,7 +194,7 @@ set(testOpenGLContextAttributeBuilder_SRCS
 )
 
 if (HAVE_EPOXY_GLX)
-    set(testOpenGLContextAttributeBuilder_SRCS ${testOpenGLContextAttributeBuilder_SRCS} ../src/backends/x11/standalone/glx_context_attribute_builder.cpp)
+    set(testOpenGLContextAttributeBuilder_SRCS ${testOpenGLContextAttributeBuilder_SRCS} ../src/backends/x11/standalone/x11_standalone_glx_context_attribute_builder.cpp)
 endif()
 add_executable(testOpenGLContextAttributeBuilder ${testOpenGLContextAttributeBuilder_SRCS})
 target_link_libraries(testOpenGLContextAttributeBuilder Qt::Test)

autotests/opengl_context_attribute_builder_test.cpp

@@ -13,7 +13,7 @@
 
 #include <kwinconfig.h>
 #if HAVE_EPOXY_GLX
-#include "../src/backends/x11/standalone/glx_context_attribute_builder.h"
+#include "../src/backends/x11/standalone/x11_standalone_glx_context_attribute_builder.h"
 #include <epoxy/glx.h>
 
 #ifndef GLX_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV

src/backends/x11/standalone/CMakeLists.txt

@@ -1,18 +1,18 @@
 set(X11PLATFORM_SOURCES
-    edge.cpp
-    effects_mouse_interception_x11_filter.cpp
-    effects_x11.cpp
-    eglbackend.cpp
-    logging.cpp
-    non_composited_outline.cpp
-    overlaywindow_x11.cpp
-    screenedges_filter.cpp
-    windowselector.cpp
-    x11_output.cpp
-    x11_platform.cpp
-    x11cursor.cpp
-    x11placeholderoutput.cpp
-    xfixes_cursor_event_filter.cpp
+    x11_standalone_cursor.cpp
+    x11_standalone_edge.cpp
+    x11_standalone_effects.cpp
+    x11_standalone_effects_mouse_interception_filter.cpp
+    x11_standalone_egl_backend.cpp
+    x11_standalone_logging.cpp
+    x11_standalone_non_composited_outline.cpp
+    x11_standalone_output.cpp
+    x11_standalone_overlaywindow.cpp
+    x11_standalone_placeholderoutput.cpp
+    x11_standalone_platform.cpp
+    x11_standalone_screenedges_filter.cpp
+    x11_standalone_windowselector.cpp
+    x11_standalone_xfixes_cursor_event_filter.cpp
 )
 
 add_library(KWinX11Platform OBJECT ${X11PLATFORM_SOURCES})
@@ -21,17 +21,17 @@ if (QT_MAJOR_VERSION EQUAL "5")
     target_link_libraries(KWinX11Platform Qt::X11Extras)
 endif()
 if (X11_Xi_FOUND)
-    target_sources(KWinX11Platform PRIVATE xinputintegration.cpp)
+    target_sources(KWinX11Platform PRIVATE x11_standalone_xinputintegration.cpp)
     target_link_libraries(KWinX11Platform X11::Xi)
 endif()
 
 if (HAVE_EPOXY_GLX)
     target_sources(KWinX11Platform PRIVATE
-        glx_context_attribute_builder.cpp
-        glxbackend.cpp
-        glxconvenience.cpp
-        omlsynccontrolvsyncmonitor.cpp
-        sgivideosyncvsyncmonitor.cpp
+        x11_standalone_glx_context_attribute_builder.cpp
+        x11_standalone_glx_backend.cpp
+        x11_standalone_glxconvenience.cpp
+        x11_standalone_omlsynccontrolvsyncmonitor.cpp
+        x11_standalone_sgivideosyncvsyncmonitor.cpp
     )
 endif()
 

src/backends/x11/standalone/x11_standalone_cursor.cpp

@@ -6,12 +6,12 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "x11cursor.h"
+#include "x11_standalone_cursor.h"
 #include "input.h"
 #include "keyboard_input.h"
 #include "utils/common.h"
 #include "utils/xcbutils.h"
-#include "xfixes_cursor_event_filter.h"
+#include "x11_standalone_xfixes_cursor_event_filter.h"
 
 #include <QAbstractEventDispatcher>
 #include <QTimer>

src/backends/x11/standalone/x11_standalone_edge.cpp

@@ -15,7 +15,7 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "edge.h"
+#include "x11_standalone_edge.h"
 #include "atoms.h"
 #include "cursor.h"
 

src/backends/x11/standalone/x11_standalone_effects.cpp

@@ -7,13 +7,13 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "effects_x11.h"
+#include "x11_standalone_effects.h"
 #include "cursor.h"
-#include "effects_mouse_interception_x11_filter.h"
 #include "screenedge.h"
 #include "screens.h"
 #include "utils/common.h"
 #include "workspace.h"
+#include "x11_standalone_effects_mouse_interception_filter.h"
 
 #include <QDesktopWidget>
 

src/backends/x11/standalone/x11_standalone_effects_mouse_interception_filter.cpp

@@ -6,7 +6,7 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "effects_mouse_interception_x11_filter.h"
+#include "x11_standalone_effects_mouse_interception_filter.h"
 #include "effects.h"
 #include "utils/common.h"
 

src/backends/x11/standalone/x11_standalone_egl_backend.cpp

@@ -5,9 +5,8 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "eglbackend.h"
+#include "x11_standalone_egl_backend.h"
 #include "kwinglplatform.h"
-#include "logging.h"
 #include "options.h"
 #include "overlaywindow.h"
 #include "platform.h"
@@ -16,7 +15,8 @@
 #include "screens.h"
 #include "softwarevsyncmonitor.h"
 #include "surfaceitem_x11.h"
-#include "x11_platform.h"
+#include "x11_standalone_logging.h"
+#include "x11_standalone_platform.h"
 
 #include <QOpenGLContext>
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)

src/backends/x11/standalone/x11_standalone_glx_backend.cpp

@@ -12,17 +12,15 @@
 */
 
 // own
-#include "glxbackend.h"
-#include "glx_context_attribute_builder.h"
-#include "glxconvenience.h"
-#include "logging.h"
-#include "omlsynccontrolvsyncmonitor.h"
-#include "sgivideosyncvsyncmonitor.h"
-#include "softwarevsyncmonitor.h"
-#include "x11_platform.h"
-
+#include "x11_standalone_glx_backend.h"
 #include "../common/kwinxrenderutils.h"
-
+#include "softwarevsyncmonitor.h"
+#include "x11_standalone_glx_context_attribute_builder.h"
+#include "x11_standalone_glxconvenience.h"
+#include "x11_standalone_logging.h"
+#include "x11_standalone_omlsynccontrolvsyncmonitor.h"
+#include "x11_standalone_platform.h"
+#include "x11_standalone_sgivideosyncvsyncmonitor.h"
 // kwin
 #include "composite.h"
 #include "options.h"

src/backends/x11/standalone/x11_standalone_glx_context_attribute_builder.cpp

@@ -6,7 +6,7 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "glx_context_attribute_builder.h"
+#include "x11_standalone_glx_context_attribute_builder.h"
 #include <epoxy/glx.h>
 
 #ifndef GLX_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV

src/backends/x11/standalone/x11_standalone_glxconvenience.cpp

@@ -6,7 +6,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "glxconvenience.h"
+#include "x11_standalone_glxconvenience.h"
 
 #include <algorithm>
 #include <deque>

src/backends/x11/standalone/x11_standalone_logging.cpp

@@ -6,5 +6,5 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "logging.h"
+#include "x11_standalone_logging.h"
 Q_LOGGING_CATEGORY(KWIN_X11STANDALONE, "kwin_platform_x11_standalone", QtWarningMsg)

src/backends/x11/standalone/x11_standalone_non_composited_outline.cpp

@@ -8,7 +8,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 // own
-#include "non_composited_outline.h"
+#include "x11_standalone_non_composited_outline.h"
 // KWin libs
 #include "../common/kwinxrenderutils.h"
 // xcb

src/backends/x11/standalone/x11_standalone_omlsynccontrolvsyncmonitor.cpp

@@ -4,9 +4,9 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "omlsynccontrolvsyncmonitor.h"
-#include "glxconvenience.h"
-#include "logging.h"
+#include "x11_standalone_omlsynccontrolvsyncmonitor.h"
+#include "x11_standalone_glxconvenience.h"
+#include "x11_standalone_logging.h"
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 #include <private/qtx11extras_p.h>

src/backends/x11/standalone/x11_standalone_output.cpp

@@ -6,7 +6,7 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "x11_output.h"
+#include "x11_standalone_output.h"
 #include "colorlut.h"
 #include "main.h"
 

src/backends/x11/standalone/x11_standalone_overlaywindow.cpp

@@ -7,7 +7,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "overlaywindow_x11.h"
+#include "x11_standalone_overlaywindow.h"
 
 #include "composite.h"
 #include "kwinglobals.h"

src/backends/x11/standalone/x11_standalone_placeholderoutput.cpp

@@ -4,7 +4,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "x11placeholderoutput.h"
+#include "x11_standalone_placeholderoutput.h"
 #include "main.h"
 
 namespace KWin

src/backends/x11/standalone/x11_standalone_platform.cpp

@@ -6,38 +6,38 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "x11_platform.h"
+#include "x11_standalone_platform.h"
 
 #include <config-kwin.h>
 
 #include "atoms.h"
-#include "edge.h"
 #include "session.h"
-#include "windowselector.h"
-#include "x11cursor.h"
-#include "x11placeholderoutput.h"
+#include "x11_standalone_cursor.h"
+#include "x11_standalone_edge.h"
+#include "x11_standalone_placeholderoutput.h"
+#include "x11_standalone_windowselector.h"
 #include <kwinconfig.h>
 #if HAVE_EPOXY_GLX
-#include "glxbackend.h"
+#include "x11_standalone_glx_backend.h"
 #endif
 #if HAVE_X11_XINPUT
-#include "xinputintegration.h"
+#include "x11_standalone_xinputintegration.h"
 #endif
-#include "effects_x11.h"
-#include "eglbackend.h"
 #include "keyboard_input.h"
-#include "logging.h"
-#include "non_composited_outline.h"
 #include "options.h"
-#include "overlaywindow_x11.h"
 #include "renderloop.h"
-#include "screenedges_filter.h"
 #include "utils/c_ptr.h"
 #include "utils/edid.h"
 #include "utils/xcbutils.h"
 #include "window.h"
 #include "workspace.h"
-#include "x11_output.h"
+#include "x11_standalone_effects.h"
+#include "x11_standalone_egl_backend.h"
+#include "x11_standalone_logging.h"
+#include "x11_standalone_non_composited_outline.h"
+#include "x11_standalone_output.h"
+#include "x11_standalone_overlaywindow.h"
+#include "x11_standalone_screenedges_filter.h"
 
 #include "../common/kwinxrenderutils.h"
 

src/backends/x11/standalone/x11_standalone_screenedges_filter.cpp

@@ -6,7 +6,7 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "screenedges_filter.h"
+#include "x11_standalone_screenedges_filter.h"
 #include "atoms.h"
 #include "screenedge.h"
 

src/backends/x11/standalone/x11_standalone_sgivideosyncvsyncmonitor.cpp

@@ -4,9 +4,9 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "sgivideosyncvsyncmonitor.h"
-#include "glxconvenience.h"
-#include "logging.h"
+#include "x11_standalone_sgivideosyncvsyncmonitor.h"
+#include "x11_standalone_glxconvenience.h"
+#include "x11_standalone_logging.h"
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 #include <private/qtx11extras_p.h>

src/backends/x11/standalone/x11_standalone_windowselector.cpp

@@ -8,7 +8,7 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "windowselector.h"
+#include "x11_standalone_windowselector.h"
 #include "cursor.h"
 #include "unmanaged.h"
 #include "utils/xcbutils.h"

src/backends/x11/standalone/x11_standalone_xfixes_cursor_event_filter.cpp

@@ -6,9 +6,9 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "xfixes_cursor_event_filter.h"
+#include "x11_standalone_xfixes_cursor_event_filter.h"
 #include "utils/xcbutils.h"
-#include "x11cursor.h"
+#include "x11_standalone_cursor.h"
 
 namespace KWin
 {

src/backends/x11/standalone/x11_standalone_xinputintegration.cpp

@@ -6,15 +6,15 @@
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "xinputintegration.h"
+#include "x11_standalone_xinputintegration.h"
 #include "gestures.h"
 #include "keyboard_input.h"
-#include "logging.h"
 #include "main.h"
 #include "platform.h"
 #include "pointer_input.h"
 #include "screenedge.h"
-#include "x11cursor.h"
+#include "x11_standalone_cursor.h"
+#include "x11_standalone_logging.h"
 
 #include "../common/ge_event_mem_mover.h"
 

src/main_x11.cpp

@@ -12,7 +12,7 @@
 
 #include <config-kwin.h>
 
-#include "backends/x11/standalone/x11_platform.h"
+#include "backends/x11/standalone/x11_standalone_platform.h"
 #include "platform.h"
 #include "sm.h"
 #include "tabletmodemanager.h"