From ff0e89b030b7d0cacda37acbde19a3457a3de535 Mon Sep 17 00:00:00 2001 From: Xaver Hugl Date: Fri, 22 Jul 2022 18:59:22 +0200 Subject: [PATCH] backends/x11/standalone: rename files to be more consistent --- autotests/CMakeLists.txt | 2 +- .../opengl_context_attribute_builder_test.cpp | 2 +- src/backends/x11/standalone/CMakeLists.txt | 40 +++++++++---------- ...11cursor.cpp => x11_standalone_cursor.cpp} | 4 +- .../{x11cursor.h => x11_standalone_cursor.h} | 0 .../{edge.cpp => x11_standalone_edge.cpp} | 2 +- .../{edge.h => x11_standalone_edge.h} | 0 ...cts_x11.cpp => x11_standalone_effects.cpp} | 4 +- ...effects_x11.h => x11_standalone_effects.h} | 0 ...one_effects_mouse_interception_filter.cpp} | 2 +- ...alone_effects_mouse_interception_filter.h} | 0 ...end.cpp => x11_standalone_egl_backend.cpp} | 6 +-- ...backend.h => x11_standalone_egl_backend.h} | 0 ...end.cpp => x11_standalone_glx_backend.cpp} | 18 ++++----- ...backend.h => x11_standalone_glx_backend.h} | 0 ...ndalone_glx_context_attribute_builder.cpp} | 2 +- ...tandalone_glx_context_attribute_builder.h} | 0 ....cpp => x11_standalone_glxconvenience.cpp} | 2 +- ...ence.h => x11_standalone_glxconvenience.h} | 0 ...logging.cpp => x11_standalone_logging.cpp} | 2 +- .../{logging.h => x11_standalone_logging.h} | 0 ...x11_standalone_non_composited_outline.cpp} | 2 +- ...> x11_standalone_non_composited_outline.h} | 0 ...standalone_omlsynccontrolvsyncmonitor.cpp} | 6 +-- ...1_standalone_omlsynccontrolvsyncmonitor.h} | 0 ...1_output.cpp => x11_standalone_output.cpp} | 2 +- .../{x11_output.h => x11_standalone_output.h} | 0 ...1.cpp => x11_standalone_overlaywindow.cpp} | 2 +- ...w_x11.h => x11_standalone_overlaywindow.h} | 0 ...p => x11_standalone_placeholderoutput.cpp} | 2 +- ...t.h => x11_standalone_placeholderoutput.h} | 0 ...atform.cpp => x11_standalone_platform.cpp} | 28 ++++++------- ...1_platform.h => x11_standalone_platform.h} | 0 ... => x11_standalone_screenedges_filter.cpp} | 2 +- ....h => x11_standalone_screenedges_filter.h} | 0 ...1_standalone_sgivideosyncvsyncmonitor.cpp} | 6 +-- ...x11_standalone_sgivideosyncvsyncmonitor.h} | 0 ....cpp => x11_standalone_windowselector.cpp} | 2 +- ...ctor.h => x11_standalone_windowselector.h} | 0 ...standalone_xfixes_cursor_event_filter.cpp} | 4 +- ...1_standalone_xfixes_cursor_event_filter.h} | 0 ...p => x11_standalone_xinputintegration.cpp} | 6 +-- ...n.h => x11_standalone_xinputintegration.h} | 0 src/main_x11.cpp | 2 +- 44 files changed, 74 insertions(+), 76 deletions(-) rename src/backends/x11/standalone/{x11cursor.cpp => x11_standalone_cursor.cpp} (97%) rename src/backends/x11/standalone/{x11cursor.h => x11_standalone_cursor.h} (100%) rename src/backends/x11/standalone/{edge.cpp => x11_standalone_edge.cpp} (99%) rename src/backends/x11/standalone/{edge.h => x11_standalone_edge.h} (100%) rename src/backends/x11/standalone/{effects_x11.cpp => x11_standalone_effects.cpp} (97%) rename src/backends/x11/standalone/{effects_x11.h => x11_standalone_effects.h} (100%) rename src/backends/x11/standalone/{effects_mouse_interception_x11_filter.cpp => x11_standalone_effects_mouse_interception_filter.cpp} (98%) rename src/backends/x11/standalone/{effects_mouse_interception_x11_filter.h => x11_standalone_effects_mouse_interception_filter.h} (100%) rename src/backends/x11/standalone/{eglbackend.cpp => x11_standalone_egl_backend.cpp} (98%) rename src/backends/x11/standalone/{eglbackend.h => x11_standalone_egl_backend.h} (100%) rename src/backends/x11/standalone/{glxbackend.cpp => x11_standalone_glx_backend.cpp} (98%) rename src/backends/x11/standalone/{glxbackend.h => x11_standalone_glx_backend.h} (100%) rename src/backends/x11/standalone/{glx_context_attribute_builder.cpp => x11_standalone_glx_context_attribute_builder.cpp} (95%) rename src/backends/x11/standalone/{glx_context_attribute_builder.h => x11_standalone_glx_context_attribute_builder.h} (100%) rename src/backends/x11/standalone/{glxconvenience.cpp => x11_standalone_glxconvenience.cpp} (97%) rename src/backends/x11/standalone/{glxconvenience.h => x11_standalone_glxconvenience.h} (100%) rename src/backends/x11/standalone/{logging.cpp => x11_standalone_logging.cpp} (88%) rename src/backends/x11/standalone/{logging.h => x11_standalone_logging.h} (100%) rename src/backends/x11/standalone/{non_composited_outline.cpp => x11_standalone_non_composited_outline.cpp} (99%) rename src/backends/x11/standalone/{non_composited_outline.h => x11_standalone_non_composited_outline.h} (100%) rename src/backends/x11/standalone/{omlsynccontrolvsyncmonitor.cpp => x11_standalone_omlsynccontrolvsyncmonitor.cpp} (97%) rename src/backends/x11/standalone/{omlsynccontrolvsyncmonitor.h => x11_standalone_omlsynccontrolvsyncmonitor.h} (100%) rename src/backends/x11/standalone/{x11_output.cpp => x11_standalone_output.cpp} (97%) rename src/backends/x11/standalone/{x11_output.h => x11_standalone_output.h} (100%) rename src/backends/x11/standalone/{overlaywindow_x11.cpp => x11_standalone_overlaywindow.cpp} (99%) rename src/backends/x11/standalone/{overlaywindow_x11.h => x11_standalone_overlaywindow.h} (100%) rename src/backends/x11/standalone/{x11placeholderoutput.cpp => x11_standalone_placeholderoutput.cpp} (94%) rename src/backends/x11/standalone/{x11placeholderoutput.h => x11_standalone_placeholderoutput.h} (100%) rename src/backends/x11/standalone/{x11_platform.cpp => x11_standalone_platform.cpp} (97%) rename src/backends/x11/standalone/{x11_platform.h => x11_standalone_platform.h} (100%) rename src/backends/x11/standalone/{screenedges_filter.cpp => x11_standalone_screenedges_filter.cpp} (97%) rename src/backends/x11/standalone/{screenedges_filter.h => x11_standalone_screenedges_filter.h} (100%) rename src/backends/x11/standalone/{sgivideosyncvsyncmonitor.cpp => x11_standalone_sgivideosyncvsyncmonitor.cpp} (97%) rename src/backends/x11/standalone/{sgivideosyncvsyncmonitor.h => x11_standalone_sgivideosyncvsyncmonitor.h} (100%) rename src/backends/x11/standalone/{windowselector.cpp => x11_standalone_windowselector.cpp} (99%) rename src/backends/x11/standalone/{windowselector.h => x11_standalone_windowselector.h} (100%) rename src/backends/x11/standalone/{xfixes_cursor_event_filter.cpp => x11_standalone_xfixes_cursor_event_filter.cpp} (86%) rename src/backends/x11/standalone/{xfixes_cursor_event_filter.h => x11_standalone_xfixes_cursor_event_filter.h} (100%) rename src/backends/x11/standalone/{xinputintegration.cpp => x11_standalone_xinputintegration.cpp} (98%) rename src/backends/x11/standalone/{xinputintegration.h => x11_standalone_xinputintegration.h} (100%) diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt index aed642886f..fa7e248458 100644 --- a/autotests/CMakeLists.txt +++ b/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) diff --git a/autotests/opengl_context_attribute_builder_test.cpp b/autotests/opengl_context_attribute_builder_test.cpp index c85f0ae59e..d7eeb72c10 100644 --- a/autotests/opengl_context_attribute_builder_test.cpp +++ b/autotests/opengl_context_attribute_builder_test.cpp @@ -13,7 +13,7 @@ #include #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 #ifndef GLX_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV diff --git a/src/backends/x11/standalone/CMakeLists.txt b/src/backends/x11/standalone/CMakeLists.txt index 1dbcdbc246..b68cdc3ffa 100644 --- a/src/backends/x11/standalone/CMakeLists.txt +++ b/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() diff --git a/src/backends/x11/standalone/x11cursor.cpp b/src/backends/x11/standalone/x11_standalone_cursor.cpp similarity index 97% rename from src/backends/x11/standalone/x11cursor.cpp rename to src/backends/x11/standalone/x11_standalone_cursor.cpp index 5b37576362..7771015657 100644 --- a/src/backends/x11/standalone/x11cursor.cpp +++ b/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 #include diff --git a/src/backends/x11/standalone/x11cursor.h b/src/backends/x11/standalone/x11_standalone_cursor.h similarity index 100% rename from src/backends/x11/standalone/x11cursor.h rename to src/backends/x11/standalone/x11_standalone_cursor.h diff --git a/src/backends/x11/standalone/edge.cpp b/src/backends/x11/standalone/x11_standalone_edge.cpp similarity index 99% rename from src/backends/x11/standalone/edge.cpp rename to src/backends/x11/standalone/x11_standalone_edge.cpp index ef7839cb19..5c868dbc83 100644 --- a/src/backends/x11/standalone/edge.cpp +++ b/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" diff --git a/src/backends/x11/standalone/edge.h b/src/backends/x11/standalone/x11_standalone_edge.h similarity index 100% rename from src/backends/x11/standalone/edge.h rename to src/backends/x11/standalone/x11_standalone_edge.h diff --git a/src/backends/x11/standalone/effects_x11.cpp b/src/backends/x11/standalone/x11_standalone_effects.cpp similarity index 97% rename from src/backends/x11/standalone/effects_x11.cpp rename to src/backends/x11/standalone/x11_standalone_effects.cpp index be94db017a..851aa5f4dd 100644 --- a/src/backends/x11/standalone/effects_x11.cpp +++ b/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 diff --git a/src/backends/x11/standalone/effects_x11.h b/src/backends/x11/standalone/x11_standalone_effects.h similarity index 100% rename from src/backends/x11/standalone/effects_x11.h rename to src/backends/x11/standalone/x11_standalone_effects.h diff --git a/src/backends/x11/standalone/effects_mouse_interception_x11_filter.cpp b/src/backends/x11/standalone/x11_standalone_effects_mouse_interception_filter.cpp similarity index 98% rename from src/backends/x11/standalone/effects_mouse_interception_x11_filter.cpp rename to src/backends/x11/standalone/x11_standalone_effects_mouse_interception_filter.cpp index b2901734ed..5d54555100 100644 --- a/src/backends/x11/standalone/effects_mouse_interception_x11_filter.cpp +++ b/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" diff --git a/src/backends/x11/standalone/effects_mouse_interception_x11_filter.h b/src/backends/x11/standalone/x11_standalone_effects_mouse_interception_filter.h similarity index 100% rename from src/backends/x11/standalone/effects_mouse_interception_x11_filter.h rename to src/backends/x11/standalone/x11_standalone_effects_mouse_interception_filter.h diff --git a/src/backends/x11/standalone/eglbackend.cpp b/src/backends/x11/standalone/x11_standalone_egl_backend.cpp similarity index 98% rename from src/backends/x11/standalone/eglbackend.cpp rename to src/backends/x11/standalone/x11_standalone_egl_backend.cpp index ce9d18bc95..346352623a 100644 --- a/src/backends/x11/standalone/eglbackend.cpp +++ b/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 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) diff --git a/src/backends/x11/standalone/eglbackend.h b/src/backends/x11/standalone/x11_standalone_egl_backend.h similarity index 100% rename from src/backends/x11/standalone/eglbackend.h rename to src/backends/x11/standalone/x11_standalone_egl_backend.h diff --git a/src/backends/x11/standalone/glxbackend.cpp b/src/backends/x11/standalone/x11_standalone_glx_backend.cpp similarity index 98% rename from src/backends/x11/standalone/glxbackend.cpp rename to src/backends/x11/standalone/x11_standalone_glx_backend.cpp index bd984203e2..5b42a39fd5 100644 --- a/src/backends/x11/standalone/glxbackend.cpp +++ b/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" diff --git a/src/backends/x11/standalone/glxbackend.h b/src/backends/x11/standalone/x11_standalone_glx_backend.h similarity index 100% rename from src/backends/x11/standalone/glxbackend.h rename to src/backends/x11/standalone/x11_standalone_glx_backend.h diff --git a/src/backends/x11/standalone/glx_context_attribute_builder.cpp b/src/backends/x11/standalone/x11_standalone_glx_context_attribute_builder.cpp similarity index 95% rename from src/backends/x11/standalone/glx_context_attribute_builder.cpp rename to src/backends/x11/standalone/x11_standalone_glx_context_attribute_builder.cpp index 163fd78086..f8f06d600b 100644 --- a/src/backends/x11/standalone/glx_context_attribute_builder.cpp +++ b/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 #ifndef GLX_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV diff --git a/src/backends/x11/standalone/glx_context_attribute_builder.h b/src/backends/x11/standalone/x11_standalone_glx_context_attribute_builder.h similarity index 100% rename from src/backends/x11/standalone/glx_context_attribute_builder.h rename to src/backends/x11/standalone/x11_standalone_glx_context_attribute_builder.h diff --git a/src/backends/x11/standalone/glxconvenience.cpp b/src/backends/x11/standalone/x11_standalone_glxconvenience.cpp similarity index 97% rename from src/backends/x11/standalone/glxconvenience.cpp rename to src/backends/x11/standalone/x11_standalone_glxconvenience.cpp index b725f8cbfc..0f6a21e6f7 100644 --- a/src/backends/x11/standalone/glxconvenience.cpp +++ b/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 #include diff --git a/src/backends/x11/standalone/glxconvenience.h b/src/backends/x11/standalone/x11_standalone_glxconvenience.h similarity index 100% rename from src/backends/x11/standalone/glxconvenience.h rename to src/backends/x11/standalone/x11_standalone_glxconvenience.h diff --git a/src/backends/x11/standalone/logging.cpp b/src/backends/x11/standalone/x11_standalone_logging.cpp similarity index 88% rename from src/backends/x11/standalone/logging.cpp rename to src/backends/x11/standalone/x11_standalone_logging.cpp index 21a1c984dd..8aefabe713 100644 --- a/src/backends/x11/standalone/logging.cpp +++ b/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) diff --git a/src/backends/x11/standalone/logging.h b/src/backends/x11/standalone/x11_standalone_logging.h similarity index 100% rename from src/backends/x11/standalone/logging.h rename to src/backends/x11/standalone/x11_standalone_logging.h diff --git a/src/backends/x11/standalone/non_composited_outline.cpp b/src/backends/x11/standalone/x11_standalone_non_composited_outline.cpp similarity index 99% rename from src/backends/x11/standalone/non_composited_outline.cpp rename to src/backends/x11/standalone/x11_standalone_non_composited_outline.cpp index 149a779ca0..24c4808ba2 100644 --- a/src/backends/x11/standalone/non_composited_outline.cpp +++ b/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 diff --git a/src/backends/x11/standalone/non_composited_outline.h b/src/backends/x11/standalone/x11_standalone_non_composited_outline.h similarity index 100% rename from src/backends/x11/standalone/non_composited_outline.h rename to src/backends/x11/standalone/x11_standalone_non_composited_outline.h diff --git a/src/backends/x11/standalone/omlsynccontrolvsyncmonitor.cpp b/src/backends/x11/standalone/x11_standalone_omlsynccontrolvsyncmonitor.cpp similarity index 97% rename from src/backends/x11/standalone/omlsynccontrolvsyncmonitor.cpp rename to src/backends/x11/standalone/x11_standalone_omlsynccontrolvsyncmonitor.cpp index 3008974f64..f2cc54aaca 100644 --- a/src/backends/x11/standalone/omlsynccontrolvsyncmonitor.cpp +++ b/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 diff --git a/src/backends/x11/standalone/omlsynccontrolvsyncmonitor.h b/src/backends/x11/standalone/x11_standalone_omlsynccontrolvsyncmonitor.h similarity index 100% rename from src/backends/x11/standalone/omlsynccontrolvsyncmonitor.h rename to src/backends/x11/standalone/x11_standalone_omlsynccontrolvsyncmonitor.h diff --git a/src/backends/x11/standalone/x11_output.cpp b/src/backends/x11/standalone/x11_standalone_output.cpp similarity index 97% rename from src/backends/x11/standalone/x11_output.cpp rename to src/backends/x11/standalone/x11_standalone_output.cpp index 6592f27f88..7c9ea79b31 100644 --- a/src/backends/x11/standalone/x11_output.cpp +++ b/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" diff --git a/src/backends/x11/standalone/x11_output.h b/src/backends/x11/standalone/x11_standalone_output.h similarity index 100% rename from src/backends/x11/standalone/x11_output.h rename to src/backends/x11/standalone/x11_standalone_output.h diff --git a/src/backends/x11/standalone/overlaywindow_x11.cpp b/src/backends/x11/standalone/x11_standalone_overlaywindow.cpp similarity index 99% rename from src/backends/x11/standalone/overlaywindow_x11.cpp rename to src/backends/x11/standalone/x11_standalone_overlaywindow.cpp index 93ddc9b3bc..c60a43e143 100644 --- a/src/backends/x11/standalone/overlaywindow_x11.cpp +++ b/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" diff --git a/src/backends/x11/standalone/overlaywindow_x11.h b/src/backends/x11/standalone/x11_standalone_overlaywindow.h similarity index 100% rename from src/backends/x11/standalone/overlaywindow_x11.h rename to src/backends/x11/standalone/x11_standalone_overlaywindow.h diff --git a/src/backends/x11/standalone/x11placeholderoutput.cpp b/src/backends/x11/standalone/x11_standalone_placeholderoutput.cpp similarity index 94% rename from src/backends/x11/standalone/x11placeholderoutput.cpp rename to src/backends/x11/standalone/x11_standalone_placeholderoutput.cpp index 16744b8101..84b551b41d 100644 --- a/src/backends/x11/standalone/x11placeholderoutput.cpp +++ b/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 diff --git a/src/backends/x11/standalone/x11placeholderoutput.h b/src/backends/x11/standalone/x11_standalone_placeholderoutput.h similarity index 100% rename from src/backends/x11/standalone/x11placeholderoutput.h rename to src/backends/x11/standalone/x11_standalone_placeholderoutput.h diff --git a/src/backends/x11/standalone/x11_platform.cpp b/src/backends/x11/standalone/x11_standalone_platform.cpp similarity index 97% rename from src/backends/x11/standalone/x11_platform.cpp rename to src/backends/x11/standalone/x11_standalone_platform.cpp index f07dea3080..f55a190578 100644 --- a/src/backends/x11/standalone/x11_platform.cpp +++ b/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 #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 #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" diff --git a/src/backends/x11/standalone/x11_platform.h b/src/backends/x11/standalone/x11_standalone_platform.h similarity index 100% rename from src/backends/x11/standalone/x11_platform.h rename to src/backends/x11/standalone/x11_standalone_platform.h diff --git a/src/backends/x11/standalone/screenedges_filter.cpp b/src/backends/x11/standalone/x11_standalone_screenedges_filter.cpp similarity index 97% rename from src/backends/x11/standalone/screenedges_filter.cpp rename to src/backends/x11/standalone/x11_standalone_screenedges_filter.cpp index 680d9b2a51..53af443eb5 100644 --- a/src/backends/x11/standalone/screenedges_filter.cpp +++ b/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" diff --git a/src/backends/x11/standalone/screenedges_filter.h b/src/backends/x11/standalone/x11_standalone_screenedges_filter.h similarity index 100% rename from src/backends/x11/standalone/screenedges_filter.h rename to src/backends/x11/standalone/x11_standalone_screenedges_filter.h diff --git a/src/backends/x11/standalone/sgivideosyncvsyncmonitor.cpp b/src/backends/x11/standalone/x11_standalone_sgivideosyncvsyncmonitor.cpp similarity index 97% rename from src/backends/x11/standalone/sgivideosyncvsyncmonitor.cpp rename to src/backends/x11/standalone/x11_standalone_sgivideosyncvsyncmonitor.cpp index 687819fa7d..9e247b0678 100644 --- a/src/backends/x11/standalone/sgivideosyncvsyncmonitor.cpp +++ b/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 diff --git a/src/backends/x11/standalone/sgivideosyncvsyncmonitor.h b/src/backends/x11/standalone/x11_standalone_sgivideosyncvsyncmonitor.h similarity index 100% rename from src/backends/x11/standalone/sgivideosyncvsyncmonitor.h rename to src/backends/x11/standalone/x11_standalone_sgivideosyncvsyncmonitor.h diff --git a/src/backends/x11/standalone/windowselector.cpp b/src/backends/x11/standalone/x11_standalone_windowselector.cpp similarity index 99% rename from src/backends/x11/standalone/windowselector.cpp rename to src/backends/x11/standalone/x11_standalone_windowselector.cpp index c146c37f1a..b90a4105ba 100644 --- a/src/backends/x11/standalone/windowselector.cpp +++ b/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" diff --git a/src/backends/x11/standalone/windowselector.h b/src/backends/x11/standalone/x11_standalone_windowselector.h similarity index 100% rename from src/backends/x11/standalone/windowselector.h rename to src/backends/x11/standalone/x11_standalone_windowselector.h diff --git a/src/backends/x11/standalone/xfixes_cursor_event_filter.cpp b/src/backends/x11/standalone/x11_standalone_xfixes_cursor_event_filter.cpp similarity index 86% rename from src/backends/x11/standalone/xfixes_cursor_event_filter.cpp rename to src/backends/x11/standalone/x11_standalone_xfixes_cursor_event_filter.cpp index e2b984ef5a..71f49a38ca 100644 --- a/src/backends/x11/standalone/xfixes_cursor_event_filter.cpp +++ b/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 { diff --git a/src/backends/x11/standalone/xfixes_cursor_event_filter.h b/src/backends/x11/standalone/x11_standalone_xfixes_cursor_event_filter.h similarity index 100% rename from src/backends/x11/standalone/xfixes_cursor_event_filter.h rename to src/backends/x11/standalone/x11_standalone_xfixes_cursor_event_filter.h diff --git a/src/backends/x11/standalone/xinputintegration.cpp b/src/backends/x11/standalone/x11_standalone_xinputintegration.cpp similarity index 98% rename from src/backends/x11/standalone/xinputintegration.cpp rename to src/backends/x11/standalone/x11_standalone_xinputintegration.cpp index 99d9f7e838..34d1f5d564 100644 --- a/src/backends/x11/standalone/xinputintegration.cpp +++ b/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" diff --git a/src/backends/x11/standalone/xinputintegration.h b/src/backends/x11/standalone/x11_standalone_xinputintegration.h similarity index 100% rename from src/backends/x11/standalone/xinputintegration.h rename to src/backends/x11/standalone/x11_standalone_xinputintegration.h diff --git a/src/main_x11.cpp b/src/main_x11.cpp index b734421655..0acf1c95d8 100644 --- a/src/main_x11.cpp +++ b/src/main_x11.cpp @@ -12,7 +12,7 @@ #include -#include "backends/x11/standalone/x11_platform.h" +#include "backends/x11/standalone/x11_standalone_platform.h" #include "platform.h" #include "sm.h" #include "tabletmodemanager.h"