diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -394,7 +394,7 @@ decorations/decorations_logging.cpp abstract_egl_backend.cpp eglonxbackend.cpp - abstract_backend.cpp + platform.cpp shell_client.cpp wayland_server.cpp wayland_cursor_theme.cpp diff --git a/autotests/wayland/debug_console_test.cpp b/autotests/wayland/debug_console_test.cpp --- a/autotests/wayland/debug_console_test.cpp +++ b/autotests/wayland/debug_console_test.cpp @@ -18,7 +18,7 @@ along with this program. If not, see . *********************************************************************/ #include "kwin_wayland_test.h" -#include "abstract_backend.h" +#include "platform.h" #include "debug_console.h" #include "screens.h" #include "shell_client.h" diff --git a/autotests/wayland/decoration_input_test.cpp b/autotests/wayland/decoration_input_test.cpp --- a/autotests/wayland/decoration_input_test.cpp +++ b/autotests/wayland/decoration_input_test.cpp @@ -18,7 +18,7 @@ along with this program. If not, see . *********************************************************************/ #include "kwin_wayland_test.h" -#include "abstract_backend.h" +#include "platform.h" #include "abstract_client.h" #include "cursor.h" #include "screenedge.h" diff --git a/autotests/wayland/dont_crash_cancel_animation.cpp b/autotests/wayland/dont_crash_cancel_animation.cpp --- a/autotests/wayland/dont_crash_cancel_animation.cpp +++ b/autotests/wayland/dont_crash_cancel_animation.cpp @@ -18,7 +18,7 @@ along with this program. If not, see . *********************************************************************/ #include "kwin_wayland_test.h" -#include "abstract_backend.h" +#include "platform.h" #include "abstract_client.h" #include "client.h" #include "composite.h" diff --git a/autotests/wayland/dont_crash_glxgears.cpp b/autotests/wayland/dont_crash_glxgears.cpp --- a/autotests/wayland/dont_crash_glxgears.cpp +++ b/autotests/wayland/dont_crash_glxgears.cpp @@ -18,7 +18,7 @@ along with this program. If not, see . *********************************************************************/ #include "kwin_wayland_test.h" -#include "abstract_backend.h" +#include "platform.h" #include "abstract_client.h" #include "client.h" #include "deleted.h" diff --git a/autotests/wayland/input_stacking_order.cpp b/autotests/wayland/input_stacking_order.cpp --- a/autotests/wayland/input_stacking_order.cpp +++ b/autotests/wayland/input_stacking_order.cpp @@ -18,7 +18,7 @@ along with this program. If not, see . *********************************************************************/ #include "kwin_wayland_test.h" -#include "abstract_backend.h" +#include "platform.h" #include "abstract_client.h" #include "cursor.h" #include "deleted.h" diff --git a/autotests/wayland/internal_window.cpp b/autotests/wayland/internal_window.cpp --- a/autotests/wayland/internal_window.cpp +++ b/autotests/wayland/internal_window.cpp @@ -18,7 +18,7 @@ along with this program. If not, see . *********************************************************************/ #include "kwin_wayland_test.h" -#include "abstract_backend.h" +#include "platform.h" #include "cursor.h" #include "shell_client.h" #include "screens.h" diff --git a/autotests/wayland/kwin_wayland_test.cpp b/autotests/wayland/kwin_wayland_test.cpp --- a/autotests/wayland/kwin_wayland_test.cpp +++ b/autotests/wayland/kwin_wayland_test.cpp @@ -18,7 +18,7 @@ along with this program. If not, see . *********************************************************************/ #include "kwin_wayland_test.h" -#include "../../abstract_backend.h" +#include "../../platform.h" #include "../../effects.h" #include "../../wayland_server.h" #include "../../workspace.h" diff --git a/autotests/wayland/lockscreen.cpp b/autotests/wayland/lockscreen.cpp --- a/autotests/wayland/lockscreen.cpp +++ b/autotests/wayland/lockscreen.cpp @@ -18,7 +18,7 @@ along with this program. If not, see . *********************************************************************/ #include "kwin_wayland_test.h" -#include "abstract_backend.h" +#include "platform.h" #include "abstract_client.h" #include "cursor.h" #include "screenedge.h" diff --git a/autotests/wayland/move_resize_window_test.cpp b/autotests/wayland/move_resize_window_test.cpp --- a/autotests/wayland/move_resize_window_test.cpp +++ b/autotests/wayland/move_resize_window_test.cpp @@ -19,7 +19,7 @@ along with this program. If not, see . *********************************************************************/ #include "kwin_wayland_test.h" -#include "abstract_backend.h" +#include "platform.h" #include "abstract_client.h" #include "cursor.h" #include "effects.h" diff --git a/autotests/wayland/platformcursor.cpp b/autotests/wayland/platformcursor.cpp --- a/autotests/wayland/platformcursor.cpp +++ b/autotests/wayland/platformcursor.cpp @@ -19,7 +19,7 @@ *********************************************************************/ #include "kwin_wayland_test.h" #include "cursor.h" -#include "abstract_backend.h" +#include "platform.h" #include "wayland_server.h" namespace KWin diff --git a/autotests/wayland/pointer_input.cpp b/autotests/wayland/pointer_input.cpp --- a/autotests/wayland/pointer_input.cpp +++ b/autotests/wayland/pointer_input.cpp @@ -18,7 +18,7 @@ along with this program. If not, see . *********************************************************************/ #include "kwin_wayland_test.h" -#include "abstract_backend.h" +#include "platform.h" #include "abstract_client.h" #include "cursor.h" #include "deleted.h" diff --git a/autotests/wayland/quick_tiling_test.cpp b/autotests/wayland/quick_tiling_test.cpp --- a/autotests/wayland/quick_tiling_test.cpp +++ b/autotests/wayland/quick_tiling_test.cpp @@ -18,7 +18,7 @@ along with this program. If not, see . *********************************************************************/ #include "kwin_wayland_test.h" -#include "abstract_backend.h" +#include "platform.h" #include "abstract_client.h" #include "cursor.h" #include "screens.h" diff --git a/autotests/wayland/start_test.cpp b/autotests/wayland/start_test.cpp --- a/autotests/wayland/start_test.cpp +++ b/autotests/wayland/start_test.cpp @@ -18,7 +18,7 @@ along with this program. If not, see . *********************************************************************/ #include "kwin_wayland_test.h" -#include "abstract_backend.h" +#include "platform.h" #include "screens.h" #include "wayland_server.h" #include "workspace.h" diff --git a/autotests/wayland/touch_input_test.cpp b/autotests/wayland/touch_input_test.cpp --- a/autotests/wayland/touch_input_test.cpp +++ b/autotests/wayland/touch_input_test.cpp @@ -18,7 +18,7 @@ along with this program. If not, see . *********************************************************************/ #include "kwin_wayland_test.h" -#include "abstract_backend.h" +#include "platform.h" #include "cursor.h" #include "shell_client.h" #include "screens.h" diff --git a/autotests/wayland/transient_no_input_test.cpp b/autotests/wayland/transient_no_input_test.cpp --- a/autotests/wayland/transient_no_input_test.cpp +++ b/autotests/wayland/transient_no_input_test.cpp @@ -18,7 +18,7 @@ along with this program. If not, see . *********************************************************************/ #include "kwin_wayland_test.h" -#include "abstract_backend.h" +#include "platform.h" #include "abstract_client.h" #include "screens.h" #include "wayland_server.h" diff --git a/autotests/wayland/transient_placement.cpp b/autotests/wayland/transient_placement.cpp --- a/autotests/wayland/transient_placement.cpp +++ b/autotests/wayland/transient_placement.cpp @@ -18,7 +18,7 @@ along with this program. If not, see . *********************************************************************/ #include "kwin_wayland_test.h" -#include "abstract_backend.h" +#include "platform.h" #include "abstract_client.h" #include "cursor.h" #include "screenedge.h" diff --git a/backends/drm/drm_backend.h b/backends/drm/drm_backend.h --- a/backends/drm/drm_backend.h +++ b/backends/drm/drm_backend.h @@ -19,7 +19,7 @@ *********************************************************************/ #ifndef KWIN_DRM_BACKEND_H #define KWIN_DRM_BACKEND_H -#include "abstract_backend.h" +#include "platform.h" #include "input.h" #include "drm_buffer.h" diff --git a/backends/fbdev/fb_backend.h b/backends/fbdev/fb_backend.h --- a/backends/fbdev/fb_backend.h +++ b/backends/fbdev/fb_backend.h @@ -19,7 +19,7 @@ *********************************************************************/ #ifndef KWIN_FB_BACKEND_H #define KWIN_FB_BACKEND_H -#include "abstract_backend.h" +#include "platform.h" #include #include diff --git a/backends/hwcomposer/hwcomposer_backend.h b/backends/hwcomposer/hwcomposer_backend.h --- a/backends/hwcomposer/hwcomposer_backend.h +++ b/backends/hwcomposer/hwcomposer_backend.h @@ -19,7 +19,7 @@ *********************************************************************/ #ifndef KWIN_HWCOMPOSER_BACKEND_H #define KWIN_HWCOMPOSER_BACKEND_H -#include "abstract_backend.h" +#include "platform.h" #include "input.h" #include diff --git a/backends/virtual/virtual_backend.h b/backends/virtual/virtual_backend.h --- a/backends/virtual/virtual_backend.h +++ b/backends/virtual/virtual_backend.h @@ -19,7 +19,7 @@ *********************************************************************/ #ifndef KWIN_VIRTUAL_BACKEND_H #define KWIN_VIRTUAL_BACKEND_H -#include "abstract_backend.h" +#include "platform.h" #include diff --git a/backends/wayland/wayland_backend.h b/backends/wayland/wayland_backend.h --- a/backends/wayland/wayland_backend.h +++ b/backends/wayland/wayland_backend.h @@ -20,7 +20,7 @@ #ifndef KWIN_WAYLAND_BACKEND_H #define KWIN_WAYLAND_BACKEND_H // KWin -#include "abstract_backend.h" +#include "platform.h" #include #include // Qt diff --git a/backends/x11/x11windowed_backend.h b/backends/x11/x11windowed_backend.h --- a/backends/x11/x11windowed_backend.h +++ b/backends/x11/x11windowed_backend.h @@ -19,7 +19,7 @@ *********************************************************************/ #ifndef KWIN_X11WINDOWED_BACKEND_H #define KWIN_X11WINDOWED_BACKEND_H -#include "abstract_backend.h" +#include "platform.h" #include diff --git a/composite.cpp b/composite.cpp --- a/composite.cpp +++ b/composite.cpp @@ -37,7 +37,7 @@ #include "useractions.h" #include "compositingprefs.h" #include "xcbutils.h" -#include "abstract_backend.h" +#include "platform.h" #include "shell_client.h" #include "wayland_server.h" #include "decorations/decoratedclient.h" diff --git a/effects.cpp b/effects.cpp --- a/effects.cpp +++ b/effects.cpp @@ -56,7 +56,7 @@ #include #include "composite.h" #include "xcbutils.h" -#include "abstract_backend.h" +#include "platform.h" #include "shell_client.h" #include "wayland_server.h" diff --git a/input.cpp b/input.cpp --- a/input.cpp +++ b/input.cpp @@ -37,7 +37,7 @@ #include "libinput/connection.h" #include "virtual_terminal.h" #endif -#include "abstract_backend.h" +#include "platform.h" #include "shell_client.h" #include "wayland_server.h" #include diff --git a/main.cpp b/main.cpp --- a/main.cpp +++ b/main.cpp @@ -22,7 +22,7 @@ #include "main.h" #include // kwin -#include "abstract_backend.h" +#include "platform.h" #include "atoms.h" #include "composite.h" #include "cursor.h" diff --git a/main_wayland.cpp b/main_wayland.cpp --- a/main_wayland.cpp +++ b/main_wayland.cpp @@ -21,7 +21,7 @@ #include "workspace.h" #include // kwin -#include "abstract_backend.h" +#include "platform.h" #include "effects.h" #include "wayland_server.h" #include "xcbutils.h" diff --git a/abstract_backend.h b/platform.h rename from abstract_backend.h rename to platform.h --- a/abstract_backend.h +++ b/platform.h @@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . *********************************************************************/ -#ifndef KWIN_ABSTRACT_BACKEND_H -#define KWIN_ABSTRACT_BACKEND_H +#ifndef KWIN_PLATFORM_H +#define KWIN_PLATFORM_H #include #include #include diff --git a/abstract_backend.cpp b/platform.cpp rename from abstract_backend.cpp rename to platform.cpp --- a/abstract_backend.cpp +++ b/platform.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . *********************************************************************/ -#include "abstract_backend.h" +#include "platform.h" #include #include "abstract_egl_backend.h" #include "composite.h" diff --git a/plugins/qpa/integration.cpp b/plugins/qpa/integration.cpp --- a/plugins/qpa/integration.cpp +++ b/plugins/qpa/integration.cpp @@ -19,7 +19,7 @@ *********************************************************************/ #define WL_EGL_PLATFORM 1 #include "integration.h" -#include "abstract_backend.h" +#include "platform.h" #include "backingstore.h" #include "nativeinterface.h" #include "platformcontextwayland.h" diff --git a/plugins/qpa/sharingplatformcontext.cpp b/plugins/qpa/sharingplatformcontext.cpp --- a/plugins/qpa/sharingplatformcontext.cpp +++ b/plugins/qpa/sharingplatformcontext.cpp @@ -20,7 +20,7 @@ #include "sharingplatformcontext.h" #include "integration.h" #include "window.h" -#include "../../abstract_backend.h" +#include "../../platform.h" #include "../../wayland_server.h" #include "../../shell_client.h" diff --git a/pointer_input.cpp b/pointer_input.cpp --- a/pointer_input.cpp +++ b/pointer_input.cpp @@ -18,7 +18,7 @@ along with this program. If not, see . *********************************************************************/ #include "pointer_input.h" -#include "abstract_backend.h" +#include "platform.h" #include "effects.h" #include "screens.h" #include "shell_client.h" diff --git a/scene_opengl.cpp b/scene_opengl.cpp --- a/scene_opengl.cpp +++ b/scene_opengl.cpp @@ -32,7 +32,7 @@ #include "glxbackend.h" #endif -#include "abstract_backend.h" +#include "platform.h" #include "wayland_server.h" #include diff --git a/scene_qpainter.cpp b/scene_qpainter.cpp --- a/scene_qpainter.cpp +++ b/scene_qpainter.cpp @@ -27,7 +27,7 @@ #include "main.h" #include "screens.h" #include "toplevel.h" -#include "abstract_backend.h" +#include "platform.h" #include "wayland_server.h" #include #include diff --git a/screens.cpp b/screens.cpp --- a/screens.cpp +++ b/screens.cpp @@ -26,7 +26,7 @@ #include #include #include "screens_xrandr.h" -#include "abstract_backend.h" +#include "platform.h" #include "wayland_server.h" #ifdef KWIN_UNIT_TEST #include diff --git a/wayland_server.cpp b/wayland_server.cpp --- a/wayland_server.cpp +++ b/wayland_server.cpp @@ -19,7 +19,7 @@ *********************************************************************/ #include "wayland_server.h" #include "client.h" -#include "abstract_backend.h" +#include "platform.h" #include "composite.h" #include "screens.h" #include "shell_client.h"