Move utils.h file to utils directory

autotests/test_x11_timestamp_update.cpp

@@ -13,7 +13,7 @@
 #include <KPluginMetaData>
 
 #include "main.h"
-#include "utils.h"
+#include "utils/common.h"
 
 namespace KWin
 {

src/CMakeLists.txt

@@ -131,7 +131,6 @@ target_sources(kwin PRIVATE
     udev.cpp
     unmanaged.cpp
     useractions.cpp
-    utils.cpp
     virtualdesktops.cpp
     virtualdesktopsdbustypes.cpp
     virtualkeyboard_dbus.cpp

src/abstract_wayland_output.h

@@ -10,7 +10,7 @@
 #define KWIN_ABSTRACT_WAYLAND_OUTPUT_H
 
 #include "abstract_output.h"
-#include "utils.h"
+#include "utils/common.h"
 #include "renderloop.h"
 #include <kwin_export.h>
 

src/backends/drm/egl_gbm_backend.h

@@ -9,7 +9,7 @@
 #ifndef KWIN_EGL_GBM_BACKEND_H
 #define KWIN_EGL_GBM_BACKEND_H
 #include "abstract_egl_backend.h"
-#include "utils.h"
+#include "utils/common.h"
 
 #include <kwinglutils.h>
 

src/backends/drm/scene_qpainter_drm_backend.h

@@ -9,7 +9,7 @@
 #ifndef KWIN_SCENE_QPAINTER_DRM_BACKEND_H
 #define KWIN_SCENE_QPAINTER_DRM_BACKEND_H
 #include "qpainterbackend.h"
-#include "utils.h"
+#include "utils/common.h"
 
 #include <QObject>
 #include <QVector>

src/backends/wayland/egl_wayland_backend.h

@@ -10,7 +10,7 @@
 #ifndef KWIN_EGL_WAYLAND_BACKEND_H
 #define KWIN_EGL_WAYLAND_BACKEND_H
 #include "abstract_egl_backend.h"
-#include "utils.h"
+#include "utils/common.h"
 // wayland
 #include <wayland-egl.h>
 

src/backends/wayland/scene_qpainter_wayland_backend.h

@@ -11,7 +11,7 @@
 #define KWIN_SCENE_QPAINTER_WAYLAND_BACKEND_H
 
 #include "qpainterbackend.h"
-#include "utils.h"
+#include "utils/common.h"
 
 #include <QObject>
 #include <QImage>

src/backends/x11/standalone/effects_mouse_interception_x11_filter.cpp

@@ -8,7 +8,7 @@
 */
 #include "effects_mouse_interception_x11_filter.h"
 #include "effects.h"
-#include "utils.h"
+#include "utils/common.h"
 
 #include <QMouseEvent>
 

src/backends/x11/standalone/effects_x11.cpp

@@ -12,7 +12,7 @@
 #include "cursor.h"
 #include "screenedge.h"
 #include "screens.h"
-#include "utils.h"
+#include "utils/common.h"
 #include "workspace.h"
 
 #include <QDesktopWidget>

src/backends/x11/standalone/eglbackend.h

@@ -8,7 +8,7 @@
 
 #include "eglonxbackend.h"
 #include "openglsurfacetexture_x11.h"
-#include "utils.h"
+#include "utils/common.h"
 
 #include <kwingltexture.h>
 #include <kwingltexture_p.h>

src/backends/x11/standalone/glxbackend.h

@@ -11,7 +11,7 @@
 #include "openglbackend.h"
 #include "openglsurfacetexture_x11.h"
 #include "x11eventfilter.h"
-#include "utils.h"
+#include "utils/common.h"
 
 #include <xcb/glx.h>
 #include <epoxy/glx.h>

src/backends/x11/standalone/overlaywindow_x11.cpp

@@ -13,7 +13,7 @@
 #include "composite.h"
 #include "scene.h"
 #include "screens.h"
-#include "utils.h"
+#include "utils/common.h"
 #include "utils/xcbutils.h"
 
 #include <QVector>

src/backends/x11/standalone/x11cursor.cpp

@@ -9,7 +9,7 @@
 #include "x11cursor.h"
 #include "input.h"
 #include "keyboard_input.h"
-#include "utils.h"
+#include "utils/common.h"
 #include "utils/xcbutils.h"
 #include "xfixes_cursor_event_filter.h"
 

src/client_machine.cpp

@@ -8,7 +8,7 @@
 */
 // own
 #include "client_machine.h"
-#include "utils.h"
+#include "utils/common.h"
 // KF5
 #include <NETWM>
 // Qt

src/colordevice.cpp

@@ -6,7 +6,7 @@
 
 #include "colordevice.h"
 #include "abstract_output.h"
-#include "utils.h"
+#include "utils/common.h"
 
 #include "3rdparty/colortemperature.h"
 

src/colormanager.cpp

@@ -10,7 +10,7 @@
 #include "main.h"
 #include "platform.h"
 #include "session.h"
-#include "utils.h"
+#include "utils/common.h"
 
 namespace KWin
 {

src/composite.cpp

@@ -28,7 +28,7 @@
 #include "surfaceitem_x11.h"
 #include "unmanaged.h"
 #include "useractions.h"
-#include "utils.h"
+#include "utils/common.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11syncmanager.h"

src/cursor.cpp

@@ -13,7 +13,7 @@
 #include "keyboard_input.h"
 #include "main.h"
 #include "platform.h"
-#include "utils.h"
+#include "utils/common.h"
 #include "utils/xcbutils.h"
 #include "abstract_output.h"
 #include "composite.h"

src/decorationitem.cpp

@@ -12,7 +12,7 @@
 #include "decorations/decoratedclient.h"
 #include "deleted.h"
 #include "scene.h"
-#include "utils.h"
+#include "utils/common.h"
 
 #include <cmath>
 

src/effectloader.cpp

@@ -13,7 +13,7 @@
 #include <kwineffects.h>
 #include "plugin.h"
 #include "scripting/scriptedeffect.h"
-#include "utils.h"
+#include "utils/common.h"
 // KDE
 #include <KConfigGroup>
 #include <KPackage/Package>

src/globalshortcuts.cpp

@@ -12,7 +12,7 @@
 #include "gestures.h"
 #include "kwinglobals.h"
 #include "main.h"
-#include "utils.h"
+#include "utils/common.h"
 #include <config-kwin.h>
 // KDE
 #include <KGlobalAccel/private/kglobalaccel_interface.h>

src/group.h

@@ -11,7 +11,7 @@
 #ifndef KWIN_GROUP_H
 #define KWIN_GROUP_H
 
-#include "utils.h"
+#include "utils/common.h"
 #include <netwm.h>
 
 namespace KWin

src/inputmethod.cpp

@@ -12,7 +12,7 @@
 #include "input.h"
 #include "inputpanelv1client.h"
 #include "keyboard_input.h"
-#include "utils.h"
+#include "utils/common.h"
 #include "screens.h"
 #include "wayland_server.h"
 #include "workspace.h"

src/item.cpp

@@ -12,7 +12,7 @@
 #include "renderloop.h"
 #include "scene.h"
 #include "screens.h"
-#include "utils.h"
+#include "utils/common.h"
 
 namespace KWin
 {

src/kcmkwin/kwinrules/CMakeLists.txt

@@ -10,7 +10,7 @@ set(kwinrules_SRCS
     ../../backends/x11/standalone/x11cursor.cpp
     ../../rules.cpp
     ../../placement.cpp
-    ../../utils.cpp
+    ../../utils/common.cpp
     ../../virtualdesktopsdbustypes.cpp
     kwinsrc.cpp
     optionsmodel.cpp

src/keyboard_input.cpp

@@ -16,7 +16,7 @@
 #include "modifier_only_shortcuts.h"
 #include "screenlockerwatcher.h"
 #include "toplevel.h"
-#include "utils.h"
+#include "utils/common.h"
 #include "wayland_server.h"
 #include "workspace.h"
 // KWayland

src/layers.cpp

@@ -64,7 +64,7 @@
 
 */
 
-#include "utils.h"
+#include "utils/common.h"
 #include "x11client.h"
 #include "focuschain.h"
 #include "netinfo.h"

src/options.cpp

@@ -11,7 +11,7 @@
 
 #include "options.h"
 #include "config-kwin.h"
-#include "utils.h"
+#include "utils/common.h"
 #include "platform.h"
 
 #ifndef KCMRULES

src/outline.cpp

@@ -14,7 +14,7 @@
 #include "main.h"
 #include "platform.h"
 #include "scripting/scripting.h"
-#include "utils.h"
+#include "utils/common.h"
 // Frameworks
 #include <KConfigGroup>
 // Qt

src/platformsupport/scenes/opengl/basiceglsurfacetexture_internal.cpp

@@ -7,7 +7,7 @@
 #include "basiceglsurfacetexture_internal.h"
 #include "kwingltexture.h"
 #include "surfaceitem_internal.h"
-#include "utils.h"
+#include "utils/common.h"
 
 #include <QOpenGLFramebufferObject>
 

src/platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.cpp

@@ -9,7 +9,7 @@
 #include "kwineglext.h"
 #include "kwingltexture.h"
 #include "surfaceitem_wayland.h"
-#include "utils.h"
+#include "utils/common.h"
 
 #include <KWaylandServer/drmclientbuffer.h>
 #include <KWaylandServer/linuxdmabufv1clientbuffer.h>

src/platformsupport/scenes/opengl/egl_dmabuf.cpp

@@ -12,7 +12,7 @@
 #include "kwineglext.h"
 #include "kwineglutils_p.h"
 
-#include "utils.h"
+#include "utils/common.h"
 #include "wayland_server.h"
 
 #include <unistd.h>

src/platformsupport/scenes/opengl/openglbackend.cpp

@@ -12,7 +12,7 @@
 #include <kwinglutils_funcs.h>
 
 #include "screens.h"
-#include "utils.h"
+#include "utils/common.h"
 
 #include <QElapsedTimer>
 

src/platformsupport/scenes/qpainter/qpainterbackend.cpp

@@ -9,7 +9,7 @@
 #include "qpainterbackend.h"
 #include "qpaintersurfacetexture_internal.h"
 #include "qpaintersurfacetexture_wayland.h"
-#include "utils.h"
+#include "utils/common.h"
 
 #include <QtGlobal>
 

src/platformsupport/scenes/qpainter/qpaintersurfacetexture_wayland.cpp

@@ -6,7 +6,7 @@
 
 #include "qpaintersurfacetexture_wayland.h"
 #include "surfaceitem_wayland.h"
-#include "utils.h"
+#include "utils/common.h"
 
 #include <KWaylandServer/shmclientbuffer.h>
 #include <KWaylandServer/surface_interface.h>

src/pluginmanager.cpp

@@ -8,7 +8,7 @@
 #include "dbusinterface.h"
 #include "main.h"
 #include "plugin.h"
-#include "utils.h"
+#include "utils/common.h"
 
 #include <KConfigGroup>
 #include <KPluginFactory>

src/plugins/screencast/screencaststream.cpp

@@ -18,7 +18,7 @@
 #include "pipewirecore.h"
 #include "platform.h"
 #include "screencastsource.h"
-#include "utils.h"
+#include "utils/common.h"
 
 #include <KLocalizedString>
 

src/renderloop.cpp

@@ -7,8 +7,8 @@
 #include "renderloop.h"
 #include "options.h"
 #include "renderloop_p.h"
-#include "utils.h"
 #include "surfaceitem.h"
+#include "utils/common.h"
 
 namespace KWin
 {

src/rules.h

@@ -17,7 +17,7 @@
 
 #include "placement.h"
 #include "options.h"
-#include "utils.h"
+#include "utils/common.h"
 
 class QDebug;
 class KConfig;

src/scene.h

@@ -11,7 +11,7 @@
 #define KWIN_SCENE_H
 
 #include "toplevel.h"
-#include "utils.h"
+#include "utils/common.h"
 #include "kwineffects.h"
 
 #include <QElapsedTimer>

src/scenes/opengl/scene_opengl.cpp

@@ -20,7 +20,7 @@
 #include <kwinglplatform.h>
 #include <kwinoffscreenquickview.h>
 
-#include "utils.h"
+#include "utils/common.h"
 #include "abstract_client.h"
 #include "composite.h"
 #include "effects.h"

src/screenedge.cpp

@@ -25,7 +25,7 @@
 #include "cursor.h"
 #include "main.h"
 #include "platform.h"
-#include "utils.h"
+#include "utils/common.h"
 #include <workspace.h>
 #include "virtualdesktops.h"
 // DBus generated

src/screens.cpp

@@ -10,7 +10,7 @@
 #include <abstract_client.h>
 #include "abstract_output.h"
 #include "cursor.h"
-#include "utils.h"
+#include "utils/common.h"
 #include "settings.h"
 #include <workspace.h>
 #include <config-kwin.h>

src/session_consolekit.cpp

@@ -5,7 +5,7 @@
 */
 
 #include "session_consolekit.h"
-#include "utils.h"
+#include "utils/common.h"
 
 #include <QCoreApplication>
 #include <QDBusConnection>

src/session_logind.cpp

@@ -5,7 +5,7 @@
 */
 
 #include "session_logind.h"
-#include "utils.h"
+#include "utils/common.h"
 
 #include <QCoreApplication>
 #include <QDBusConnection>

src/tabbox/tabbox.h

@@ -15,7 +15,7 @@
 #include <QKeySequence>
 #include <QTimer>
 #include <QModelIndex>
-#include "utils.h"
+#include "utils/common.h"
 #include "tabbox/tabboxhandler.h"
 
 class KConfigGroup;

src/toplevel.h

@@ -11,7 +11,7 @@
 #define KWIN_TOPLEVEL_H
 
 // kwin
-#include "utils.h"
+#include "utils/common.h"
 #include "utils/xcbutils.h"
 // KDE
 #include <NETWM>

src/udev.cpp

@@ -10,7 +10,7 @@
 #include "main.h"
 #include "platform.h"
 #include "session.h"
-#include "utils.h"
+#include "utils/common.h"
 // Qt
 #include <QByteArray>
 #include <QScopedPointer>

src/unmanaged.cpp

@@ -13,7 +13,7 @@
 #include "effects.h"
 #include "deleted.h"
 #include "surfaceitem_x11.h"
-#include "utils.h"
+#include "utils/common.h"
 
 #include <QDebug>
 #include <QTimer>

src/utils/CMakeLists.txt

@@ -1,5 +1,6 @@
 target_sources(kwin PRIVATE
     abstract_opengl_context_attribute_builder.cpp
+    common.cpp
     egl_context_attribute_builder.cpp
     subsurfacemonitor.cpp
     xcbutils.cpp

src/utils/common.cpp

@@ -14,7 +14,7 @@
 
 */
 
-#include "utils.h"
+#include "utils/common.h"
 
 #include <QPainter>
 #include <QWidget>

src/utils/common.h

@@ -8,8 +8,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#ifndef KWIN_UTILS_H
-#define KWIN_UTILS_H
+#pragma once
 
 // cmake stuff
 #include <config-kwin.h>
@@ -238,5 +237,3 @@ KWIN_EXPORT QPoint popupOffset(const QRect &anchorRect, const Qt::Edges anchorEd
 // Must be outside namespace
 Q_DECLARE_OPERATORS_FOR_FLAGS(KWin::StrutAreas)
 Q_DECLARE_OPERATORS_FOR_FLAGS(KWin::QuickTileMode)
-
-#endif

src/utils/xcbutils.cpp

@@ -8,7 +8,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "utils/xcbutils.h"
-#include "utils.h"
+#include "utils/common.h"
 // Qt
 #include <QDebug>
 // xcb

src/workspace.h

@@ -16,7 +16,7 @@
 // kwin
 #include "options.h"
 #include "sm.h"
-#include "utils.h"
+#include "utils/common.h"
 // Qt
 #include <QTimer>
 #include <QVector>

src/x11syncmanager.cpp

@@ -12,7 +12,7 @@
 #include "platform.h"
 #include "renderbackend.h"
 #include "scene.h"
-#include "utils.h"
+#include "utils/common.h"
 
 #include "kwinglplatform.h"
 

src/xdgactivationv1.cpp

@@ -10,7 +10,7 @@
 #include "xdgactivationv1.h"
 #include "abstract_client.h"
 #include "effects.h"
-#include "utils.h"
+#include "utils/common.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include <KWaylandServer/display.h>

src/xkb.cpp

@@ -7,7 +7,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "xkb.h"
-#include "utils.h"
+#include "utils/common.h"
 // frameworks
 #include <KConfigGroup>
 // KWayland

src/xwl/xwayland.cpp

@@ -17,7 +17,7 @@
 #include "abstract_output.h"
 #include "main_wayland.h"
 #include "options.h"
-#include "utils.h"
+#include "utils/common.h"
 #include "platform.h"
 #include "utils/xcbutils.h"
 #include "wayland_server.h"