From d31e9e88b43842b04077ebf7d27d9c1b915491ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 7 Apr 2016 09:24:17 +0200 Subject: [PATCH] Rename abstract_backend.(h|cpp) to platform.(h|cpp) Reviewers: #plasma Subscribers: plasma-devel Projects: #plasma Differential Revision: https://phabricator.kde.org/D1340 --- CMakeLists.txt | 2 +- autotests/wayland/debug_console_test.cpp | 2 +- autotests/wayland/decoration_input_test.cpp | 2 +- autotests/wayland/dont_crash_cancel_animation.cpp | 2 +- autotests/wayland/dont_crash_glxgears.cpp | 2 +- autotests/wayland/input_stacking_order.cpp | 2 +- autotests/wayland/internal_window.cpp | 2 +- autotests/wayland/kwin_wayland_test.cpp | 2 +- autotests/wayland/lockscreen.cpp | 2 +- autotests/wayland/move_resize_window_test.cpp | 2 +- autotests/wayland/platformcursor.cpp | 2 +- autotests/wayland/pointer_input.cpp | 2 +- autotests/wayland/quick_tiling_test.cpp | 2 +- autotests/wayland/start_test.cpp | 2 +- autotests/wayland/touch_input_test.cpp | 2 +- autotests/wayland/transient_no_input_test.cpp | 2 +- autotests/wayland/transient_placement.cpp | 2 +- backends/drm/drm_backend.h | 2 +- backends/fbdev/fb_backend.h | 2 +- backends/hwcomposer/hwcomposer_backend.h | 2 +- backends/virtual/virtual_backend.h | 2 +- backends/wayland/wayland_backend.h | 2 +- backends/x11/x11windowed_backend.h | 2 +- composite.cpp | 2 +- effects.cpp | 2 +- input.cpp | 2 +- main.cpp | 2 +- main_wayland.cpp | 2 +- abstract_backend.cpp => platform.cpp | 2 +- abstract_backend.h => platform.h | 4 ++-- plugins/qpa/integration.cpp | 2 +- plugins/qpa/sharingplatformcontext.cpp | 2 +- pointer_input.cpp | 2 +- scene_opengl.cpp | 2 +- scene_qpainter.cpp | 2 +- screens.cpp | 2 +- wayland_server.cpp | 2 +- 37 files changed, 38 insertions(+), 38 deletions(-) rename abstract_backend.cpp => platform.cpp (99%) rename abstract_backend.h => platform.h (98%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 55054e21aa..4ba9970b80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -394,7 +394,7 @@ set(kwin_KDEINIT_SRCS 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 index 2b263583c1..56c844d4cd 100644 --- a/autotests/wayland/debug_console_test.cpp +++ b/autotests/wayland/debug_console_test.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License 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 index 56474cb96d..fa000ed65e 100644 --- a/autotests/wayland/decoration_input_test.cpp +++ b/autotests/wayland/decoration_input_test.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License 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 index 8e2bb8cd0a..6106b9e24e 100644 --- a/autotests/wayland/dont_crash_cancel_animation.cpp +++ b/autotests/wayland/dont_crash_cancel_animation.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License 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 index 4dfee5fad2..8b522d03d1 100644 --- a/autotests/wayland/dont_crash_glxgears.cpp +++ b/autotests/wayland/dont_crash_glxgears.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License 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 index 8d410c2953..507d1d7495 100644 --- a/autotests/wayland/input_stacking_order.cpp +++ b/autotests/wayland/input_stacking_order.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License 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 index 6c49bfd169..f252b9a580 100644 --- a/autotests/wayland/internal_window.cpp +++ b/autotests/wayland/internal_window.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License 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 index d5f5386bbe..4001abb6ea 100644 --- a/autotests/wayland/kwin_wayland_test.cpp +++ b/autotests/wayland/kwin_wayland_test.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License 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 index 49014915f7..0aeaa7941a 100644 --- a/autotests/wayland/lockscreen.cpp +++ b/autotests/wayland/lockscreen.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License 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 index bf31b3f29b..4a87ffff3f 100644 --- a/autotests/wayland/move_resize_window_test.cpp +++ b/autotests/wayland/move_resize_window_test.cpp @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License 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 index fecf208ae2..2f92a04dc9 100644 --- a/autotests/wayland/platformcursor.cpp +++ b/autotests/wayland/platformcursor.cpp @@ -19,7 +19,7 @@ along with this program. If not, see . *********************************************************************/ #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 index b4e7360c8b..71842c1a67 100644 --- a/autotests/wayland/pointer_input.cpp +++ b/autotests/wayland/pointer_input.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License 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 index db4524cc88..1cb2fd200d 100644 --- a/autotests/wayland/quick_tiling_test.cpp +++ b/autotests/wayland/quick_tiling_test.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License 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 index acfdff58dd..8feb178612 100644 --- a/autotests/wayland/start_test.cpp +++ b/autotests/wayland/start_test.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License 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 index 241314529d..f8d20751a7 100644 --- a/autotests/wayland/touch_input_test.cpp +++ b/autotests/wayland/touch_input_test.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License 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 index f65fcea20a..d6636058c9 100644 --- a/autotests/wayland/transient_no_input_test.cpp +++ b/autotests/wayland/transient_no_input_test.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License 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 index 0921f6523a..0879a0ee18 100644 --- a/autotests/wayland/transient_placement.cpp +++ b/autotests/wayland/transient_placement.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License 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 index 1fa9d1a523..41fbcf3538 100644 --- a/backends/drm/drm_backend.h +++ b/backends/drm/drm_backend.h @@ -19,7 +19,7 @@ along with this program. If not, see . *********************************************************************/ #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 index afdd88ff3e..7aee7eefc8 100644 --- a/backends/fbdev/fb_backend.h +++ b/backends/fbdev/fb_backend.h @@ -19,7 +19,7 @@ along with this program. If not, see . *********************************************************************/ #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 index c94f6cfc5e..e7125adf79 100644 --- a/backends/hwcomposer/hwcomposer_backend.h +++ b/backends/hwcomposer/hwcomposer_backend.h @@ -19,7 +19,7 @@ along with this program. If not, see . *********************************************************************/ #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 index f0d1e2c7d2..ca3d2e1d51 100644 --- a/backends/virtual/virtual_backend.h +++ b/backends/virtual/virtual_backend.h @@ -19,7 +19,7 @@ along with this program. If not, see . *********************************************************************/ #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 index 36ac9f5dfd..606c031778 100644 --- a/backends/wayland/wayland_backend.h +++ b/backends/wayland/wayland_backend.h @@ -20,7 +20,7 @@ along with this program. If not, see . #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 index 559289185f..25121f907f 100644 --- a/backends/x11/x11windowed_backend.h +++ b/backends/x11/x11windowed_backend.h @@ -19,7 +19,7 @@ along with this program. If not, see . *********************************************************************/ #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 index 0b9d33f912..ef8488f11a 100644 --- a/composite.cpp +++ b/composite.cpp @@ -37,7 +37,7 @@ along with this program. If not, see . #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 index 7b968d7216..2bade17c79 100644 --- a/effects.cpp +++ b/effects.cpp @@ -56,7 +56,7 @@ along with this program. If not, see . #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 index 4c7657b09b..4eccbf826a 100644 --- a/input.cpp +++ b/input.cpp @@ -37,7 +37,7 @@ along with this program. If not, see . #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 index 409015ac26..716717bdb6 100644 --- a/main.cpp +++ b/main.cpp @@ -22,7 +22,7 @@ along with this program. If not, see . #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 index 2f3d851308..f15d30ee3e 100644 --- a/main_wayland.cpp +++ b/main_wayland.cpp @@ -21,7 +21,7 @@ along with this program. If not, see . #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.cpp b/platform.cpp similarity index 99% rename from abstract_backend.cpp rename to platform.cpp index b9f37db880..0cd51301f0 100644 --- a/abstract_backend.cpp +++ b/platform.cpp @@ -17,7 +17,7 @@ GNU General Public License for more details. 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/abstract_backend.h b/platform.h similarity index 98% rename from abstract_backend.h rename to platform.h index 7a9bfaa590..080101d8c8 100644 --- a/abstract_backend.h +++ b/platform.h @@ -17,8 +17,8 @@ GNU General Public License for more details. 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/plugins/qpa/integration.cpp b/plugins/qpa/integration.cpp index 6aef09e0f7..569b9c77bc 100644 --- a/plugins/qpa/integration.cpp +++ b/plugins/qpa/integration.cpp @@ -19,7 +19,7 @@ along with this program. If not, see . *********************************************************************/ #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 index 113852ea0e..4c4567b400 100644 --- a/plugins/qpa/sharingplatformcontext.cpp +++ b/plugins/qpa/sharingplatformcontext.cpp @@ -20,7 +20,7 @@ along with this program. If not, see . #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 index 8fe569f42f..f4aaf8eb60 100644 --- a/pointer_input.cpp +++ b/pointer_input.cpp @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License 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 index 6472d12313..886b9664b6 100644 --- a/scene_opengl.cpp +++ b/scene_opengl.cpp @@ -32,7 +32,7 @@ along with this program. If not, see . #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 index 9bcf673be3..51cdae723d 100644 --- a/scene_qpainter.cpp +++ b/scene_qpainter.cpp @@ -27,7 +27,7 @@ along with this program. If not, see . #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 index 77243761e0..062e52039a 100644 --- a/screens.cpp +++ b/screens.cpp @@ -26,7 +26,7 @@ along with this program. If not, see . #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 index e549dab0df..3798c1de0f 100644 --- a/wayland_server.cpp +++ b/wayland_server.cpp @@ -19,7 +19,7 @@ along with this program. If not, see . *********************************************************************/ #include "wayland_server.h" #include "client.h" -#include "abstract_backend.h" +#include "platform.h" #include "composite.h" #include "screens.h" #include "shell_client.h"