Move xcbutils to utils directory

3 years ago · 293b2244ac
parent e1d47b5946
commit 293b2244ac
42 changed files with 41 additions and 43 deletions
--- a/autotests/integration/activities_test.cpp
+++ b/autotests/integration/activities_test.cpp
@ -17,7 +17,7 @@
 #include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"
 #include <kwineffects.h>

 #include <QDBusConnection>
--- a/autotests/integration/debug_console_test.cpp
+++ b/autotests/integration/debug_console_test.cpp
@ -15,7 +15,7 @@
 #include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"

 #include <KWayland/Client/connection_thread.h>
 #include <KWayland/Client/compositor.h>
--- a/autotests/integration/desktop_window_x11_test.cpp
+++ b/autotests/integration/desktop_window_x11_test.cpp
@ -17,7 +17,7 @@
 #include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"
 #include <kwineffects.h>

 #include <netwm.h>
--- a/autotests/integration/kwin_wayland_test.cpp
+++ b/autotests/integration/kwin_wayland_test.cpp
@ -15,7 +15,7 @@
 #include "pluginmanager.h"
 #include "wayland_server.h"
 #include "workspace.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"
 #include "xwl/xwayland.h"

 #include <KPluginMetaData>
--- a/autotests/test_client_machine.cpp
+++ b/autotests/test_client_machine.cpp
@ -9,7 +9,7 @@
 #include "testutils.h"
 // KWin
 #include "client_machine.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"
 // Qt
 #include <QApplication>
 #include <QtTest>
--- a/autotests/test_xcb_size_hints.cpp
+++ b/autotests/test_xcb_size_hints.cpp
@ -8,7 +8,7 @@
 */
 #include "testutils.h"
 // KWin
-#include "xcbutils.h"
+#include "utils/xcbutils.h"
 // Qt
 #include <QApplication>
 #include <QtTest>
--- a/autotests/test_xcb_window.cpp
+++ b/autotests/test_xcb_window.cpp
@ -8,7 +8,7 @@
 */
 #include "testutils.h"
 // KWin
-#include "xcbutils.h"
+#include "utils/xcbutils.h"
 // Qt
 #include <QApplication>
 #include <QtTest>
--- a/autotests/test_xcb_wrapper.cpp
+++ b/autotests/test_xcb_wrapper.cpp
@ -8,7 +8,7 @@
 */
 #include "testutils.h"
 // KWin
-#include "xcbutils.h"
+#include "utils/xcbutils.h"
 // Qt
 #include <QApplication>
 #include <QtTest>
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -151,7 +151,6 @@ target_sources(kwin PRIVATE
    x11client.cpp
    x11eventfilter.cpp
    x11syncmanager.cpp
-    xcbutils.cpp
    xcursortheme.cpp
    xdgactivationv1.cpp
    xdgshellclient.cpp
@ -239,6 +238,7 @@ target_sources(kwin PRIVATE

 add_subdirectory(backends)
 add_subdirectory(scenes)
+add_subdirectory(utils)

 if (KWIN_BUILD_CMS)
    target_sources(kwin PRIVATE
--- a/src/atoms.h
+++ b/src/atoms.h
@ -12,7 +12,7 @@
 #ifndef KWIN_ATOMS_H
 #define KWIN_ATOMS_H

-#include "xcbutils.h"
+#include "utils/xcbutils.h"

 namespace KWin
 {
--- a/src/backends/x11/common/eglonxbackend.cpp
+++ b/src/backends/x11/common/eglonxbackend.cpp
@ -14,7 +14,7 @@
 #include "options.h"
 #include "overlaywindow.h"
 #include "platform.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"
 // Qt
 #include <QLoggingCategory>
 #include <QDebug>
--- a/src/backends/x11/standalone/edge.h
+++ b/src/backends/x11/standalone/edge.h
@ -18,7 +18,7 @@
 #ifndef KWIN_EDGE_H
 #define KWIN_EDGE_H
 #include "screenedge.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"

 namespace KWin
 {
--- a/src/backends/x11/standalone/effects_x11.h
+++ b/src/backends/x11/standalone/effects_x11.h
@ -11,7 +11,7 @@
 #define KWIN_EFFECTS_X11_H

 #include "effects.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"

 #include <memory.h>

--- a/src/backends/x11/standalone/glxbackend.cpp
+++ b/src/backends/x11/standalone/glxbackend.cpp
@ -29,7 +29,7 @@
 #include "scene.h"
 #include "screens.h"
 #include "surfaceitem_x11.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"
 // kwin libs
 #include <kwinglplatform.h>
 #include <kwinglutils.h>
--- a/src/backends/x11/standalone/non_composited_outline.h
+++ b/src/backends/x11/standalone/non_composited_outline.h
@ -9,7 +9,7 @@
 #ifndef KWIN_NON_COMPOSITED_OUTLINE_H
 #define KWIN_NON_COMPOSITED_OUTLINE_H
 #include "outline.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"

 namespace KWin
 {
--- a/src/backends/x11/standalone/overlaywindow_x11.cpp
+++ b/src/backends/x11/standalone/overlaywindow_x11.cpp
@ -14,7 +14,7 @@
 #include "scene.h"
 #include "screens.h"
 #include "utils.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"

 #include <QVector>

--- a/src/backends/x11/standalone/windowselector.cpp
+++ b/src/backends/x11/standalone/windowselector.cpp
@ -13,7 +13,7 @@
 #include "cursor.h"
 #include "unmanaged.h"
 #include "workspace.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"
 // XLib
 #include <X11/cursorfont.h>
 #include <X11/Xutil.h>
--- a/src/backends/x11/standalone/x11_platform.cpp
+++ b/src/backends/x11/standalone/x11_platform.cpp
@ -31,7 +31,7 @@
 #include "non_composited_outline.h"
 #include "workspace.h"
 #include "x11_output.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"
 #include "renderloop.h"

 #include <kwinxrenderutils.h>
--- a/src/backends/x11/standalone/x11cursor.cpp
+++ b/src/backends/x11/standalone/x11cursor.cpp
@ -10,7 +10,7 @@
 #include "input.h"
 #include "keyboard_input.h"
 #include "utils.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"
 #include "xfixes_cursor_event_filter.h"

 #include <QAbstractEventDispatcher>
--- a/src/backends/x11/standalone/xfixes_cursor_event_filter.cpp
+++ b/src/backends/x11/standalone/xfixes_cursor_event_filter.cpp
@ -8,7 +8,7 @@
 */
 #include "xfixes_cursor_event_filter.h"
 #include "x11cursor.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"

 namespace KWin
 {
--- a/src/backends/x11/windowed/x11windowed_backend.cpp
+++ b/src/backends/x11/windowed/x11windowed_backend.cpp
@ -12,7 +12,7 @@
 #include "scene_qpainter_x11_backend.h"
 #include "logging.h"
 #include "wayland_server.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"
 #include "egl_x11_backend.h"
 #include "screens.h"
 #include "session.h"
--- a/src/composite.cpp
+++ b/src/composite.cpp
@ -32,7 +32,7 @@
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11syncmanager.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"

 #include <kwinglplatform.h>
 #include <kwingltexture.h>
--- a/src/cursor.cpp
+++ b/src/cursor.cpp
@ -14,7 +14,7 @@
 #include "main.h"
 #include "platform.h"
 #include "utils.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"
 #include "abstract_output.h"
 #include "composite.h"
 #include "scene.h"
--- a/src/effects.cpp
+++ b/src/effects.cpp
@ -46,8 +46,8 @@
 #include <Plasma/Theme>

 #include "composite.h"
-#include "xcbutils.h"
 #include "platform.h"
+#include "utils/xcbutils.h"
 #include "waylandclient.h"
 #include "wayland_server.h"

--- a/src/events.cpp
+++ b/src/events.cpp
@ -30,7 +30,7 @@
 #include "effects.h"
 #include "screenedge.h"
 #include "screens.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"

 #include <KDecoration2/Decoration>

--- a/src/main.cpp
+++ b/src/main.cpp
@ -24,9 +24,9 @@
 #include "screens.h"
 #include "screenlockerwatcher.h"
 #include "sm.h"
+#include "utils/xcbutils.h"
 #include "workspace.h"
 #include "x11eventfilter.h"
-#include "xcbutils.h"

 #include <kwineffects.h>

--- a/src/main_x11.cpp
+++ b/src/main_x11.cpp
@ -15,7 +15,7 @@
 #include "platform.h"
 #include "sm.h"
 #include "workspace.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"

 #include <KConfigGroup>
 #include <KCrash>
--- a/src/scenes/opengl/lanczosfilter.cpp
+++ b/src/scenes/opengl/lanczosfilter.cpp
@ -9,12 +9,8 @@
 */

 #include "lanczosfilter.h"
-#include "x11client.h"
-#include "deleted.h"
 #include "effects.h"
-#include "unmanaged.h"
 #include "options.h"
-#include "utils.h"
 #include "workspace.h"

 #include <kwinglutils.h>
--- a/src/syncalarmx11filter.cpp
+++ b/src/syncalarmx11filter.cpp
@ -10,7 +10,7 @@
 #include "syncalarmx11filter.h"
 #include "workspace.h"
 #include "x11client.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"

 namespace KWin
 {
--- a/src/tabbox/tabbox.cpp
+++ b/src/tabbox/tabbox.cpp
@ -36,7 +36,7 @@
 #include "unmanaged.h"
 #include "virtualdesktops.h"
 #include "workspace.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"
 // Qt
 #include <QAction>
 #include <QKeyEvent>
--- a/src/tabbox/tabboxhandler.cpp
+++ b/src/tabbox/tabboxhandler.cpp
@ -11,7 +11,7 @@
 #include "tabboxhandler.h"
 #include <config-kwin.h>
 #include <kwinglobals.h>
-#include "xcbutils.h"
+#include "utils/xcbutils.h"
 // tabbox
 #include "clientmodel.h"
 #include "desktopmodel.h"
--- a/src/toplevel.h
+++ b/src/toplevel.h
@ -12,7 +12,7 @@

 // kwin
 #include "utils.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"
 // KDE
 #include <NETWM>
 // Qt
--- a/src/unmanaged.cpp
+++ b/src/unmanaged.cpp
@ -14,7 +14,6 @@
 #include "deleted.h"
 #include "surfaceitem_x11.h"
 #include "utils.h"
-#include "xcbutils.h"

 #include <QDebug>
 #include <QTimer>
--- a/src/utils/CMakeLists.txt
+++ b/src/utils/CMakeLists.txt
@ -0,0 +1,3 @@
+target_sources(kwin PRIVATE
+    xcbutils.cpp
+)
--- a/src/utils/xcbutils.cpp
+++ b/src/utils/xcbutils.cpp
@ -7,7 +7,7 @@

    SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "xcbutils.h"
+#include "utils/xcbutils.h"
 #include "utils.h"
 // Qt
 #include <QDebug>
--- a/src/utils/xcbutils.h
+++ b/src/utils/xcbutils.h
--- a/src/workspace.cpp
+++ b/src/workspace.cpp
@ -49,7 +49,7 @@
 #include "virtualdesktops.h"
 #include "was_user_interaction_x11_filter.h"
 #include "wayland_server.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"
 #include "main.h"
 #include "decorations/decorationbridge.h"
 #include "xwaylandclient.h"
--- a/src/x11client.h
+++ b/src/x11client.h
@ -13,7 +13,7 @@
 // kwin
 #include "decorationitem.h"
 #include "abstract_client.h"
-#include "xcbutils.h"
+#include "utils/xcbutils.h"
 // Qt
 #include <QElapsedTimer>
 #include <QFlags>
--- a/src/xwl/selection.cpp
+++ b/src/xwl/selection.cpp
@ -12,9 +12,9 @@
 #include "transfer.h"

 #include "atoms.h"
+#include "utils/xcbutils.h"
 #include "workspace.h"
 #include "x11client.h"
-#include "xcbutils.h"

 #include <xcb/xcb_event.h>
 #include <xcb/xfixes.h>
--- a/src/xwl/xwayland.cpp
+++ b/src/xwl/xwayland.cpp
@ -19,8 +19,8 @@
 #include "options.h"
 #include "utils.h"
 #include "platform.h"
+#include "utils/xcbutils.h"
 #include "wayland_server.h"
-#include "xcbutils.h"
 #include "xwayland_logging.h"

 #include "xwaylandsocket.h"
--- a/tests/screenedgeshowtest.cpp
+++ b/tests/screenedgeshowtest.cpp
@ -3,7 +3,7 @@

    SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 */
-#include "xcbutils.h"
+#include "utils/xcbutils.h"

 #include <QApplication>
 #include <QHBoxLayout>
--- a/tests/x11shadowreader.cpp
+++ b/tests/x11shadowreader.cpp
@ -3,7 +3,7 @@

    SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 */
-#include "xcbutils.h"
+#include "utils/xcbutils.h"

 #include <QApplication>
 #include <QDebug>