From 84b9b42f3dcccf0c1d1102943dd56fc2f28ba913 Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini Date: Sun, 24 Dec 2023 00:38:19 +0100 Subject: [PATCH] Convert header guard to pragma once This makes the code more readable. --- src/compositor/compositor_api/aurorawaylandbufferref.h | 4 +--- src/compositor/compositor_api/aurorawaylandclient.h | 4 +--- src/compositor/compositor_api/aurorawaylandcompositor.h | 4 +--- src/compositor/compositor_api/aurorawaylandcompositor_p.h | 4 +--- .../compositor_api/aurorawaylandcompositorquickextensions_p.h | 4 +--- src/compositor/compositor_api/aurorawaylanddestroylistener.h | 4 +--- .../compositor_api/aurorawaylanddestroylistener_p.h | 4 +--- src/compositor/compositor_api/aurorawaylanddrag.h | 4 +--- .../compositor_api/aurorawaylandinputmethodcontrol.h | 4 +--- .../compositor_api/aurorawaylandinputmethodcontrol_p.h | 4 +--- src/compositor/compositor_api/aurorawaylandkeyboard.h | 4 +--- src/compositor/compositor_api/aurorawaylandkeyboard_p.h | 4 +--- src/compositor/compositor_api/aurorawaylandkeymap.h | 4 +--- src/compositor/compositor_api/aurorawaylandkeymap_p.h | 4 +--- src/compositor/compositor_api/aurorawaylandmousetracker_p.h | 4 +--- src/compositor/compositor_api/aurorawaylandoutput.h | 4 +--- src/compositor/compositor_api/aurorawaylandoutput_p.h | 4 +--- src/compositor/compositor_api/aurorawaylandoutputmode.h | 4 +--- src/compositor/compositor_api/aurorawaylandoutputmode_p.h | 4 +--- src/compositor/compositor_api/aurorawaylandpointer.h | 4 +--- src/compositor/compositor_api/aurorawaylandpointer_p.h | 4 +--- src/compositor/compositor_api/aurorawaylandquickchildren.h | 4 +--- src/compositor/compositor_api/aurorawaylandquickcompositor.h | 4 +--- .../compositor_api/aurorawaylandquickhardwarelayer_p.h | 4 +--- src/compositor/compositor_api/aurorawaylandquickitem.h | 4 +--- src/compositor/compositor_api/aurorawaylandquickitem_p.h | 4 +--- src/compositor/compositor_api/aurorawaylandquickoutput.h | 4 +--- src/compositor/compositor_api/aurorawaylandquicksurface.h | 4 +--- src/compositor/compositor_api/aurorawaylandquicksurface_p.h | 4 +--- src/compositor/compositor_api/aurorawaylandresource.h | 4 +--- src/compositor/compositor_api/aurorawaylandseat.h | 4 +--- src/compositor/compositor_api/aurorawaylandseat_p.h | 4 +--- src/compositor/compositor_api/aurorawaylandsurface.h | 4 +--- src/compositor/compositor_api/aurorawaylandsurface_p.h | 4 +--- src/compositor/compositor_api/aurorawaylandsurfacegrabber.h | 4 +--- src/compositor/compositor_api/aurorawaylandtouch.h | 4 +--- src/compositor/compositor_api/aurorawaylandtouch_p.h | 4 +--- src/compositor/compositor_api/aurorawaylandview.h | 4 +--- src/compositor/compositor_api/aurorawaylandview_p.h | 4 +--- src/compositor/extensions/aurorawaylandextsessionlockv1.h | 4 +--- src/compositor/extensions/aurorawaylandextsessionlockv1_p.h | 4 +--- .../extensions/aurorawaylandextsessionlockv1integration_p.h | 4 +--- src/compositor/extensions/aurorawaylandfluiddecorationv1.h | 4 +--- src/compositor/extensions/aurorawaylandfluiddecorationv1_p.h | 4 +--- src/compositor/extensions/aurorawaylandidleinhibitv1.h | 4 +--- src/compositor/extensions/aurorawaylandidleinhibitv1_p.h | 4 +--- src/compositor/extensions/aurorawaylandiviapplication.h | 4 +--- src/compositor/extensions/aurorawaylandiviapplication_p.h | 4 +--- src/compositor/extensions/aurorawaylandivisurface.h | 4 +--- src/compositor/extensions/aurorawaylandivisurface_p.h | 4 +--- .../extensions/aurorawaylandivisurfaceintegration_p.h | 4 +--- src/compositor/extensions/aurorawaylandpresentationtime_p.h | 4 +--- src/compositor/extensions/aurorawaylandpresentationtime_p_p.h | 4 +--- src/compositor/extensions/aurorawaylandqttextinputmethod.h | 4 +--- src/compositor/extensions/aurorawaylandqttextinputmethod_p.h | 4 +--- .../extensions/aurorawaylandqttextinputmethodmanager.h | 4 +--- .../extensions/aurorawaylandqttextinputmethodmanager_p.h | 4 +--- src/compositor/extensions/aurorawaylandqtwindowmanager.h | 4 +--- src/compositor/extensions/aurorawaylandqtwindowmanager_p.h | 4 +--- .../extensions/aurorawaylandquickshellintegration.h | 4 +--- .../extensions/aurorawaylandquickshellsurfaceitem.h | 4 +--- .../extensions/aurorawaylandquickshellsurfaceitem_p.h | 4 +--- .../extensions/aurorawaylandquickwlroutputmanagementv1.h | 4 +--- src/compositor/extensions/aurorawaylandquickxdgoutputv1.h | 4 +--- src/compositor/extensions/aurorawaylandshell.h | 4 +--- src/compositor/extensions/aurorawaylandshell_p.h | 4 +--- src/compositor/extensions/aurorawaylandshellsurface.h | 4 +--- src/compositor/extensions/aurorawaylandsurfacelayout.h | 4 +--- src/compositor/extensions/aurorawaylandsurfacelayout_p.h | 4 +--- src/compositor/extensions/aurorawaylandtextinput.h | 4 +--- src/compositor/extensions/aurorawaylandtextinput_p.h | 4 +--- src/compositor/extensions/aurorawaylandtextinputmanager.h | 4 +--- src/compositor/extensions/aurorawaylandtextinputmanager_p.h | 4 +--- src/compositor/extensions/aurorawaylandtextinputmanagerv4.h | 4 +--- src/compositor/extensions/aurorawaylandtextinputmanagerv4_p.h | 4 +--- src/compositor/extensions/aurorawaylandtextinputv4.h | 4 +--- src/compositor/extensions/aurorawaylandtextinputv4_p.h | 4 +--- src/compositor/extensions/aurorawaylandviewporter.h | 4 +--- src/compositor/extensions/aurorawaylandviewporter_p.h | 4 +--- src/compositor/extensions/aurorawaylandwlrexportdmabufv1.h | 4 +--- src/compositor/extensions/aurorawaylandwlrexportdmabufv1_p.h | 4 +--- .../extensions/aurorawaylandwlrforeigntoplevelmanagementv1.h | 4 +--- .../aurorawaylandwlrforeigntoplevelmanagementv1_p.h | 4 +--- .../extensions/aurorawaylandwlrlayershellintegration_p.h | 4 +--- src/compositor/extensions/aurorawaylandwlrlayershellv1.h | 4 +--- src/compositor/extensions/aurorawaylandwlrlayershellv1_p.h | 4 +--- src/compositor/extensions/aurorawaylandwlrlayersurfaceitem.h | 4 +--- .../extensions/aurorawaylandwlrlayersurfaceitem_p.h | 4 +--- .../extensions/aurorawaylandwlroutputmanagementv1.h | 4 +--- .../extensions/aurorawaylandwlroutputmanagementv1_p.h | 4 +--- src/compositor/extensions/aurorawaylandwlrscreencopyv1.h | 4 +--- src/compositor/extensions/aurorawaylandwlrscreencopyv1_p.h | 4 +--- src/compositor/extensions/aurorawaylandwlshell.h | 4 +--- src/compositor/extensions/aurorawaylandwlshell_p.h | 4 +--- src/compositor/extensions/aurorawaylandwlshellintegration_p.h | 4 +--- src/compositor/extensions/aurorawaylandxdgdecorationv1.h | 4 +--- src/compositor/extensions/aurorawaylandxdgdecorationv1_p.h | 4 +--- src/compositor/extensions/aurorawaylandxdgoutputv1.h | 4 +--- src/compositor/extensions/aurorawaylandxdgoutputv1_p.h | 4 +--- src/compositor/extensions/aurorawaylandxdgshell.h | 4 +--- src/compositor/extensions/aurorawaylandxdgshell_p.h | 4 +--- .../extensions/aurorawaylandxdgshellintegration_p.h | 4 +--- src/compositor/extensions/aurorawlqtkey_p.h | 4 +--- src/compositor/extensions/aurorawlqttouch_p.h | 4 +--- src/compositor/global/aurorawaylandcompositorextension.h | 4 +--- src/compositor/global/aurorawaylandcompositorextension_p.h | 4 +--- src/compositor/global/aurorawaylandqmlinclude.h | 4 +--- src/compositor/global/aurorawaylandquickextension.h | 4 +--- src/compositor/global/aurorawaylandutils_p.h | 4 +--- .../hardware_integration/aurorawlclientbufferintegration_p.h | 4 +--- .../aurorawlclientbufferintegrationfactory_p.h | 4 +--- .../aurorawlclientbufferintegrationplugin_p.h | 4 +--- .../hardware_integration/aurorawlhardwarelayerintegration_p.h | 4 +--- .../aurorawlhardwarelayerintegrationfactory_p.h | 4 +--- .../aurorawlhardwarelayerintegrationplugin_p.h | 4 +--- src/compositor/hardware_integration/aurorawlhwintegration_p.h | 4 +--- .../hardware_integration/aurorawlserverbufferintegration_p.h | 4 +--- .../aurorawlserverbufferintegrationfactory_p.h | 4 +--- .../aurorawlserverbufferintegrationplugin_p.h | 4 +--- src/compositor/utils/aurorafactoryloader_p.h | 4 +--- src/compositor/utils/auroraunixutils_p.h | 4 +--- src/compositor/wayland_wrapper/aurorawlbuffermanager_p.h | 4 +--- src/compositor/wayland_wrapper/aurorawlclientbuffer_p.h | 4 +--- src/compositor/wayland_wrapper/aurorawldatadevice_p.h | 4 +--- src/compositor/wayland_wrapper/aurorawldatadevicemanager_p.h | 4 +--- src/compositor/wayland_wrapper/aurorawldataoffer_p.h | 4 +--- src/compositor/wayland_wrapper/aurorawldatasource_p.h | 4 +--- src/compositor/wayland_wrapper/aurorawlregion_p.h | 4 +--- src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h | 4 +--- .../compositor/brcm-egl/brcmeglintegration.h | 4 +--- .../compositor/dmabuf-server/dmabufserverbufferintegration.h | 4 +--- .../compositor/drm-egl-server/drmeglserverbufferintegration.h | 4 +--- .../hardwarelayer/vsp2/vsp2hardwarelayerintegration.h | 4 +--- .../libhybriseglserverbufferintegration.h | 4 +--- .../compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h | 4 +--- .../linuxdmabufclientbufferintegration.h | 4 +--- .../shm-emulation-server/shmserverbufferintegration.h | 4 +--- .../compositor/vulkan-server/vulkanserverbufferintegration.h | 4 +--- .../compositor/vulkan-server/vulkanwrapper.h | 4 +--- .../wayland-egl/waylandeglclientbufferintegration_p.h | 4 +--- .../wayland-eglstream-controller/waylandeglstreamcontroller.h | 4 +--- .../waylandeglstreamintegration.h | 4 +--- src/imports/compositor-extensions/xwayland/sigwatch.h | 4 +--- src/imports/compositor-extensions/xwayland/sizehints.h | 4 +--- src/imports/compositor-extensions/xwayland/xcbatom.h | 4 +--- src/imports/compositor-extensions/xwayland/xcbatoms.h | 4 +--- src/imports/compositor-extensions/xwayland/xcbcursors.h | 4 +--- src/imports/compositor-extensions/xwayland/xcbproperties.h | 4 +--- src/imports/compositor-extensions/xwayland/xcbresources.h | 4 +--- src/imports/compositor-extensions/xwayland/xcbwindow.h | 4 +--- src/imports/compositor-extensions/xwayland/xcbwrapper.h | 4 +--- src/imports/compositor-extensions/xwayland/xwayland.h | 4 +--- src/imports/compositor-extensions/xwayland/xwaylandmanager.h | 4 +--- .../xwayland/xwaylandquickshellintegration.h | 4 +--- .../xwayland/xwaylandquickshellsurfaceitem.h | 4 +--- src/imports/compositor-extensions/xwayland/xwaylandserver.h | 4 +--- .../compositor-extensions/xwayland/xwaylandshellsurface.h | 4 +--- src/platformheaders/lirieglfsfunctions.h | 4 +--- src/platformheaders/liriplatformheadersglobal.h | 4 +--- src/platformsupport/edid/auroraedidparser_p.h | 4 +--- src/platformsupport/edid/auroraedidvendortable_p.h | 4 +--- src/platformsupport/kmsconvenience/aurorakmsdevice_p.h | 4 +--- src/platformsupport/libinput/libinputgesture.h | 4 +--- src/platformsupport/libinput/libinputhandler.h | 4 +--- src/platformsupport/libinput/libinputhandler_p.h | 4 +--- src/platformsupport/libinput/libinputkeyboard.h | 4 +--- src/platformsupport/libinput/libinputkeyboard_p.h | 4 +--- src/platformsupport/libinput/libinputpointer.h | 4 +--- src/platformsupport/libinput/libinputtouch.h | 4 +--- src/platformsupport/libinput/lirilibinputglobal.h | 4 +--- src/platformsupport/logind/logindtypes_p.h | 4 +--- src/platformsupport/udev/qtudevglobal.h | 4 +--- src/platformsupport/udev/udev.h | 4 +--- src/platformsupport/udev/udev_p.h | 4 +--- src/platformsupport/udev/udevdevice.h | 4 +--- src/platformsupport/udev/udevdevice_p.h | 4 +--- src/platformsupport/udev/udevenumerate.h | 4 +--- src/platformsupport/udev/udevenumerate_p.h | 4 +--- src/platformsupport/udev/udevmonitor.h | 4 +--- src/platformsupport/udev/udevmonitor_p.h | 4 +--- src/platformsupport/xkbcommon/auroraxkbcommon_p.h | 4 +--- src/plugins/platforms/eglfs/api/libinputmanager_p.h | 4 +--- src/plugins/platforms/eglfs/api/qeglfscontext_p.h | 4 +--- src/plugins/platforms/eglfs/api/qeglfscursor_p.h | 4 +--- src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h | 4 +--- src/plugins/platforms/eglfs/api/qeglfsglobal_p.h | 4 +--- src/plugins/platforms/eglfs/api/qeglfshooks_p.h | 4 +--- src/plugins/platforms/eglfs/api/qeglfsintegration_p.h | 4 +--- src/plugins/platforms/eglfs/api/qeglfslogindhandler_p.h | 4 +--- src/plugins/platforms/eglfs/api/qeglfsoffscreenwindow_p.h | 4 +--- src/plugins/platforms/eglfs/api/qeglfsscreen_p.h | 4 +--- src/plugins/platforms/eglfs/api/qeglfswindow_p.h | 4 +--- src/plugins/platforms/eglfs/api/xcursor.h | 4 +--- src/plugins/platforms/eglfs/api/xcursortheme_p.h | 4 +--- .../eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h | 4 +--- .../eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.h | 4 +--- .../deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h | 4 +--- .../eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.h | 4 +--- .../eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmwindow.h | 4 +--- .../eglfs_kms_egldevice/qeglfskmsegldevice.h | 4 +--- .../eglfs_kms_egldevice/qeglfskmsegldeviceintegration.h | 4 +--- .../eglfs_kms_egldevice/qeglfskmsegldevicescreen.h | 4 +--- .../deviceintegration/eglfs_kms_support/qeglfskmsdevice.h | 4 +--- .../eglfs_kms_support/qeglfskmseventreader.h | 4 +--- .../deviceintegration/eglfs_kms_support/qeglfskmshelpers.h | 4 +--- .../eglfs_kms_support/qeglfskmsintegration.h | 4 +--- .../deviceintegration/eglfs_kms_support/qeglfskmsscreen.h | 4 +--- .../eglfs/deviceintegration/eglfs_x11/qeglfsx11integration.h | 4 +--- src/shared/aurorawaylandinputmethodeventbuilder_p.h | 4 +--- src/shared/aurorawaylandmimehelper_p.h | 4 +--- src/shared/aurorawaylandsharedmemoryformathelper_p.h | 4 +--- tests/auto/compositor/compositor/mockclient.h | 4 +--- tests/auto/compositor/compositor/mockkeyboard.h | 4 +--- tests/auto/compositor/compositor/mockpointer.h | 4 +--- tests/auto/compositor/compositor/mockseat.h | 4 +--- tests/auto/compositor/compositor/mockxdgoutputv1.h | 4 +--- tests/auto/compositor/compositor/testcompositor.h | 4 +--- tests/auto/compositor/compositor/testseat.h | 4 +--- tests/manual/subsurface/shmwindow.h | 4 +--- 219 files changed, 219 insertions(+), 657 deletions(-) diff --git a/src/compositor/compositor_api/aurorawaylandbufferref.h b/src/compositor/compositor_api/aurorawaylandbufferref.h index d848b37de..c66d50ff4 100644 --- a/src/compositor/compositor_api/aurorawaylandbufferref.h +++ b/src/compositor/compositor_api/aurorawaylandbufferref.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 Jolla Ltd, author: // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDBUFFERREF_H -#define AURORA_COMPOSITOR_WAYLANDBUFFERREF_H +#pragma once #include #include @@ -92,4 +91,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandBufferRef } // namespace Aurora -#endif diff --git a/src/compositor/compositor_api/aurorawaylandclient.h b/src/compositor/compositor_api/aurorawaylandclient.h index 40b9a9e81..f7ce7c100 100644 --- a/src/compositor/compositor_api/aurorawaylandclient.h +++ b/src/compositor/compositor_api/aurorawaylandclient.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 Pier Luigi Fiorini // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDCLIENT_H -#define AURORA_COMPOSITOR_WAYLANDCLIENT_H +#pragma once #include #include @@ -78,4 +77,3 @@ public Q_SLOTS: } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDCLIENT_H diff --git a/src/compositor/compositor_api/aurorawaylandcompositor.h b/src/compositor/compositor_api/aurorawaylandcompositor.h index 738a1bf45..f7dfb2da0 100644 --- a/src/compositor/compositor_api/aurorawaylandcompositor.h +++ b/src/compositor/compositor_api/aurorawaylandcompositor.h @@ -1,8 +1,7 @@ // Copyright (C) 2020 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDCOMPOSITOR_H -#define AURORA_COMPOSITOR_WAYLANDCOMPOSITOR_H +#pragma once #include #include @@ -173,4 +172,3 @@ private Q_SLOTS: } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDCOMPOSITOR_H diff --git a/src/compositor/compositor_api/aurorawaylandcompositor_p.h b/src/compositor/compositor_api/aurorawaylandcompositor_p.h index 41d457fe7..f1dddfbf4 100644 --- a/src/compositor/compositor_api/aurorawaylandcompositor_p.h +++ b/src/compositor/compositor_api/aurorawaylandcompositor_p.h @@ -2,8 +2,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDCOMPOSITOR_P_H -#define AURORA_COMPOSITOR_WAYLANDCOMPOSITOR_P_H +#pragma once // // W A R N I N G @@ -210,4 +209,3 @@ void WaylandCompositorPrivate::removeOutput(WaylandOutput *output) } // namespace Aurora -#endif //QWAYLANDCOMPOSITOR_P_H diff --git a/src/compositor/compositor_api/aurorawaylandcompositorquickextensions_p.h b/src/compositor/compositor_api/aurorawaylandcompositorquickextensions_p.h index d667ad4f6..63da0e777 100644 --- a/src/compositor/compositor_api/aurorawaylandcompositorquickextensions_p.h +++ b/src/compositor/compositor_api/aurorawaylandcompositorquickextensions_p.h @@ -27,8 +27,7 @@ ** ****************************************************************************/ -#ifndef AURORA_COMPOSITOR_WAYLANDCOMPOSITORQUICKEXTENSIONS_P_H -#define AURORA_COMPOSITOR_WAYLANDCOMPOSITORQUICKEXTENSIONS_P_H +#pragma once // // W A R N I N G @@ -122,4 +121,3 @@ AURORA_COMPOSITOR_DECLARE_QUICK_EXTENSION_NAMED_CLASS(WaylandQtTextInputMethodMa } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDCOMPOSITORQUICKEXTENSIONS_P_H diff --git a/src/compositor/compositor_api/aurorawaylanddestroylistener.h b/src/compositor/compositor_api/aurorawaylanddestroylistener.h index 84272ae32..5a3b70a36 100644 --- a/src/compositor/compositor_api/aurorawaylanddestroylistener.h +++ b/src/compositor/compositor_api/aurorawaylanddestroylistener.h @@ -2,8 +2,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDDESTROYLISTENER_H -#define AURORA_COMPOSITOR_WAYLANDDESTROYLISTENER_H +#pragma once #include #include @@ -38,4 +37,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandDestroyListener : public QObject } // namespace Aurora -#endif /*QWAYLANDDESTROYLISTENER_H*/ diff --git a/src/compositor/compositor_api/aurorawaylanddestroylistener_p.h b/src/compositor/compositor_api/aurorawaylanddestroylistener_p.h index 9acbb7f9f..dc67e3b53 100644 --- a/src/compositor/compositor_api/aurorawaylanddestroylistener_p.h +++ b/src/compositor/compositor_api/aurorawaylanddestroylistener_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 Jolla Ltd, author: // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_WAYLAND_DESTROYLISTENER_P_H -#define AURORA_WAYLAND_DESTROYLISTENER_P_H +#pragma once // // W A R N I N G @@ -45,4 +44,3 @@ class WaylandDestroyListenerPrivate } // namespace Aurora -#endif // AURORA_WAYLAND_DESTROYLISTENER_P_H diff --git a/src/compositor/compositor_api/aurorawaylanddrag.h b/src/compositor/compositor_api/aurorawaylanddrag.h index 5c2842a59..16bad3297 100644 --- a/src/compositor/compositor_api/aurorawaylanddrag.h +++ b/src/compositor/compositor_api/aurorawaylanddrag.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 Klarälvdalens Datakonsult AB (KDAB). // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDDRAG_H -#define AURORA_COMPOSITOR_WAYLANDDRAG_H +#pragma once #include #include @@ -57,4 +56,3 @@ public Q_SLOTS: } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDDRAG_H diff --git a/src/compositor/compositor_api/aurorawaylandinputmethodcontrol.h b/src/compositor/compositor_api/aurorawaylandinputmethodcontrol.h index ddffeed51..5f86daf7b 100644 --- a/src/compositor/compositor_api/aurorawaylandinputmethodcontrol.h +++ b/src/compositor/compositor_api/aurorawaylandinputmethodcontrol.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDINPUTMETHODCONTROL_H -#define AURORA_COMPOSITOR_WAYLANDINPUTMETHODCONTROL_H +#pragma once #include #include @@ -55,4 +54,3 @@ class WaylandInputMethodControl : public QObject } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDINPUTMETHODCONTROL_H diff --git a/src/compositor/compositor_api/aurorawaylandinputmethodcontrol_p.h b/src/compositor/compositor_api/aurorawaylandinputmethodcontrol_p.h index 9bf0defc3..ab656c441 100644 --- a/src/compositor/compositor_api/aurorawaylandinputmethodcontrol_p.h +++ b/src/compositor/compositor_api/aurorawaylandinputmethodcontrol_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDINPUTMETHODCONTROL_P_H -#define AURORA_COMPOSITOR_WAYLANDINPUTMETHODCONTROL_P_H +#pragma once // // W A R N I N G @@ -57,4 +56,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandInputMethodControlPrivate } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDINPUTMETHODCONTROL_P_H diff --git a/src/compositor/compositor_api/aurorawaylandkeyboard.h b/src/compositor/compositor_api/aurorawaylandkeyboard.h index 362c77cda..79bf857d9 100644 --- a/src/compositor/compositor_api/aurorawaylandkeyboard.h +++ b/src/compositor/compositor_api/aurorawaylandkeyboard.h @@ -2,8 +2,7 @@ // Copyright (C) 2017 Klarälvdalens Datakonsult AB (KDAB). // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDKEYBOARD_H -#define AURORA_COMPOSITOR_WAYLANDKEYBOARD_H +#pragma once #include @@ -69,4 +68,3 @@ private Q_SLOTS: } // namespace Aurora -#endif //QWAYLANDKEYBOARD_H diff --git a/src/compositor/compositor_api/aurorawaylandkeyboard_p.h b/src/compositor/compositor_api/aurorawaylandkeyboard_p.h index c157607c2..391822a66 100644 --- a/src/compositor/compositor_api/aurorawaylandkeyboard_p.h +++ b/src/compositor/compositor_api/aurorawaylandkeyboard_p.h @@ -2,8 +2,7 @@ // Copyright (C) 2017 Klarälvdalens Datakonsult AB (KDAB). // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_WAYLAND_KEYBOARD_P_H -#define AURORA_WAYLAND_KEYBOARD_P_H +#pragma once // // W A R N I N G @@ -125,4 +124,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandKeyboardPrivate : public PrivateServer: } // namespace Aurora -#endif // AURORA_WAYLAND_KEYBOARD_P_H diff --git a/src/compositor/compositor_api/aurorawaylandkeymap.h b/src/compositor/compositor_api/aurorawaylandkeymap.h index 7ebbde9f8..ebaf34abf 100644 --- a/src/compositor/compositor_api/aurorawaylandkeymap.h +++ b/src/compositor/compositor_api/aurorawaylandkeymap.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDKEYMAP_H -#define AURORA_COMPOSITOR_WAYLANDKEYMAP_H +#pragma once #include #include @@ -64,4 +63,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandKeymap : public QObject } // namespace Aurora -#endif //QWAYLANDKEYMAP_H diff --git a/src/compositor/compositor_api/aurorawaylandkeymap_p.h b/src/compositor/compositor_api/aurorawaylandkeymap_p.h index 21cd9a211..515579fff 100644 --- a/src/compositor/compositor_api/aurorawaylandkeymap_p.h +++ b/src/compositor/compositor_api/aurorawaylandkeymap_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDKEYMAP_P_H -#define AURORA_COMPOSITOR_WAYLANDKEYMAP_P_H +#pragma once // // W A R N I N G @@ -43,4 +42,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandKeymapPrivate } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDKEYMAP_P_H diff --git a/src/compositor/compositor_api/aurorawaylandmousetracker_p.h b/src/compositor/compositor_api/aurorawaylandmousetracker_p.h index 832444600..b2165fe5f 100644 --- a/src/compositor/compositor_api/aurorawaylandmousetracker_p.h +++ b/src/compositor/compositor_api/aurorawaylandmousetracker_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDMOUSETRACKER_P_H -#define AURORA_COMPOSITOR_WAYLANDMOUSETRACKER_P_H +#pragma once // // W A R N I N G @@ -69,4 +68,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandMouseTracker : public QQuickItem } // namespace Aurora -#endif /*QWAYLANDMOUSETRACKER_P_H*/ diff --git a/src/compositor/compositor_api/aurorawaylandoutput.h b/src/compositor/compositor_api/aurorawaylandoutput.h index 407b5e238..a0244a813 100644 --- a/src/compositor/compositor_api/aurorawaylandoutput.h +++ b/src/compositor/compositor_api/aurorawaylandoutput.h @@ -2,8 +2,7 @@ // Copyright (C) 2017 Klarälvdalens Datakonsult AB (KDAB). // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDOUTPUT_H -#define AURORA_COMPOSITOR_WAYLANDOUTPUT_H +#pragma once #include #include @@ -164,4 +163,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandOutput : public WaylandObject } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDOUTPUT_H diff --git a/src/compositor/compositor_api/aurorawaylandoutput_p.h b/src/compositor/compositor_api/aurorawaylandoutput_p.h index a8c68bbcf..9506a0257 100644 --- a/src/compositor/compositor_api/aurorawaylandoutput_p.h +++ b/src/compositor/compositor_api/aurorawaylandoutput_p.h @@ -3,8 +3,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDOUTPUT_P_H -#define AURORA_COMPOSITOR_WAYLANDOUTPUT_P_H +#pragma once // // W A R N I N G @@ -126,4 +125,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandOutputPrivate : public PrivateServer::w } // namespace Aurora -#endif /*QWAYLANDOUTPUT_P_H*/ diff --git a/src/compositor/compositor_api/aurorawaylandoutputmode.h b/src/compositor/compositor_api/aurorawaylandoutputmode.h index dedb33b4b..e5107e6de 100644 --- a/src/compositor/compositor_api/aurorawaylandoutputmode.h +++ b/src/compositor/compositor_api/aurorawaylandoutputmode.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 Pier Luigi Fiorini // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDOUTPUTMODE_H -#define AURORA_COMPOSITOR_WAYLANDOUTPUTMODE_H +#pragma once #include #include @@ -41,4 +40,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandOutputMode Q_DECLARE_TYPEINFO(Aurora::Compositor::WaylandOutputMode, Q_MOVABLE_TYPE); -#endif // AURORA_COMPOSITOR_WAYLANDOUTPUTMODE_H diff --git a/src/compositor/compositor_api/aurorawaylandoutputmode_p.h b/src/compositor/compositor_api/aurorawaylandoutputmode_p.h index 4035ae9cb..6a8bbebb1 100644 --- a/src/compositor/compositor_api/aurorawaylandoutputmode_p.h +++ b/src/compositor/compositor_api/aurorawaylandoutputmode_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 Pier Luigi Fiorini // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDOUTPUTMODE_P_H -#define AURORA_COMPOSITOR_WAYLANDOUTPUTMODE_P_H +#pragma once #include @@ -34,4 +33,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandOutputModePrivate } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDOUTPUTMODE_P_H diff --git a/src/compositor/compositor_api/aurorawaylandpointer.h b/src/compositor/compositor_api/aurorawaylandpointer.h index 0ab8d55ee..dca6c7c66 100644 --- a/src/compositor/compositor_api/aurorawaylandpointer.h +++ b/src/compositor/compositor_api/aurorawaylandpointer.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDPOINTER_H -#define AURORA_COMPOSITOR_WAYLANDPOINTER_H +#pragma once #include @@ -66,4 +65,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandPointer : public WaylandObject } // namespace Aurora -#endif /*QWAYLANDPOINTER_H*/ diff --git a/src/compositor/compositor_api/aurorawaylandpointer_p.h b/src/compositor/compositor_api/aurorawaylandpointer_p.h index 93d0b61dc..9cc10388f 100644 --- a/src/compositor/compositor_api/aurorawaylandpointer_p.h +++ b/src/compositor/compositor_api/aurorawaylandpointer_p.h @@ -2,8 +2,7 @@ // Copyright (C) 2017 Klarälvdalens Datakonsult AB (KDAB). // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDPOINTER_P_H -#define AURORA_COMPOSITOR_WAYLANDPOINTER_P_H +#pragma once // // W A R N I N G @@ -77,4 +76,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandPointerPrivate : public PrivateServer:: } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDPOINTER_P_H diff --git a/src/compositor/compositor_api/aurorawaylandquickchildren.h b/src/compositor/compositor_api/aurorawaylandquickchildren.h index a35d8282a..58eb19a99 100644 --- a/src/compositor/compositor_api/aurorawaylandquickchildren.h +++ b/src/compositor/compositor_api/aurorawaylandquickchildren.h @@ -1,8 +1,7 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDQUICKCHILDREN_H -#define AURORA_COMPOSITOR_WAYLANDQUICKCHILDREN_H +#pragma once // // W A R N I N G @@ -44,4 +43,3 @@ namespace Compositor { } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDQUICKCHILDREN_H diff --git a/src/compositor/compositor_api/aurorawaylandquickcompositor.h b/src/compositor/compositor_api/aurorawaylandquickcompositor.h index 1378f563e..1458341d6 100644 --- a/src/compositor/compositor_api/aurorawaylandquickcompositor.h +++ b/src/compositor/compositor_api/aurorawaylandquickcompositor.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 Jolla Ltd, author: // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDQUICKCOMPOSITOR_H -#define AURORA_COMPOSITOR_WAYLANDQUICKCOMPOSITOR_H +#pragma once #include #include @@ -49,4 +48,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandQuickCompositor : public WaylandComposi } // namespace Aurora -#endif diff --git a/src/compositor/compositor_api/aurorawaylandquickhardwarelayer_p.h b/src/compositor/compositor_api/aurorawaylandquickhardwarelayer_p.h index a6f5b62c4..0a7567ee1 100644 --- a/src/compositor/compositor_api/aurorawaylandquickhardwarelayer_p.h +++ b/src/compositor/compositor_api/aurorawaylandquickhardwarelayer_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2020 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDQUICKHARDWARELAYER_P_H -#define AURORA_COMPOSITOR_WAYLANDQUICKHARDWARELAYER_P_H +#pragma once // // W A R N I N G @@ -59,4 +58,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandQuickHardwareLayer : public QObject, pu } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDQUICKHARDWARELAYER_P_H diff --git a/src/compositor/compositor_api/aurorawaylandquickitem.h b/src/compositor/compositor_api/aurorawaylandquickitem.h index 14d9c6bc6..3d0432f03 100644 --- a/src/compositor/compositor_api/aurorawaylandquickitem.h +++ b/src/compositor/compositor_api/aurorawaylandquickitem.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDSURFACEITEM_H -#define AURORA_COMPOSITOR_WAYLANDSURFACEITEM_H +#pragma once #include @@ -172,4 +171,3 @@ private Q_SLOTS: } // namespace Aurora -#endif diff --git a/src/compositor/compositor_api/aurorawaylandquickitem_p.h b/src/compositor/compositor_api/aurorawaylandquickitem_p.h index 31661ca62..c6fcdbc30 100644 --- a/src/compositor/compositor_api/aurorawaylandquickitem_p.h +++ b/src/compositor/compositor_api/aurorawaylandquickitem_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDQUICKITEM_P_H -#define AURORA_COMPOSITOR_WAYLANDQUICKITEM_P_H +#pragma once // // W A R N I N G @@ -208,4 +207,3 @@ class WaylandQuickItemPrivate } // namespace Aurora -#endif /*QWAYLANDQUICKITEM_P_H*/ diff --git a/src/compositor/compositor_api/aurorawaylandquickoutput.h b/src/compositor/compositor_api/aurorawaylandquickoutput.h index 926777f30..009f04c05 100644 --- a/src/compositor/compositor_api/aurorawaylandquickoutput.h +++ b/src/compositor/compositor_api/aurorawaylandquickoutput.h @@ -2,8 +2,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDQUICKOUTPUT_H -#define AURORA_COMPOSITOR_WAYLANDQUICKOUTPUT_H +#pragma once #include #include @@ -60,4 +59,3 @@ public Q_SLOTS: } // namespace Aurora -#endif diff --git a/src/compositor/compositor_api/aurorawaylandquicksurface.h b/src/compositor/compositor_api/aurorawaylandquicksurface.h index 0e7c2a964..60495eb2f 100644 --- a/src/compositor/compositor_api/aurorawaylandquicksurface.h +++ b/src/compositor/compositor_api/aurorawaylandquicksurface.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 Jolla Ltd, author: // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef QQUICKWAYLANDSURFACE_H -#define QQUICKWAYLANDSURFACE_H +#pragma once #include #include @@ -44,4 +43,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandQuickSurface : public WaylandSurface Q_DECLARE_METATYPE(Aurora::Compositor::WaylandQuickSurface*) -#endif diff --git a/src/compositor/compositor_api/aurorawaylandquicksurface_p.h b/src/compositor/compositor_api/aurorawaylandquicksurface_p.h index 93e234f7d..f4a0d46d0 100644 --- a/src/compositor/compositor_api/aurorawaylandquicksurface_p.h +++ b/src/compositor/compositor_api/aurorawaylandquicksurface_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2021 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDQUICKSURFACE_P_H -#define AURORA_COMPOSITOR_WAYLANDQUICKSURFACE_P_H +#pragma once // // W A R N I N G @@ -39,4 +38,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandQuickSurfacePrivate : public WaylandSur } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDQUICKSURFACE_P_H diff --git a/src/compositor/compositor_api/aurorawaylandresource.h b/src/compositor/compositor_api/aurorawaylandresource.h index bfc77924a..386ca8634 100644 --- a/src/compositor/compositor_api/aurorawaylandresource.h +++ b/src/compositor/compositor_api/aurorawaylandresource.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 Klarälvdalens Datakonsult AB (KDAB). // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDRESOURCE_H -#define AURORA_COMPOSITOR_WAYLANDRESOURCE_H +#pragma once #include #include @@ -38,4 +37,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandResource Q_DECLARE_METATYPE(Aurora::Compositor::WaylandResource) -#endif /*QWAYLANDRESOURCE_H*/ diff --git a/src/compositor/compositor_api/aurorawaylandseat.h b/src/compositor/compositor_api/aurorawaylandseat.h index 8f21bd096..1f74cd193 100644 --- a/src/compositor/compositor_api/aurorawaylandseat.h +++ b/src/compositor/compositor_api/aurorawaylandseat.h @@ -27,8 +27,7 @@ ** ****************************************************************************/ -#ifndef AURORA_COMPOSITOR_WAYLANDSEAT_H -#define AURORA_COMPOSITOR_WAYLANDSEAT_H +#pragma once #include #include @@ -155,4 +154,3 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(WaylandSeat::CapabilityFlags) } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDSEAT_H diff --git a/src/compositor/compositor_api/aurorawaylandseat_p.h b/src/compositor/compositor_api/aurorawaylandseat_p.h index ab5947826..b2582b2a7 100644 --- a/src/compositor/compositor_api/aurorawaylandseat_p.h +++ b/src/compositor/compositor_api/aurorawaylandseat_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDSEAT_P_H -#define AURORA_COMPOSITOR_WAYLANDSEAT_P_H +#pragma once // // W A R N I N G @@ -107,4 +106,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandSeatPrivate : public PrivateServer::wl_ } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDSEAT_P_H diff --git a/src/compositor/compositor_api/aurorawaylandsurface.h b/src/compositor/compositor_api/aurorawaylandsurface.h index 24c0bb587..0320bd193 100644 --- a/src/compositor/compositor_api/aurorawaylandsurface.h +++ b/src/compositor/compositor_api/aurorawaylandsurface.h @@ -2,8 +2,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDSURFACE_H -#define AURORA_COMPOSITOR_WAYLANDSURFACE_H +#pragma once #include #include @@ -164,4 +163,3 @@ public Q_SLOTS: } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDSURFACE_H diff --git a/src/compositor/compositor_api/aurorawaylandsurface_p.h b/src/compositor/compositor_api/aurorawaylandsurface_p.h index 122596fa3..2bb9dc2ed 100644 --- a/src/compositor/compositor_api/aurorawaylandsurface_p.h +++ b/src/compositor/compositor_api/aurorawaylandsurface_p.h @@ -2,8 +2,7 @@ // Copyright (C) 2017 Jolla Ltd, author: // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDSURFACE_P_H -#define AURORA_COMPOSITOR_WAYLANDSURFACE_P_H +#pragma once // // W A R N I N G @@ -193,4 +192,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandSurfacePrivate } // namespace Aurora -#endif diff --git a/src/compositor/compositor_api/aurorawaylandsurfacegrabber.h b/src/compositor/compositor_api/aurorawaylandsurfacegrabber.h index 02a83fcaa..34df355fc 100644 --- a/src/compositor/compositor_api/aurorawaylandsurfacegrabber.h +++ b/src/compositor/compositor_api/aurorawaylandsurfacegrabber.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 Klarälvdalens Datakonsult AB (KDAB). // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDSURFACEGRABBER_H -#define AURORA_COMPOSITOR_WAYLANDSURFACEGRABBER_H +#pragma once #include #include @@ -45,4 +44,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandSurfaceGrabber : public QObject } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDSURFACEGRABBER_H diff --git a/src/compositor/compositor_api/aurorawaylandtouch.h b/src/compositor/compositor_api/aurorawaylandtouch.h index c1623efea..4eda71509 100644 --- a/src/compositor/compositor_api/aurorawaylandtouch.h +++ b/src/compositor/compositor_api/aurorawaylandtouch.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDTOUCH_H -#define AURORA_COMPOSITOR_WAYLANDTOUCH_H +#pragma once #include @@ -48,4 +47,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandTouch : public WaylandObject } // namespace Aurora -#endif /*QWAYLANDTOUCH_H*/ diff --git a/src/compositor/compositor_api/aurorawaylandtouch_p.h b/src/compositor/compositor_api/aurorawaylandtouch_p.h index 1efa5a2c4..f8e47c664 100644 --- a/src/compositor/compositor_api/aurorawaylandtouch_p.h +++ b/src/compositor/compositor_api/aurorawaylandtouch_p.h @@ -2,8 +2,7 @@ // Copyright (C) 2017 Klarälvdalens Datakonsult AB (KDAB). // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_WAYLAND_TOUCH_P_H -#define AURORA_WAYLAND_TOUCH_P_H +#pragma once // // W A R N I N G @@ -57,4 +56,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandTouchPrivate : public PrivateServer::wl } // namespace Aurora -#endif // AURORA_WAYLAND_TOUCH_P_H diff --git a/src/compositor/compositor_api/aurorawaylandview.h b/src/compositor/compositor_api/aurorawaylandview.h index 3ea172987..a82fc0d59 100644 --- a/src/compositor/compositor_api/aurorawaylandview.h +++ b/src/compositor/compositor_api/aurorawaylandview.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 Jolla Ltd, author: // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDSURFACEVIEW_H -#define AURORA_COMPOSITOR_WAYLANDSURFACEVIEW_H +#pragma once #include #include @@ -74,4 +73,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandView : public QObject } // namespace Aurora -#endif diff --git a/src/compositor/compositor_api/aurorawaylandview_p.h b/src/compositor/compositor_api/aurorawaylandview_p.h index 9f1291a20..83e153814 100644 --- a/src/compositor/compositor_api/aurorawaylandview_p.h +++ b/src/compositor/compositor_api/aurorawaylandview_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDSURFACEVIEW_P_H -#define AURORA_COMPOSITOR_WAYLANDSURFACEVIEW_P_H +#pragma once #include "aurorawaylandview.h" @@ -65,4 +64,3 @@ class WaylandViewPrivate } // namespace Aurora -#endif /*QWAYLANDSURFACEVIEW_P_H*/ diff --git a/src/compositor/extensions/aurorawaylandextsessionlockv1.h b/src/compositor/extensions/aurorawaylandextsessionlockv1.h index 38cb68b88..31717632b 100644 --- a/src/compositor/extensions/aurorawaylandextsessionlockv1.h +++ b/src/compositor/extensions/aurorawaylandextsessionlockv1.h @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -#ifndef AURORA_COMPOSITOR_WAYLANDEXTSESSIONLOCKV1_H -#define AURORA_COMPOSITOR_WAYLANDEXTSESSIONLOCKV1_H +#pragma once #include #include @@ -86,4 +85,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandExtSessionLockSurfaceV1 } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDEXTSESSIONLOCKV1_H diff --git a/src/compositor/extensions/aurorawaylandextsessionlockv1_p.h b/src/compositor/extensions/aurorawaylandextsessionlockv1_p.h index a8b6e5820..616ff153a 100644 --- a/src/compositor/extensions/aurorawaylandextsessionlockv1_p.h +++ b/src/compositor/extensions/aurorawaylandextsessionlockv1_p.h @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -#ifndef AURORA_COMPOSITOR_WAYLANDEXTSESSIONLOCKV1_P_H -#define AURORA_COMPOSITOR_WAYLANDEXTSESSIONLOCKV1_P_H +#pragma once #include @@ -130,4 +129,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandExtSessionLockSurfaceV1Private } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDEXTSESSIONLOCKV1_P_H diff --git a/src/compositor/extensions/aurorawaylandextsessionlockv1integration_p.h b/src/compositor/extensions/aurorawaylandextsessionlockv1integration_p.h index c1745ca90..4f4c94ca1 100644 --- a/src/compositor/extensions/aurorawaylandextsessionlockv1integration_p.h +++ b/src/compositor/extensions/aurorawaylandextsessionlockv1integration_p.h @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDEXTSESSIONLOCKV1INTEGRATION_H -#define AURORA_COMPOSITOR_WAYLANDEXTSESSIONLOCKV1INTEGRATION_H +#pragma once #include #include @@ -43,4 +42,3 @@ class WaylandExtSessionLockV1Integration : public WaylandQuickShellIntegration } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDEXTSESSIONLOCKV1INTEGRATION_H diff --git a/src/compositor/extensions/aurorawaylandfluiddecorationv1.h b/src/compositor/extensions/aurorawaylandfluiddecorationv1.h index ecdf7ee1d..5aec6ca50 100644 --- a/src/compositor/extensions/aurorawaylandfluiddecorationv1.h +++ b/src/compositor/extensions/aurorawaylandfluiddecorationv1.h @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -#ifndef AURORA_COMPOSITOR_WAYLANDFLUIDDECORATIONV1_H -#define AURORA_COMPOSITOR_WAYLANDFLUIDDECORATIONV1_H +#pragma once #include @@ -80,4 +79,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandFluidDecorationV1 : public QObject } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDFLUIDDECORATIONV1_H diff --git a/src/compositor/extensions/aurorawaylandfluiddecorationv1_p.h b/src/compositor/extensions/aurorawaylandfluiddecorationv1_p.h index 7f2f067d4..14814d043 100644 --- a/src/compositor/extensions/aurorawaylandfluiddecorationv1_p.h +++ b/src/compositor/extensions/aurorawaylandfluiddecorationv1_p.h @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -#ifndef AURORA_COMPOSITOR_WAYLANDFLUIDDECORATIONV1_P_H -#define AURORA_COMPOSITOR_WAYLANDFLUIDDECORATIONV1_P_H +#pragma once #include @@ -75,4 +74,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandFluidDecorationV1Private } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDFLUIDDECORATIONV1_P_H diff --git a/src/compositor/extensions/aurorawaylandidleinhibitv1.h b/src/compositor/extensions/aurorawaylandidleinhibitv1.h index a1337cdd9..24e629070 100644 --- a/src/compositor/extensions/aurorawaylandidleinhibitv1.h +++ b/src/compositor/extensions/aurorawaylandidleinhibitv1.h @@ -1,8 +1,7 @@ // Copyright (C) 2019 Pier Luigi Fiorini // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDIDLEINHIBITV1_H -#define AURORA_COMPOSITOR_WAYLANDIDLEINHIBITV1_H +#pragma once #include @@ -33,4 +32,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandIdleInhibitManagerV1 : public WaylandCo } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDIDLEINHIBITV1_H diff --git a/src/compositor/extensions/aurorawaylandidleinhibitv1_p.h b/src/compositor/extensions/aurorawaylandidleinhibitv1_p.h index 99e152d3f..f89dfab86 100644 --- a/src/compositor/extensions/aurorawaylandidleinhibitv1_p.h +++ b/src/compositor/extensions/aurorawaylandidleinhibitv1_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2019 Pier Luigi Fiorini // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDIDLEINHIBITV1_P_H -#define AURORA_COMPOSITOR_WAYLANDIDLEINHIBITV1_P_H +#pragma once #include #include @@ -56,4 +55,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandIdleInhibitManagerV1Private } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDIDLEINHIBITV1_P_H diff --git a/src/compositor/extensions/aurorawaylandiviapplication.h b/src/compositor/extensions/aurorawaylandiviapplication.h index 4770b8477..f7929b74c 100644 --- a/src/compositor/extensions/aurorawaylandiviapplication.h +++ b/src/compositor/extensions/aurorawaylandiviapplication.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDIVIAPPLICATION_H -#define AURORA_COMPOSITOR_WAYLANDIVIAPPLICATION_H +#pragma once #include #include @@ -44,4 +43,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandIviApplication : public WaylandShellTem } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDIVIAPPLICATION_H diff --git a/src/compositor/extensions/aurorawaylandiviapplication_p.h b/src/compositor/extensions/aurorawaylandiviapplication_p.h index b1111bbc1..6f4b15ad0 100644 --- a/src/compositor/extensions/aurorawaylandiviapplication_p.h +++ b/src/compositor/extensions/aurorawaylandiviapplication_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDIVIAPPLICATION_P_H -#define AURORA_COMPOSITOR_WAYLANDIVIAPPLICATION_P_H +#pragma once #include #include @@ -47,4 +46,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandIviApplicationPrivate } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDIVIAPPLICATION_P_H diff --git a/src/compositor/extensions/aurorawaylandivisurface.h b/src/compositor/extensions/aurorawaylandivisurface.h index 81c217b59..f32442344 100644 --- a/src/compositor/extensions/aurorawaylandivisurface.h +++ b/src/compositor/extensions/aurorawaylandivisurface.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDIVISURFACE_H -#define AURORA_COMPOSITOR_WAYLANDIVISURFACE_H +#pragma once #include #if LIRI_FEATURE_aurora_compositor_quick @@ -71,4 +70,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandIviSurface : public WaylandShellSurface } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDIVISURFACE_H diff --git a/src/compositor/extensions/aurorawaylandivisurface_p.h b/src/compositor/extensions/aurorawaylandivisurface_p.h index c19601839..f27e8af40 100644 --- a/src/compositor/extensions/aurorawaylandivisurface_p.h +++ b/src/compositor/extensions/aurorawaylandivisurface_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDIVISURFACE_P_H -#define AURORA_COMPOSITOR_WAYLANDIVISURFACE_P_H +#pragma once #include #include @@ -52,4 +51,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandIviSurfacePrivate } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDIVISURFACE_P_H diff --git a/src/compositor/extensions/aurorawaylandivisurfaceintegration_p.h b/src/compositor/extensions/aurorawaylandivisurfaceintegration_p.h index 0006d8b2c..515bda673 100644 --- a/src/compositor/extensions/aurorawaylandivisurfaceintegration_p.h +++ b/src/compositor/extensions/aurorawaylandivisurfaceintegration_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDIVISURFACEINTEGRATION_H -#define AURORA_COMPOSITOR_WAYLANDIVISURFACEINTEGRATION_H +#pragma once #include @@ -46,4 +45,3 @@ private Q_SLOTS: } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDIVISURFACEINTEGRATION_H diff --git a/src/compositor/extensions/aurorawaylandpresentationtime_p.h b/src/compositor/extensions/aurorawaylandpresentationtime_p.h index 622d087b9..ed167cbdd 100644 --- a/src/compositor/extensions/aurorawaylandpresentationtime_p.h +++ b/src/compositor/extensions/aurorawaylandpresentationtime_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2021 LG Electronics Inc. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDPRESENTATIONTIME_P_H -#define AURORA_COMPOSITOR_WAYLANDPRESENTATIONTIME_P_H +#pragma once // // W A R N I N G @@ -54,4 +53,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandPresentationTime : public WaylandCompos } // namespace Aurora -#endif diff --git a/src/compositor/extensions/aurorawaylandpresentationtime_p_p.h b/src/compositor/extensions/aurorawaylandpresentationtime_p_p.h index b34b834a3..b764d7bd3 100644 --- a/src/compositor/extensions/aurorawaylandpresentationtime_p_p.h +++ b/src/compositor/extensions/aurorawaylandpresentationtime_p_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2021 LG Electronics Inc. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDPRESENTATIONTIME_P_P_H -#define AURORA_COMPOSITOR_WAYLANDPRESENTATIONTIME_P_P_H +#pragma once // // W A R N I N G @@ -84,4 +83,3 @@ class WaylandPresentationTimePrivate : public WaylandCompositorExtensionPrivate, } // namespace Aurora -#endif diff --git a/src/compositor/extensions/aurorawaylandqttextinputmethod.h b/src/compositor/extensions/aurorawaylandqttextinputmethod.h index bb1b5681b..835bb4822 100644 --- a/src/compositor/extensions/aurorawaylandqttextinputmethod.h +++ b/src/compositor/extensions/aurorawaylandqttextinputmethod.h @@ -1,8 +1,7 @@ // Copyright (C) 2020 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDQTTEXTINPUTMETHOD_H -#define AURORA_COMPOSITOR_WAYLANDQTTEXTINPUTMETHOD_H +#pragma once #include @@ -60,4 +59,3 @@ private Q_SLOTS: } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDQTTEXTINPUTMETHOD_H diff --git a/src/compositor/extensions/aurorawaylandqttextinputmethod_p.h b/src/compositor/extensions/aurorawaylandqttextinputmethod_p.h index fca8b2703..f3e46a15f 100644 --- a/src/compositor/extensions/aurorawaylandqttextinputmethod_p.h +++ b/src/compositor/extensions/aurorawaylandqttextinputmethod_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2020 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDQTTEXTINPUTMETHOD_P_H -#define AURORA_COMPOSITOR_WAYLANDQTTEXTINPUTMETHOD_P_H +#pragma once #include "aurorawaylandqttextinputmethod.h" @@ -81,4 +80,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandQtTextInputMethodPrivate : public Wayla } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDQTTEXTINPUTMETHOD_P_H diff --git a/src/compositor/extensions/aurorawaylandqttextinputmethodmanager.h b/src/compositor/extensions/aurorawaylandqttextinputmethodmanager.h index 47480b166..25a77eb93 100644 --- a/src/compositor/extensions/aurorawaylandqttextinputmethodmanager.h +++ b/src/compositor/extensions/aurorawaylandqttextinputmethodmanager.h @@ -1,8 +1,7 @@ // Copyright (C) 2020 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDQTTEXTINPUTMETHODMANAGER_H -#define AURORA_COMPOSITOR_WAYLANDQTTEXTINPUTMETHODMANAGER_H +#pragma once #include @@ -32,4 +31,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandQtTextInputMethodManager : public Wayla } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDQTTEXTINPUTMETHODMANAGER_H diff --git a/src/compositor/extensions/aurorawaylandqttextinputmethodmanager_p.h b/src/compositor/extensions/aurorawaylandqttextinputmethodmanager_p.h index f9c60b3e3..23644aae7 100644 --- a/src/compositor/extensions/aurorawaylandqttextinputmethodmanager_p.h +++ b/src/compositor/extensions/aurorawaylandqttextinputmethodmanager_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2020 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDQTTEXTINPUTMETHODMANAGER_P_H -#define AURORA_COMPOSITOR_WAYLANDQTTEXTINPUTMETHODMANAGER_P_H +#pragma once #include @@ -37,4 +36,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandQtTextInputMethodManagerPrivate : publi } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDQTTEXTINPUTMETHODMANAGER_P_H diff --git a/src/compositor/extensions/aurorawaylandqtwindowmanager.h b/src/compositor/extensions/aurorawaylandqtwindowmanager.h index 9f0a00d72..f736f4917 100644 --- a/src/compositor/extensions/aurorawaylandqtwindowmanager.h +++ b/src/compositor/extensions/aurorawaylandqtwindowmanager.h @@ -2,8 +2,7 @@ // Copyright (C) 2017 Pier Luigi Fiorini // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDQTWINDOWMANAGER_H -#define AURORA_COMPOSITOR_WAYLANDQTWINDOWMANAGER_H +#pragma once #include #include @@ -48,4 +47,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandQtWindowManager : public WaylandComposi } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDQTWINDOWMANAGER_H diff --git a/src/compositor/extensions/aurorawaylandqtwindowmanager_p.h b/src/compositor/extensions/aurorawaylandqtwindowmanager_p.h index 4581b6c8b..0c05e57ac 100644 --- a/src/compositor/extensions/aurorawaylandqtwindowmanager_p.h +++ b/src/compositor/extensions/aurorawaylandqtwindowmanager_p.h @@ -2,8 +2,7 @@ // Copyright (C) 2017 Pier Luigi Fiorini // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDQTWINDOWMANAGER_P_H -#define AURORA_COMPOSITOR_WAYLANDQTWINDOWMANAGER_P_H +#pragma once #include @@ -48,4 +47,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandQtWindowManagerPrivate } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDQTWINDOWMANAGER_P_H diff --git a/src/compositor/extensions/aurorawaylandquickshellintegration.h b/src/compositor/extensions/aurorawaylandquickshellintegration.h index 9ffa02ef6..75ac1eb9f 100644 --- a/src/compositor/extensions/aurorawaylandquickshellintegration.h +++ b/src/compositor/extensions/aurorawaylandquickshellintegration.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDQUICKSHELLINTEGRATION_H -#define AURORA_COMPOSITOR_WAYLANDQUICKSHELLINTEGRATION_H +#pragma once #include #include @@ -23,4 +22,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandQuickShellIntegration : public QObject } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDQUICKSHELLINTEGRATION_H diff --git a/src/compositor/extensions/aurorawaylandquickshellsurfaceitem.h b/src/compositor/extensions/aurorawaylandquickshellsurfaceitem.h index 0d11bbd8d..5f49fa41e 100644 --- a/src/compositor/extensions/aurorawaylandquickshellsurfaceitem.h +++ b/src/compositor/extensions/aurorawaylandquickshellsurfaceitem.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDQUICKSHELLSURFACEITEM_H -#define AURORA_COMPOSITOR_WAYLANDQUICKSHELLSURFACEITEM_H +#pragma once #include #include @@ -61,4 +60,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandQuickShellSurfaceItem : public WaylandQ } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDQUICKSHELLSURFACEITEM_H diff --git a/src/compositor/extensions/aurorawaylandquickshellsurfaceitem_p.h b/src/compositor/extensions/aurorawaylandquickshellsurfaceitem_p.h index 94b61838c..e06fb8f50 100644 --- a/src/compositor/extensions/aurorawaylandquickshellsurfaceitem_p.h +++ b/src/compositor/extensions/aurorawaylandquickshellsurfaceitem_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDQUICKSHELLSURFACEITEM_P_H -#define AURORA_COMPOSITOR_WAYLANDQUICKSHELLSURFACEITEM_P_H +#pragma once #include #include @@ -84,4 +83,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandQuickShellEventFilter : public QObject } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDQUICKSHELLSURFACEITEM_P_H diff --git a/src/compositor/extensions/aurorawaylandquickwlroutputmanagementv1.h b/src/compositor/extensions/aurorawaylandquickwlroutputmanagementv1.h index 53e4046c3..3b6c230cc 100644 --- a/src/compositor/extensions/aurorawaylandquickwlroutputmanagementv1.h +++ b/src/compositor/extensions/aurorawaylandquickwlroutputmanagementv1.h @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -#ifndef AURORA_COMPOSITOR_WAYLANDQUICKWLROUTPUTMANAGEMENT_H -#define AURORA_COMPOSITOR_WAYLANDQUICKWLROUTPUTMANAGEMENT_H +#pragma once #include #include @@ -53,4 +52,3 @@ QML_DECLARE_TYPE(Aurora::Compositor::WaylandWlrOutputConfigurationHeadV1) QML_DECLARE_TYPE(Aurora::Compositor::WaylandQuickWlrOutputHeadV1) QML_DECLARE_TYPE(Aurora::Compositor::WaylandWlrOutputModeV1) -#endif // AURORA_COMPOSITOR_WAYLANDQUICKWLROUTPUTMANAGEMENT_H diff --git a/src/compositor/extensions/aurorawaylandquickxdgoutputv1.h b/src/compositor/extensions/aurorawaylandquickxdgoutputv1.h index 286100b7d..b7a60809a 100644 --- a/src/compositor/extensions/aurorawaylandquickxdgoutputv1.h +++ b/src/compositor/extensions/aurorawaylandquickxdgoutputv1.h @@ -1,8 +1,7 @@ // Copyright (C) 2019 Pier Luigi Fiorini // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDQUICKXDGOUTPUT_V1 -#define AURORA_COMPOSITOR_WAYLANDQUICKXDGOUTPUT_V1 +#pragma once #include #include @@ -30,4 +29,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandQuickXdgOutputV1 } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDQUICKXDGOUTPUT_V1 diff --git a/src/compositor/extensions/aurorawaylandshell.h b/src/compositor/extensions/aurorawaylandshell.h index 40de89d3a..b3fcbc7dd 100644 --- a/src/compositor/extensions/aurorawaylandshell.h +++ b/src/compositor/extensions/aurorawaylandshell.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 Pier Luigi Fiorini // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDSHELL_H -#define AURORA_COMPOSITOR_WAYLANDSHELL_H +#pragma once #include #include @@ -72,4 +71,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandShellTemplate : public WaylandShell } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDSHELL_H diff --git a/src/compositor/extensions/aurorawaylandshell_p.h b/src/compositor/extensions/aurorawaylandshell_p.h index 60cb6b314..9ab260dec 100644 --- a/src/compositor/extensions/aurorawaylandshell_p.h +++ b/src/compositor/extensions/aurorawaylandshell_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 Pier Luigi Fiorini // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDSHELL_P_H -#define AURORA_COMPOSITOR_WAYLANDSHELL_P_H +#pragma once #include #include @@ -38,4 +37,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandShellPrivate : public WaylandCompositor } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDSHELL_P_H diff --git a/src/compositor/extensions/aurorawaylandshellsurface.h b/src/compositor/extensions/aurorawaylandshellsurface.h index 71081ede6..ab46f86b3 100644 --- a/src/compositor/extensions/aurorawaylandshellsurface.h +++ b/src/compositor/extensions/aurorawaylandshellsurface.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDSHELLSURFACE_H -#define AURORA_COMPOSITOR_WAYLANDSHELLSURFACE_H +#pragma once #include #include @@ -77,4 +76,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandShellSurfaceTemplate : public WaylandSh } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDSHELLSURFACE_H diff --git a/src/compositor/extensions/aurorawaylandsurfacelayout.h b/src/compositor/extensions/aurorawaylandsurfacelayout.h index 0fd5c9eef..e4dd7378f 100644 --- a/src/compositor/extensions/aurorawaylandsurfacelayout.h +++ b/src/compositor/extensions/aurorawaylandsurfacelayout.h @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -#ifndef AURORA_COMPOSITOR_WAYLANDSURFACELAYOUT_H -#define AURORA_COMPOSITOR_WAYLANDSURFACELAYOUT_H +#pragma once #include @@ -51,4 +50,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandSurfaceLayout : public QQuickItem } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDSURFACELAYOUT_H diff --git a/src/compositor/extensions/aurorawaylandsurfacelayout_p.h b/src/compositor/extensions/aurorawaylandsurfacelayout_p.h index 65bde1aee..3f87b5b16 100644 --- a/src/compositor/extensions/aurorawaylandsurfacelayout_p.h +++ b/src/compositor/extensions/aurorawaylandsurfacelayout_p.h @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -#ifndef AURORA_COMPOSITOR_WAYLANDSURFACELAYOUT_P_H -#define AURORA_COMPOSITOR_WAYLANDSURFACELAYOUT_P_H +#pragma once #include @@ -47,4 +46,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandSurfaceLayoutPrivate } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDSURFACELAYOUT_P_H diff --git a/src/compositor/extensions/aurorawaylandtextinput.h b/src/compositor/extensions/aurorawaylandtextinput.h index 730cae38b..42bc0d37a 100644 --- a/src/compositor/extensions/aurorawaylandtextinput.h +++ b/src/compositor/extensions/aurorawaylandtextinput.h @@ -1,8 +1,7 @@ // Copyright (C) 2017-2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDTEXTINPUT_H -#define AURORA_COMPOSITOR_WAYLANDTEXTINPUT_H +#pragma once #include @@ -61,4 +60,3 @@ class WaylandTextInput : public WaylandCompositorExtensionTemplate #include @@ -111,4 +110,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandTextInputPrivate : public WaylandCompos } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDTEXTINPUT_P_H diff --git a/src/compositor/extensions/aurorawaylandtextinputmanager.h b/src/compositor/extensions/aurorawaylandtextinputmanager.h index 6a16ba9a9..da2f7d456 100644 --- a/src/compositor/extensions/aurorawaylandtextinputmanager.h +++ b/src/compositor/extensions/aurorawaylandtextinputmanager.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDTEXTINPUTMANAGER_H -#define AURORA_COMPOSITOR_WAYLANDTEXTINPUTMANAGER_H +#pragma once #include @@ -36,4 +35,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandTextInputManager : public WaylandCompos } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDTEXTINPUTMANAGER_H diff --git a/src/compositor/extensions/aurorawaylandtextinputmanager_p.h b/src/compositor/extensions/aurorawaylandtextinputmanager_p.h index 6065d0c31..800dd718b 100644 --- a/src/compositor/extensions/aurorawaylandtextinputmanager_p.h +++ b/src/compositor/extensions/aurorawaylandtextinputmanager_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2017-2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDTEXTINPUTMANAGER_P_H -#define AURORA_COMPOSITOR_WAYLANDTEXTINPUTMANAGER_P_H +#pragma once #include @@ -37,4 +36,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandTextInputManagerPrivate : public Waylan } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDTEXTINPUTMANAGER_P_H diff --git a/src/compositor/extensions/aurorawaylandtextinputmanagerv4.h b/src/compositor/extensions/aurorawaylandtextinputmanagerv4.h index 318e12b17..8f9f9ec48 100644 --- a/src/compositor/extensions/aurorawaylandtextinputmanagerv4.h +++ b/src/compositor/extensions/aurorawaylandtextinputmanagerv4.h @@ -1,8 +1,7 @@ // Copyright (C) 2021 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDTEXTINPUTMANAGERV4_H -#define AURORA_COMPOSITOR_WAYLANDTEXTINPUTMANAGERV4_H +#pragma once #include @@ -33,4 +32,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandTextInputManagerV4 : public WaylandComp } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDTEXTINPUTMANAGERV4_H diff --git a/src/compositor/extensions/aurorawaylandtextinputmanagerv4_p.h b/src/compositor/extensions/aurorawaylandtextinputmanagerv4_p.h index de596f9b9..80c247a54 100644 --- a/src/compositor/extensions/aurorawaylandtextinputmanagerv4_p.h +++ b/src/compositor/extensions/aurorawaylandtextinputmanagerv4_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2021 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDTEXTINPUTMANAGERV4_P_H -#define AURORA_COMPOSITOR_WAYLANDTEXTINPUTMANAGERV4_P_H +#pragma once #include @@ -37,4 +36,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandTextInputManagerV4Private : public Wayl } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDTEXTINPUTMANAGERV4_P_H diff --git a/src/compositor/extensions/aurorawaylandtextinputv4.h b/src/compositor/extensions/aurorawaylandtextinputv4.h index d31993fdd..64b4b5f6b 100644 --- a/src/compositor/extensions/aurorawaylandtextinputv4.h +++ b/src/compositor/extensions/aurorawaylandtextinputv4.h @@ -1,8 +1,7 @@ // Copyright (C) 2021 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDTEXTINPUTV4_H -#define AURORA_COMPOSITOR_WAYLANDTEXTINPUTV4_H +#pragma once #include @@ -54,4 +53,3 @@ class WaylandTextInputV4 : public WaylandCompositorExtensionTemplate #include @@ -98,4 +97,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandTextInputV4Private : public WaylandComp } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDTEXTINPUTV4_P_H diff --git a/src/compositor/extensions/aurorawaylandviewporter.h b/src/compositor/extensions/aurorawaylandviewporter.h index b8ba6de3c..b17b22db3 100644 --- a/src/compositor/extensions/aurorawaylandviewporter.h +++ b/src/compositor/extensions/aurorawaylandviewporter.h @@ -1,8 +1,7 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDVIEWPORTER_H -#define AURORA_COMPOSITOR_WAYLANDVIEWPORTER_H +#pragma once #include @@ -35,4 +34,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandViewporter } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDVIEWPORTER_H diff --git a/src/compositor/extensions/aurorawaylandviewporter_p.h b/src/compositor/extensions/aurorawaylandviewporter_p.h index 2764a0a4e..5d77a359c 100644 --- a/src/compositor/extensions/aurorawaylandviewporter_p.h +++ b/src/compositor/extensions/aurorawaylandviewporter_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDVIEWPORTER_P_H -#define AURORA_COMPOSITOR_WAYLANDVIEWPORTER_P_H +#pragma once #include "aurorawaylandviewporter.h" @@ -61,4 +60,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandViewporterPrivate } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDVIEWPORTER_P_H diff --git a/src/compositor/extensions/aurorawaylandwlrexportdmabufv1.h b/src/compositor/extensions/aurorawaylandwlrexportdmabufv1.h index 2d88fa946..0332130b0 100644 --- a/src/compositor/extensions/aurorawaylandwlrexportdmabufv1.h +++ b/src/compositor/extensions/aurorawaylandwlrexportdmabufv1.h @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -#ifndef AURORA_COMPOSITOR_WAYLANDWLREXPORTDMABUFV1_H -#define AURORA_COMPOSITOR_WAYLANDWLREXPORTDMABUFV1_H +#pragma once #include @@ -104,4 +103,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandWlrExportDmabufFrameV1 Q_DECLARE_OPERATORS_FOR_FLAGS(Aurora::Compositor::WaylandWlrExportDmabufFrameV1::BufferFlags) Q_DECLARE_OPERATORS_FOR_FLAGS(Aurora::Compositor::WaylandWlrExportDmabufFrameV1::FrameFlags) -#endif // AURORA_COMPOSITOR_WAYLANDWLREXPORTDMABUFV1_H diff --git a/src/compositor/extensions/aurorawaylandwlrexportdmabufv1_p.h b/src/compositor/extensions/aurorawaylandwlrexportdmabufv1_p.h index 28c22a95e..5b5e712de 100644 --- a/src/compositor/extensions/aurorawaylandwlrexportdmabufv1_p.h +++ b/src/compositor/extensions/aurorawaylandwlrexportdmabufv1_p.h @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -#ifndef AURORA_COMPOSITOR_WAYLANDWLREXPORTDMABUFV1_P_H -#define AURORA_COMPOSITOR_WAYLANDWLREXPORTDMABUFV1_P_H +#pragma once #include @@ -67,4 +66,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandWlrExportDmabufFrameV1Private } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDWLREXPORTDMABUFV1_P_H diff --git a/src/compositor/extensions/aurorawaylandwlrforeigntoplevelmanagementv1.h b/src/compositor/extensions/aurorawaylandwlrforeigntoplevelmanagementv1.h index eaf02ded4..64aa8f75b 100644 --- a/src/compositor/extensions/aurorawaylandwlrforeigntoplevelmanagementv1.h +++ b/src/compositor/extensions/aurorawaylandwlrforeigntoplevelmanagementv1.h @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -#ifndef AURORA_COMPOSITOR_WAYLANDWLRFOREIGNTOPLEVELMANAGEMENTV1_H -#define AURORA_COMPOSITOR_WAYLANDWLRFOREIGNTOPLEVELMANAGEMENTV1_H +#pragma once #include #include @@ -137,4 +136,3 @@ public Q_SLOTS: } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDWLRFOREIGNTOPLEVELMANAGEMENTV1_H diff --git a/src/compositor/extensions/aurorawaylandwlrforeigntoplevelmanagementv1_p.h b/src/compositor/extensions/aurorawaylandwlrforeigntoplevelmanagementv1_p.h index c56540ed2..fe3bfad3a 100644 --- a/src/compositor/extensions/aurorawaylandwlrforeigntoplevelmanagementv1_p.h +++ b/src/compositor/extensions/aurorawaylandwlrforeigntoplevelmanagementv1_p.h @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -#ifndef AURORA_COMPOSITOR_WAYLANDWLRFOREIGNTOPLEVELMANAGEMENTV1_P_H -#define AURORA_COMPOSITOR_WAYLANDWLRFOREIGNTOPLEVELMANAGEMENTV1_P_H +#pragma once #include #include @@ -91,4 +90,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandWlrForeignToplevelHandleV1Private } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDWLRFOREIGNTOPLEVELMANAGEMENTV1_P_H diff --git a/src/compositor/extensions/aurorawaylandwlrlayershellintegration_p.h b/src/compositor/extensions/aurorawaylandwlrlayershellintegration_p.h index 88cd82aac..c8e861953 100644 --- a/src/compositor/extensions/aurorawaylandwlrlayershellintegration_p.h +++ b/src/compositor/extensions/aurorawaylandwlrlayershellintegration_p.h @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -#ifndef AURORA_COMPOSITOR_WAYLANDWLRLAYERSHELLINTEGRATION_P_H -#define AURORA_COMPOSITOR_WAYLANDWLRLAYERSHELLINTEGRATION_P_H +#pragma once #include #include @@ -42,4 +41,3 @@ class WlrLayerSurfaceIntegration : public WaylandQuickShellIntegration } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDWLRLAYERSHELLINTEGRATION_P_H diff --git a/src/compositor/extensions/aurorawaylandwlrlayershellv1.h b/src/compositor/extensions/aurorawaylandwlrlayershellv1.h index acf7db9c2..d260faf60 100644 --- a/src/compositor/extensions/aurorawaylandwlrlayershellv1.h +++ b/src/compositor/extensions/aurorawaylandwlrlayershellv1.h @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -#ifndef AURORA_COMPOSITOR_WAYLANDWLRLAYERSHELLV1_H -#define AURORA_COMPOSITOR_WAYLANDWLRLAYERSHELLV1_H +#pragma once #include #include @@ -179,4 +178,3 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(WaylandWlrLayerSurfaceV1::Anchors) } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDWLRLAYERSHELLV1_H diff --git a/src/compositor/extensions/aurorawaylandwlrlayershellv1_p.h b/src/compositor/extensions/aurorawaylandwlrlayershellv1_p.h index c43890dea..2c7e06527 100644 --- a/src/compositor/extensions/aurorawaylandwlrlayershellv1_p.h +++ b/src/compositor/extensions/aurorawaylandwlrlayershellv1_p.h @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -#ifndef AURORA_COMPOSITOR_WAYLANDWLRLAYERSHELLV1_P_H -#define AURORA_COMPOSITOR_WAYLANDWLRLAYERSHELLV1_P_H +#pragma once #include #include @@ -122,4 +121,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandWlrLayerSurfaceV1Private } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDWLRLAYERSHELLV1_P_H diff --git a/src/compositor/extensions/aurorawaylandwlrlayersurfaceitem.h b/src/compositor/extensions/aurorawaylandwlrlayersurfaceitem.h index b6144f110..39aeaf75e 100644 --- a/src/compositor/extensions/aurorawaylandwlrlayersurfaceitem.h +++ b/src/compositor/extensions/aurorawaylandwlrlayersurfaceitem.h @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -#ifndef AURORA_COMPOSITOR_WAYLANDWLRLAYERSURFACEITEM_H -#define AURORA_COMPOSITOR_WAYLANDWLRLAYERSURFACEITEM_H +#pragma once #include @@ -40,4 +39,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandWlrLayerSurfaceItem : public WaylandQui } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDWLRLAYERSURFACEITEM_H diff --git a/src/compositor/extensions/aurorawaylandwlrlayersurfaceitem_p.h b/src/compositor/extensions/aurorawaylandwlrlayersurfaceitem_p.h index 7e67eec81..a99f26d00 100644 --- a/src/compositor/extensions/aurorawaylandwlrlayersurfaceitem_p.h +++ b/src/compositor/extensions/aurorawaylandwlrlayersurfaceitem_p.h @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -#ifndef AURORA_COMPOSITOR_WAYLANDWLRLAYERSURFACEITEM_P_H -#define AURORA_COMPOSITOR_WAYLANDWLRLAYERSURFACEITEM_P_H +#pragma once #include @@ -44,4 +43,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandWlrLayerSurfaceItemPrivate } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDWLRLAYERSURFACEITEM_P_H diff --git a/src/compositor/extensions/aurorawaylandwlroutputmanagementv1.h b/src/compositor/extensions/aurorawaylandwlroutputmanagementv1.h index 5bd7591b2..86267580b 100644 --- a/src/compositor/extensions/aurorawaylandwlroutputmanagementv1.h +++ b/src/compositor/extensions/aurorawaylandwlroutputmanagementv1.h @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -#ifndef AURORA_COMPOSITOR_WAYLANDWLROUTPUTMANAGEMENTV1_H -#define AURORA_COMPOSITOR_WAYLANDWLROUTPUTMANAGEMENTV1_H +#pragma once #include #include @@ -236,4 +235,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandWlrOutputConfigurationV1 : public QObje } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDWLROUTPUTMANAGEMENTV1_H diff --git a/src/compositor/extensions/aurorawaylandwlroutputmanagementv1_p.h b/src/compositor/extensions/aurorawaylandwlroutputmanagementv1_p.h index 867c27144..909d78241 100644 --- a/src/compositor/extensions/aurorawaylandwlroutputmanagementv1_p.h +++ b/src/compositor/extensions/aurorawaylandwlroutputmanagementv1_p.h @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -#ifndef AURORA_COMPOSITOR_WAYLANDWLROUTPUTMANAGEMENTV1_P_H -#define AURORA_COMPOSITOR_WAYLANDWLROUTPUTMANAGEMENTV1_P_H +#pragma once #include #include @@ -169,4 +168,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandWlrOutputConfigurationHeadV1Private } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDWLROUTPUTMANAGEMENTV1_P_H diff --git a/src/compositor/extensions/aurorawaylandwlrscreencopyv1.h b/src/compositor/extensions/aurorawaylandwlrscreencopyv1.h index be8fac7c9..85c64dc4f 100644 --- a/src/compositor/extensions/aurorawaylandwlrscreencopyv1.h +++ b/src/compositor/extensions/aurorawaylandwlrscreencopyv1.h @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -#ifndef AURORA_COMPOSITOR_WAYLANDWLRSCREENCOPYV1_H -#define AURORA_COMPOSITOR_WAYLANDWLRSCREENCOPYV1_H +#pragma once #include @@ -84,4 +83,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandWlrScreencopyFrameV1 : public QObject Q_DECLARE_OPERATORS_FOR_FLAGS(Aurora::Compositor::WaylandWlrScreencopyFrameV1::Flags) -#endif // AURORA_COMPOSITOR_WAYLANDWLRSCREENCOPYV1_H diff --git a/src/compositor/extensions/aurorawaylandwlrscreencopyv1_p.h b/src/compositor/extensions/aurorawaylandwlrscreencopyv1_p.h index 3f9902d2e..8afb826e8 100644 --- a/src/compositor/extensions/aurorawaylandwlrscreencopyv1_p.h +++ b/src/compositor/extensions/aurorawaylandwlrscreencopyv1_p.h @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -#ifndef AURORA_COMPOSITOR_WAYLANDWLRSCREENCOPYV1_P_H -#define AURORA_COMPOSITOR_WAYLANDWLRSCREENCOPYV1_P_H +#pragma once #include @@ -108,4 +107,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandWlrScreencopyFrameEventFilter } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDWLRSCREENCOPYV1_P_H diff --git a/src/compositor/extensions/aurorawaylandwlshell.h b/src/compositor/extensions/aurorawaylandwlshell.h index 97c8e6459..39dad1886 100644 --- a/src/compositor/extensions/aurorawaylandwlshell.h +++ b/src/compositor/extensions/aurorawaylandwlshell.h @@ -27,8 +27,7 @@ ** ****************************************************************************/ -#ifndef AURORA_COMPOSITOR_WAYLANDWLSHELL_H -#define AURORA_COMPOSITOR_WAYLANDWLSHELL_H +#pragma once #include #include @@ -168,4 +167,3 @@ public Q_SLOTS: } // namespace Aurora -#endif /*QWAYLANDWLSHELL_H*/ diff --git a/src/compositor/extensions/aurorawaylandwlshell_p.h b/src/compositor/extensions/aurorawaylandwlshell_p.h index 12c918392..b59e5f125 100644 --- a/src/compositor/extensions/aurorawaylandwlshell_p.h +++ b/src/compositor/extensions/aurorawaylandwlshell_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDWLSHELL_P_H -#define AURORA_COMPOSITOR_WAYLANDWLSHELL_P_H +#pragma once #include #include @@ -118,4 +117,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandWlShellSurfacePrivate } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDWLSHELL_P_H diff --git a/src/compositor/extensions/aurorawaylandwlshellintegration_p.h b/src/compositor/extensions/aurorawaylandwlshellintegration_p.h index cdee35830..1954a4613 100644 --- a/src/compositor/extensions/aurorawaylandwlshellintegration_p.h +++ b/src/compositor/extensions/aurorawaylandwlshellintegration_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDWLSHELLINTEGRATION_H -#define AURORA_COMPOSITOR_WAYLANDWLSHELLINTEGRATION_H +#pragma once #include @@ -108,4 +107,3 @@ private Q_SLOTS: } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDWLSHELLINTEGRATION_H diff --git a/src/compositor/extensions/aurorawaylandxdgdecorationv1.h b/src/compositor/extensions/aurorawaylandxdgdecorationv1.h index cb297889d..a12cf41ad 100644 --- a/src/compositor/extensions/aurorawaylandxdgdecorationv1.h +++ b/src/compositor/extensions/aurorawaylandxdgdecorationv1.h @@ -1,8 +1,7 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDXDGDECORATIONV1_H -#define AURORA_COMPOSITOR_WAYLANDXDGDECORATIONV1_H +#pragma once #include #include @@ -41,4 +40,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandXdgDecorationManagerV1 : public Wayland } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDXDGDECORATIONV1_H diff --git a/src/compositor/extensions/aurorawaylandxdgdecorationv1_p.h b/src/compositor/extensions/aurorawaylandxdgdecorationv1_p.h index 92813f9cd..964b7b7c7 100644 --- a/src/compositor/extensions/aurorawaylandxdgdecorationv1_p.h +++ b/src/compositor/extensions/aurorawaylandxdgdecorationv1_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDXDGDECORATIONV1_P_H -#define AURORA_COMPOSITOR_WAYLANDXDGDECORATIONV1_P_H +#pragma once #include "aurorawaylandxdgdecorationv1.h" @@ -76,4 +75,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandXdgToplevelDecorationV1 } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDXDGDECORATIONV1_P_H diff --git a/src/compositor/extensions/aurorawaylandxdgoutputv1.h b/src/compositor/extensions/aurorawaylandxdgoutputv1.h index b8bf61e3e..727a4f040 100644 --- a/src/compositor/extensions/aurorawaylandxdgoutputv1.h +++ b/src/compositor/extensions/aurorawaylandxdgoutputv1.h @@ -1,8 +1,7 @@ // Copyright (C) 2019 Pier Luigi Fiorini // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDXDGOUTPUTV1_H -#define AURORA_COMPOSITOR_WAYLANDXDGOUTPUTV1_H +#pragma once #include #include @@ -93,4 +92,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandXdgOutputV1 : public QObject } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDXDGOUTPUTV1_H diff --git a/src/compositor/extensions/aurorawaylandxdgoutputv1_p.h b/src/compositor/extensions/aurorawaylandxdgoutputv1_p.h index 44916d7ea..6bfc19b8c 100644 --- a/src/compositor/extensions/aurorawaylandxdgoutputv1_p.h +++ b/src/compositor/extensions/aurorawaylandxdgoutputv1_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2019 Pier Luigi Fiorini // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDXDGOUTPUTV1_P_H -#define AURORA_COMPOSITOR_WAYLANDXDGOUTPUTV1_P_H +#pragma once #include @@ -84,4 +83,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandXdgOutputV1Private } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDXDGOUTPUTV1_P_H diff --git a/src/compositor/extensions/aurorawaylandxdgshell.h b/src/compositor/extensions/aurorawaylandxdgshell.h index 9f3c4f05e..af630d08a 100644 --- a/src/compositor/extensions/aurorawaylandxdgshell.h +++ b/src/compositor/extensions/aurorawaylandxdgshell.h @@ -1,8 +1,7 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDXDGSHELL_H -#define AURORA_COMPOSITOR_WAYLANDXDGSHELL_H +#pragma once #include #include @@ -285,4 +284,3 @@ private slots: } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDXDGSHELL_H diff --git a/src/compositor/extensions/aurorawaylandxdgshell_p.h b/src/compositor/extensions/aurorawaylandxdgshell_p.h index 145d44250..9376efea2 100644 --- a/src/compositor/extensions/aurorawaylandxdgshell_p.h +++ b/src/compositor/extensions/aurorawaylandxdgshell_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDXDGSHELL_P_H -#define AURORA_COMPOSITOR_WAYLANDXDGSHELL_P_H +#pragma once #include #include @@ -234,4 +233,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandXdgPositioner : public PrivateServer::x } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDXDGSHELL_P_H diff --git a/src/compositor/extensions/aurorawaylandxdgshellintegration_p.h b/src/compositor/extensions/aurorawaylandxdgshellintegration_p.h index 1ca7ab07e..b21db35fe 100644 --- a/src/compositor/extensions/aurorawaylandxdgshellintegration_p.h +++ b/src/compositor/extensions/aurorawaylandxdgshellintegration_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDXDGSHELLINTEGRATION_H -#define AURORA_COMPOSITOR_WAYLANDXDGSHELLINTEGRATION_H +#pragma once #include #include @@ -120,4 +119,3 @@ private Q_SLOTS: } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDXDGSHELLINTEGRATION_H diff --git a/src/compositor/extensions/aurorawlqtkey_p.h b/src/compositor/extensions/aurorawlqtkey_p.h index 7d7c4f0ee..d9d77a528 100644 --- a/src/compositor/extensions/aurorawlqtkey_p.h +++ b/src/compositor/extensions/aurorawlqtkey_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2019 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef WLQTKEY_H -#define WLQTKEY_H +#pragma once // // W A R N I N G @@ -49,4 +48,3 @@ class QtKeyExtensionGlobal : public WaylandCompositorExtensionTemplate @@ -133,4 +132,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandCompositorExtensionTemplate : public Wa } // namespace Aurora -#endif diff --git a/src/compositor/global/aurorawaylandcompositorextension_p.h b/src/compositor/global/aurorawaylandcompositorextension_p.h index 7c315720b..bf2cf3136 100644 --- a/src/compositor/global/aurorawaylandcompositorextension_p.h +++ b/src/compositor/global/aurorawaylandcompositorextension_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDEXTENSION_P_H -#define AURORA_COMPOSITOR_WAYLANDEXTENSION_P_H +#pragma once // // W A R N I N G @@ -43,4 +42,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandCompositorExtensionPrivate } // namespace Aurora -#endif /*QWAYLANDEXTENSION_P_H*/ diff --git a/src/compositor/global/aurorawaylandqmlinclude.h b/src/compositor/global/aurorawaylandqmlinclude.h index 83de8c40f..2e738537f 100644 --- a/src/compositor/global/aurorawaylandqmlinclude.h +++ b/src/compositor/global/aurorawaylandqmlinclude.h @@ -1,8 +1,7 @@ // Copyright (C) 2020 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDQMLINCLUDE_H -#define AURORA_COMPOSITOR_WAYLANDQMLINCLUDE_H +#pragma once // // W A R N I N G @@ -26,4 +25,3 @@ #define QML_ADDED_IN_VERSION(x, y) #endif -#endif // AURORA_COMPOSITOR_WAYLANDQMLINCLUDE_H diff --git a/src/compositor/global/aurorawaylandquickextension.h b/src/compositor/global/aurorawaylandquickextension.h index 9f7889c7f..a50b0dd10 100644 --- a/src/compositor/global/aurorawaylandquickextension.h +++ b/src/compositor/global/aurorawaylandquickextension.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDQUICKEXTENSION_H -#define AURORA_COMPOSITOR_WAYLANDQUICKEXTENSION_H +#pragma once #include #include @@ -98,4 +97,3 @@ namespace Compositor { } // namespace Aurora -#endif /*QWAYLANDQUICKEXTENSION_H*/ diff --git a/src/compositor/global/aurorawaylandutils_p.h b/src/compositor/global/aurorawaylandutils_p.h index 5846533fd..ae9628e88 100644 --- a/src/compositor/global/aurorawaylandutils_p.h +++ b/src/compositor/global/aurorawaylandutils_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDUTILS_P_H -#define AURORA_COMPOSITOR_WAYLANDUTILS_P_H +#pragma once // // W A R N I N G @@ -38,4 +37,3 @@ return_type fromResource(struct ::wl_resource *resource) { } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDUTILS_P_H diff --git a/src/compositor/hardware_integration/aurorawlclientbufferintegration_p.h b/src/compositor/hardware_integration/aurorawlclientbufferintegration_p.h index 59e2c79d8..ef2dad32f 100644 --- a/src/compositor/hardware_integration/aurorawlclientbufferintegration_p.h +++ b/src/compositor/hardware_integration/aurorawlclientbufferintegration_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2020 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDCLIENTBUFFERINTEGRATION_H -#define AURORA_COMPOSITOR_WAYLANDCLIENTBUFFERINTEGRATION_H +#pragma once // // W A R N I N G @@ -56,4 +55,3 @@ class LIRIAURORACOMPOSITOR_EXPORT ClientBufferIntegration } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDCLIENTBUFFERINTEGRATION_H diff --git a/src/compositor/hardware_integration/aurorawlclientbufferintegrationfactory_p.h b/src/compositor/hardware_integration/aurorawlclientbufferintegrationfactory_p.h index 96a324aff..4e3d33042 100644 --- a/src/compositor/hardware_integration/aurorawlclientbufferintegrationfactory_p.h +++ b/src/compositor/hardware_integration/aurorawlclientbufferintegrationfactory_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2019 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDCLIENTBUFFERINTEGRATIONFACTORY_H -#define AURORA_COMPOSITOR_WAYLANDCLIENTBUFFERINTEGRATIONFACTORY_H +#pragma once // // W A R N I N G @@ -39,4 +38,3 @@ class LIRIAURORACOMPOSITOR_EXPORT ClientBufferIntegrationFactory } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDCLIENTBUFFERINTEGRATIONFACTORY_H diff --git a/src/compositor/hardware_integration/aurorawlclientbufferintegrationplugin_p.h b/src/compositor/hardware_integration/aurorawlclientbufferintegrationplugin_p.h index b34284ef9..c4189be4c 100644 --- a/src/compositor/hardware_integration/aurorawlclientbufferintegrationplugin_p.h +++ b/src/compositor/hardware_integration/aurorawlclientbufferintegrationplugin_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2019 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDCLIENTBUFFERINTEGRATIONPLUGIN_H -#define AURORA_COMPOSITOR_WAYLANDCLIENTBUFFERINTEGRATIONPLUGIN_H +#pragma once // // W A R N I N G @@ -46,4 +45,3 @@ class LIRIAURORACOMPOSITOR_EXPORT ClientBufferIntegrationPlugin : public QObject } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDCLIENTBUFFERINTEGRATIONPLUGIN_H diff --git a/src/compositor/hardware_integration/aurorawlhardwarelayerintegration_p.h b/src/compositor/hardware_integration/aurorawlhardwarelayerintegration_p.h index d0772eb24..7dfc641f5 100644 --- a/src/compositor/hardware_integration/aurorawlhardwarelayerintegration_p.h +++ b/src/compositor/hardware_integration/aurorawlhardwarelayerintegration_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDHARDWARELAYERINTEGRATION_H -#define AURORA_COMPOSITOR_WAYLANDHARDWARELAYERINTEGRATION_H +#pragma once // // W A R N I N G @@ -47,4 +46,3 @@ class LIRIAURORACOMPOSITOR_EXPORT HardwareLayerIntegration : public QObject } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDHARDWARELAYERINTEGRATION_H diff --git a/src/compositor/hardware_integration/aurorawlhardwarelayerintegrationfactory_p.h b/src/compositor/hardware_integration/aurorawlhardwarelayerintegrationfactory_p.h index f5631f810..eb81adc4b 100644 --- a/src/compositor/hardware_integration/aurorawlhardwarelayerintegrationfactory_p.h +++ b/src/compositor/hardware_integration/aurorawlhardwarelayerintegrationfactory_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDHARDWARELAYERINTEGRATIONFACTORY_H -#define AURORA_COMPOSITOR_WAYLANDHARDWARELAYERINTEGRATIONFACTORY_H +#pragma once // // W A R N I N G @@ -39,4 +38,3 @@ class LIRIAURORACOMPOSITOR_EXPORT HardwareLayerIntegrationFactory } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDHARDWARELAYERINTEGRATIONFACTORY_H diff --git a/src/compositor/hardware_integration/aurorawlhardwarelayerintegrationplugin_p.h b/src/compositor/hardware_integration/aurorawlhardwarelayerintegrationplugin_p.h index 9aef78ef4..e00672a84 100644 --- a/src/compositor/hardware_integration/aurorawlhardwarelayerintegrationplugin_p.h +++ b/src/compositor/hardware_integration/aurorawlhardwarelayerintegrationplugin_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDHARDWARELAYERINTEGRATIONPLUGIN_H -#define AURORA_COMPOSITOR_WAYLANDHARDWARELAYERINTEGRATIONPLUGIN_H +#pragma once // // W A R N I N G @@ -46,4 +45,3 @@ class LIRIAURORACOMPOSITOR_EXPORT HardwareLayerIntegrationPlugin : public QObjec } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDHARDWARELAYERINTEGRATIONPLUGIN_H diff --git a/src/compositor/hardware_integration/aurorawlhwintegration_p.h b/src/compositor/hardware_integration/aurorawlhwintegration_p.h index 809c8a6c0..cb139e109 100644 --- a/src/compositor/hardware_integration/aurorawlhwintegration_p.h +++ b/src/compositor/hardware_integration/aurorawlhwintegration_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2020 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef QWLHWINTEGRATION_P_H -#define QWLHWINTEGRATION_P_H +#pragma once // // W A R N I N G @@ -50,4 +49,3 @@ class HardwareIntegration : public WaylandCompositorExtensionTemplate #include @@ -101,4 +100,3 @@ PluginInterface *auroraLoadPlugin(const FactoryLoader *loader, const QString &ke } // namespace Aurora -#endif // AURORA_COMPOSITOR_FACTORYLOADER_P_H diff --git a/src/compositor/utils/auroraunixutils_p.h b/src/compositor/utils/auroraunixutils_p.h index cf5f876fe..d403f04ad 100644 --- a/src/compositor/utils/auroraunixutils_p.h +++ b/src/compositor/utils/auroraunixutils_p.h @@ -38,8 +38,7 @@ ** ****************************************************************************/ -#ifndef AURORA_COMPOSITOR_UNIXUTILS_P_H -#define AURORA_COMPOSITOR_UNIXUTILS_P_H +#pragma once // // W A R N I N G @@ -69,4 +68,3 @@ static inline qint64 aurora_safe_read(int fd, void *data, qint64 maxlen) return ret; } -#endif // AURORA_COMPOSITOR_UNIXUTILS_P_H diff --git a/src/compositor/wayland_wrapper/aurorawlbuffermanager_p.h b/src/compositor/wayland_wrapper/aurorawlbuffermanager_p.h index e6f9bcfe4..bf4b4a6ab 100644 --- a/src/compositor/wayland_wrapper/aurorawlbuffermanager_p.h +++ b/src/compositor/wayland_wrapper/aurorawlbuffermanager_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef QWLBUFFERMANAGER_H -#define QWLBUFFERMANAGER_H +#pragma once // // W A R N I N G @@ -47,4 +46,3 @@ class LIRIAURORACOMPOSITOR_EXPORT BufferManager : public QObject } // namespace Aurora -#endif // QWLBUFFERMANAGER_H diff --git a/src/compositor/wayland_wrapper/aurorawlclientbuffer_p.h b/src/compositor/wayland_wrapper/aurorawlclientbuffer_p.h index 2d82792a0..f44f37c8a 100644 --- a/src/compositor/wayland_wrapper/aurorawlclientbuffer_p.h +++ b/src/compositor/wayland_wrapper/aurorawlclientbuffer_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2019 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef QWLCLIENTBUFFER_P_H -#define QWLCLIENTBUFFER_P_H +#pragma once // // W A R N I N G @@ -119,4 +118,3 @@ class LIRIAURORACOMPOSITOR_EXPORT SharedMemoryBuffer : public ClientBuffer } // namespace Aurora -#endif // QWLCLIENTBUFFER_P_H diff --git a/src/compositor/wayland_wrapper/aurorawldatadevice_p.h b/src/compositor/wayland_wrapper/aurorawldatadevice_p.h index 536d573c1..76197a20a 100644 --- a/src/compositor/wayland_wrapper/aurorawldatadevice_p.h +++ b/src/compositor/wayland_wrapper/aurorawldatadevice_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef WLDATADEVICE_H -#define WLDATADEVICE_H +#pragma once // // W A R N I N G @@ -74,4 +73,3 @@ class DataDevice : public PrivateServer::wl_data_device } // namespace Aurora -#endif // WLDATADEVICE_H diff --git a/src/compositor/wayland_wrapper/aurorawldatadevicemanager_p.h b/src/compositor/wayland_wrapper/aurorawldatadevicemanager_p.h index e120174b3..44830835e 100644 --- a/src/compositor/wayland_wrapper/aurorawldatadevicemanager_p.h +++ b/src/compositor/wayland_wrapper/aurorawldatadevicemanager_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef WLDATADEVICEMANAGER_H -#define WLDATADEVICEMANAGER_H +#pragma once // // W A R N I N G @@ -98,4 +97,3 @@ private Q_SLOTS: } // namespace Aurora -#endif // WLDATADEVICEMANAGER_H diff --git a/src/compositor/wayland_wrapper/aurorawldataoffer_p.h b/src/compositor/wayland_wrapper/aurorawldataoffer_p.h index dc93ad681..ca7018a0b 100644 --- a/src/compositor/wayland_wrapper/aurorawldataoffer_p.h +++ b/src/compositor/wayland_wrapper/aurorawldataoffer_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef WLDATAOFFER_H -#define WLDATAOFFER_H +#pragma once // // W A R N I N G @@ -49,4 +48,3 @@ class DataOffer : public PrivateServer::wl_data_offer } // namespace Aurora -#endif // WLDATAOFFER_H diff --git a/src/compositor/wayland_wrapper/aurorawldatasource_p.h b/src/compositor/wayland_wrapper/aurorawldatasource_p.h index 5b1bc38ef..11af8eaf9 100644 --- a/src/compositor/wayland_wrapper/aurorawldatasource_p.h +++ b/src/compositor/wayland_wrapper/aurorawldatasource_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef WLDATASOURCE_H -#define WLDATASOURCE_H +#pragma once // // W A R N I N G @@ -65,4 +64,3 @@ class DataSource : public QObject, public PrivateServer::wl_data_source } // namespace Aurora -#endif // WLDATASOURCE_H diff --git a/src/compositor/wayland_wrapper/aurorawlregion_p.h b/src/compositor/wayland_wrapper/aurorawlregion_p.h index 19cd4e0fc..1512c9eed 100644 --- a/src/compositor/wayland_wrapper/aurorawlregion_p.h +++ b/src/compositor/wayland_wrapper/aurorawlregion_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2019 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef WL_REGION_H -#define WL_REGION_H +#pragma once // // W A R N I N G @@ -58,5 +57,4 @@ class LIRIAURORACOMPOSITOR_EXPORT Region : public PrivateServer::wl_region } // namespace Aurora -#endif // WL_REGION_H diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h b/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h index 329aeea42..7d8e827e6 100644 --- a/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h +++ b/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef BRCMBUFFER_H -#define BRCMBUFFER_H +#pragma once #include #include @@ -45,4 +44,3 @@ class BrcmBuffer : public PrivateServer::wl_buffer } // namespace Aurora -#endif // BRCMBUFFER_H diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h index 753835e5f..3e6f5489c 100644 --- a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h +++ b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef BRCMEGLINTEGRATION_H -#define BRCMEGLINTEGRATION_H +#pragma once #include #include "aurora-server-brcm.h" @@ -54,5 +53,4 @@ class BrcmEglClientBuffer : public Internal::ClientBuffer } // namespace Aurora -#endif // BRCMEGLINTEGRATION_H diff --git a/src/hardwareintegration/compositor/dmabuf-server/dmabufserverbufferintegration.h b/src/hardwareintegration/compositor/dmabuf-server/dmabufserverbufferintegration.h index f7b5336eb..3ad8477b1 100644 --- a/src/hardwareintegration/compositor/dmabuf-server/dmabufserverbufferintegration.h +++ b/src/hardwareintegration/compositor/dmabuf-server/dmabufserverbufferintegration.h @@ -1,8 +1,7 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef DMABUFSERVERBUFFERINTEGRATION_H -#define DMABUFSERVERBUFFERINTEGRATION_H +#pragma once #include #include @@ -161,4 +160,3 @@ void DmaBufServerBufferIntegration::glEGLImageTargetTexture2DOES(GLenum target, } // namespace Aurora -#endif diff --git a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h index 96fe91ab0..9f933c607 100644 --- a/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h +++ b/src/hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef DRMEGLSERVERBUFFERINTEGRATION_H -#define DRMEGLSERVERBUFFERINTEGRATION_H +#pragma once #include #include @@ -140,4 +139,3 @@ void DrmEglServerBufferIntegration::glEGLImageTargetTexture2DOES (GLenum target, } // namespace Aurora -#endif diff --git a/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h b/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h index 766a09c6d..356c89352 100644 --- a/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h +++ b/src/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h @@ -1,8 +1,7 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef VSP2HARDWARELAYERINTEGRATION_H -#define VSP2HARDWARELAYERINTEGRATION_H +#pragma once #include #include @@ -87,4 +86,3 @@ public slots: } // namespace Aurora -#endif // VSP2HARDWARELAYERINTEGRATION_H diff --git a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h index 77829f85e..e16830824 100644 --- a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h +++ b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 Jolla Ltd, author: // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef LIBHYBRISEGLSERVERBUFFERINTEGRATION_H -#define LIBHYBRISEGLSERVERBUFFERINTEGRATION_H +#pragma once #include @@ -153,4 +152,3 @@ void LibHybrisEglServerBufferIntegration::eglHybrisSerializeNativeBuffer(EGLClie } // namespace Aurora -#endif diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h index 7ec00371a..24dde35e3 100644 --- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h +++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h @@ -1,8 +1,7 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef LINUXDMABUF_H -#define LINUXDMABUF_H +#pragma once #include "aurora-server-linux-dmabuf-unstable-v1.h" @@ -153,4 +152,3 @@ class LinuxDmabufWlBuffer : public PrivateServer::wl_buffer } // namespace Aurora -#endif // LINUXDMABUF_H diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.h b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.h index 1eca4f230..3f46a3610 100644 --- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.h +++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.h @@ -1,8 +1,7 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef LINUXDMABUFCLIENTBUFFERINTEGRATION_H -#define LINUXDMABUFCLIENTBUFFERINTEGRATION_H +#pragma once #include "linuxdmabuf.h" @@ -115,4 +114,3 @@ class LinuxDmabufClientBuffer : public Internal::ClientBuffer } // namespace Aurora -#endif // LINUXDMABUFCLIENTBUFFERINTEGRATION_H diff --git a/src/hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.h b/src/hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.h index c972bdd89..8d8d961e6 100644 --- a/src/hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.h +++ b/src/hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef SHMSERVERBUFFERINTEGRATION_H -#define SHMSERVERBUFFERINTEGRATION_H +#pragma once #include @@ -66,4 +65,3 @@ class ShmServerBufferIntegration : } // namespace Aurora -#endif diff --git a/src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.h b/src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.h index 7668332c4..233e902f0 100644 --- a/src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.h +++ b/src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.h @@ -1,8 +1,7 @@ // Copyright (C) 2019 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef VULKANSERVERBUFFERINTEGRATION_H -#define VULKANSERVERBUFFERINTEGRATION_H +#pragma once #include @@ -77,4 +76,3 @@ class VulkanServerBufferIntegration : } // namespace Aurora -#endif diff --git a/src/hardwareintegration/compositor/vulkan-server/vulkanwrapper.h b/src/hardwareintegration/compositor/vulkan-server/vulkanwrapper.h index 05b7c09ce..6a3a04a3c 100644 --- a/src/hardwareintegration/compositor/vulkan-server/vulkanwrapper.h +++ b/src/hardwareintegration/compositor/vulkan-server/vulkanwrapper.h @@ -1,8 +1,7 @@ // Copyright (C) 2019 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef VULKANWRAPPER_H -#define VULKANWRAPPER_H +#pragma once #include @@ -35,4 +34,3 @@ class VulkanWrapper } // namespace Aurora -#endif // VULKANWRAPPER_H diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration_p.h b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration_p.h index ae593f059..ccdc44387 100644 --- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration_p.h +++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration_p.h @@ -12,8 +12,7 @@ // We mean it. // -#ifndef WAYLANDEGLINTEGRATION_H -#define WAYLANDEGLINTEGRATION_H +#pragma once #include #include @@ -70,4 +69,3 @@ class LIRIAURORACOMPOSITOR_EXPORT WaylandEglClientBuffer : public Internal::Clie } // namespace Aurora -#endif // WAYLANDEGLINTEGRATION_H diff --git a/src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamcontroller.h b/src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamcontroller.h index 895f3e04e..f4c7c7844 100644 --- a/src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamcontroller.h +++ b/src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamcontroller.h @@ -1,8 +1,7 @@ // Copyright (C) 2019 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef WAYLANDEGLSTREAMCONTROLLER_H -#define WAYLANDEGLSTREAMCONTROLLER_H +#pragma once #include "aurora-server-wl-eglstream-controller.h" @@ -48,4 +47,3 @@ class WaylandEglStreamController : public PrivateServer::wl_eglstream_controller } // namespace Aurora -#endif // WAYLANDEGLSTREAMCONTROLLER_H diff --git a/src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.h b/src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.h index 25db03514..f67665e65 100644 --- a/src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.h +++ b/src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.h @@ -1,7 +1,6 @@ // Copyright (C) 2019 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#ifndef WAYLANDEGLSTREAMINTEGRATION_H -#define WAYLANDEGLSTREAMINTEGRATION_H +#pragma once #include #include @@ -58,4 +57,3 @@ class WaylandEglStreamClientBuffer : public Internal::ClientBuffer } // namespace Aurora -#endif // WAYLANDEGLSTREAMINTEGRATION_H diff --git a/src/imports/compositor-extensions/xwayland/sigwatch.h b/src/imports/compositor-extensions/xwayland/sigwatch.h index 135fd668c..af29b1e83 100644 --- a/src/imports/compositor-extensions/xwayland/sigwatch.h +++ b/src/imports/compositor-extensions/xwayland/sigwatch.h @@ -22,8 +22,7 @@ * SOFTWARE. */ -#ifndef SIGWATCH_H -#define SIGWATCH_H +#pragma once #include #include @@ -56,4 +55,3 @@ class UnixSignalWatcher : public QObject Q_PRIVATE_SLOT(d_func(), void _q_onNotify(int)) }; -#endif // SIGWATCH_H diff --git a/src/imports/compositor-extensions/xwayland/sizehints.h b/src/imports/compositor-extensions/xwayland/sizehints.h index 5ad60defd..414c333d5 100644 --- a/src/imports/compositor-extensions/xwayland/sizehints.h +++ b/src/imports/compositor-extensions/xwayland/sizehints.h @@ -46,8 +46,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef XWAYLAND_SIZEHINTS_H -#define XWAYLAND_SIZEHINTS_H +#pragma once /* * WmSizeHints @@ -132,5 +131,4 @@ struct MotifWmHints { #define _NET_WM_MOVERESIZE_MOVE_KEYBOARD 10 /* move via keyboard */ #define _NET_WM_MOVERESIZE_CANCEL 11 /* cancel operation */ -#endif // XWAYLAND_SIZEHINTS_H diff --git a/src/imports/compositor-extensions/xwayland/xcbatom.h b/src/imports/compositor-extensions/xwayland/xcbatom.h index 88ff0f2d4..798f9595d 100644 --- a/src/imports/compositor-extensions/xwayland/xcbatom.h +++ b/src/imports/compositor-extensions/xwayland/xcbatom.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef XCB_ATOM_H -#define XCB_ATOM_H +#pragma once #include @@ -59,4 +58,3 @@ class Atom } // namespace Xcb -#endif // XCB_ATOM_H diff --git a/src/imports/compositor-extensions/xwayland/xcbatoms.h b/src/imports/compositor-extensions/xwayland/xcbatoms.h index ef02c991f..824b8f776 100644 --- a/src/imports/compositor-extensions/xwayland/xcbatoms.h +++ b/src/imports/compositor-extensions/xwayland/xcbatoms.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef XCB_ATOMS_H -#define XCB_ATOMS_H +#pragma once #include "xcbatom.h" @@ -100,4 +99,3 @@ class Atoms } // namespace Xcb -#endif // XCB_ATOMS_H diff --git a/src/imports/compositor-extensions/xwayland/xcbcursors.h b/src/imports/compositor-extensions/xwayland/xcbcursors.h index b660a609b..ec37769c0 100644 --- a/src/imports/compositor-extensions/xwayland/xcbcursors.h +++ b/src/imports/compositor-extensions/xwayland/xcbcursors.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef XCB_CURSORS_H -#define XCB_CURSORS_H +#pragma once #include @@ -37,4 +36,3 @@ void destroyCursors(xcb_cursor_t *c); } // namespace Xcb -#endif // XCB_CURSORS_H diff --git a/src/imports/compositor-extensions/xwayland/xcbproperties.h b/src/imports/compositor-extensions/xwayland/xcbproperties.h index a0a3a6b15..d00fbe419 100644 --- a/src/imports/compositor-extensions/xwayland/xcbproperties.h +++ b/src/imports/compositor-extensions/xwayland/xcbproperties.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef XCB_PROPERTIES_H -#define XCB_PROPERTIES_H +#pragma once #include @@ -40,4 +39,3 @@ void readAndDumpProperty(xcb_atom_t atom, xcb_window_t window); } // namespace Xcb -#endif // XCB_PROPERTIES_H diff --git a/src/imports/compositor-extensions/xwayland/xcbresources.h b/src/imports/compositor-extensions/xwayland/xcbresources.h index 5d4808a3f..14aa3b7ee 100644 --- a/src/imports/compositor-extensions/xwayland/xcbresources.h +++ b/src/imports/compositor-extensions/xwayland/xcbresources.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef XCB_RESOURCES_H -#define XCB_RESOURCES_H +#pragma once #include "xcbatoms.h" @@ -44,4 +43,3 @@ class Resources } // namespace Xcb -#endif // XCB_RESOURCES_H diff --git a/src/imports/compositor-extensions/xwayland/xcbwindow.h b/src/imports/compositor-extensions/xwayland/xcbwindow.h index cf28d8fa0..b77086879 100644 --- a/src/imports/compositor-extensions/xwayland/xcbwindow.h +++ b/src/imports/compositor-extensions/xwayland/xcbwindow.h @@ -25,8 +25,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef XCB_WINDOW_H -#define XCB_WINDOW_H +#pragma once #include @@ -172,4 +171,3 @@ class Window } // namespace Xcb -#endif // XCB_WINDOW_H diff --git a/src/imports/compositor-extensions/xwayland/xcbwrapper.h b/src/imports/compositor-extensions/xwayland/xcbwrapper.h index 442c00ba2..092ffb7b4 100644 --- a/src/imports/compositor-extensions/xwayland/xcbwrapper.h +++ b/src/imports/compositor-extensions/xwayland/xcbwrapper.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef XCB_WRAPPER_H -#define XCB_WRAPPER_H +#pragma once #include @@ -45,4 +44,3 @@ bool isOurResource(quint32 id); } // namespace Xcb -#endif // XCB_WRAPPER_H diff --git a/src/imports/compositor-extensions/xwayland/xwayland.h b/src/imports/compositor-extensions/xwayland/xwayland.h index 709cefc22..d76f822b0 100644 --- a/src/imports/compositor-extensions/xwayland/xwayland.h +++ b/src/imports/compositor-extensions/xwayland/xwayland.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef XWAYLAND_H -#define XWAYLAND_H +#pragma once #include #include @@ -98,4 +97,3 @@ private Q_SLOTS: } // namespace Aurora -#endif // XWAYLAND_H diff --git a/src/imports/compositor-extensions/xwayland/xwaylandmanager.h b/src/imports/compositor-extensions/xwayland/xwaylandmanager.h index 4f8f60daf..97e4ded79 100644 --- a/src/imports/compositor-extensions/xwayland/xwaylandmanager.h +++ b/src/imports/compositor-extensions/xwayland/xwaylandmanager.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef XWAYLANDMANAGER_H -#define XWAYLANDMANAGER_H +#pragma once #include #include @@ -151,4 +150,3 @@ private Q_SLOTS: } // namespace Aurora -#endif // XWAYLANDMANAGER_H diff --git a/src/imports/compositor-extensions/xwayland/xwaylandquickshellintegration.h b/src/imports/compositor-extensions/xwayland/xwaylandquickshellintegration.h index c896a846f..5e0933907 100644 --- a/src/imports/compositor-extensions/xwayland/xwaylandquickshellintegration.h +++ b/src/imports/compositor-extensions/xwayland/xwaylandquickshellintegration.h @@ -31,8 +31,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef XWAYLANDQUICKSHELLINTEGRATION_H -#define XWAYLANDQUICKSHELLINTEGRATION_H +#pragma once #include #include @@ -89,4 +88,3 @@ private Q_SLOTS: } // namespace Aurora -#endif // XWAYLANDQUICKSHELLINTEGRATION_H diff --git a/src/imports/compositor-extensions/xwayland/xwaylandquickshellsurfaceitem.h b/src/imports/compositor-extensions/xwayland/xwaylandquickshellsurfaceitem.h index 1137b2ed4..a73410250 100644 --- a/src/imports/compositor-extensions/xwayland/xwaylandquickshellsurfaceitem.h +++ b/src/imports/compositor-extensions/xwayland/xwaylandquickshellsurfaceitem.h @@ -31,8 +31,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef XWAYLANDQUICKSHELLSURFACEITEM_H -#define XWAYLANDQUICKSHELLSURFACEITEM_H +#pragma once #include @@ -77,4 +76,3 @@ class XWaylandQuickShellSurfaceItem : public WaylandQuickItem } // namespace Aurora -#endif // XWAYLANDQUICKSHELLSURFACEITEM_H diff --git a/src/imports/compositor-extensions/xwayland/xwaylandserver.h b/src/imports/compositor-extensions/xwayland/xwaylandserver.h index 3c4cad2a2..ee1a4421f 100644 --- a/src/imports/compositor-extensions/xwayland/xwaylandserver.h +++ b/src/imports/compositor-extensions/xwayland/xwaylandserver.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef XWAYLANDSERVER_H -#define XWAYLANDSERVER_H +#pragma once #include #include @@ -85,4 +84,3 @@ private Q_SLOTS: } // namespace Aurora -#endif // XWAYLANDSERVER_H diff --git a/src/imports/compositor-extensions/xwayland/xwaylandshellsurface.h b/src/imports/compositor-extensions/xwayland/xwaylandshellsurface.h index 4333246bb..3938f8bb1 100644 --- a/src/imports/compositor-extensions/xwayland/xwaylandshellsurface.h +++ b/src/imports/compositor-extensions/xwayland/xwaylandshellsurface.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef XWAYLANDWINDOW_H -#define XWAYLANDWINDOW_H +#pragma once #include #include @@ -247,4 +246,3 @@ private Q_SLOTS: } // namespace Aurora -#endif // XWAYLANDWINDOW_H diff --git a/src/platformheaders/lirieglfsfunctions.h b/src/platformheaders/lirieglfsfunctions.h index 5d1612e41..957c25050 100644 --- a/src/platformheaders/lirieglfsfunctions.h +++ b/src/platformheaders/lirieglfsfunctions.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef LIRIELGFSFUNCTIONS_H -#define LIRIELGFSFUNCTIONS_H +#pragma once #include #include @@ -138,4 +137,3 @@ class LIRIAURORAPLATFORMHEADERS_EXPORT ScreenCastReadyEvent : public QEvent } // namespace Aurora -#endif // LIRIEGLFSFUNCTIONS_H diff --git a/src/platformheaders/liriplatformheadersglobal.h b/src/platformheaders/liriplatformheadersglobal.h index 94bc9cc83..732af5b6f 100644 --- a/src/platformheaders/liriplatformheadersglobal.h +++ b/src/platformheaders/liriplatformheadersglobal.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef LIRIPLATFORMHEADERSGLOBAL_H -#define LIRIPLATFORMHEADERSGLOBAL_H +#pragma once #include @@ -33,4 +32,3 @@ #endif #define LIRIPLATFORMHEADERS_NO_EXPORT Q_DECL_HIDDEN -#endif // LIRIPLATFORMHEADERSGLOBAL_H diff --git a/src/platformsupport/edid/auroraedidparser_p.h b/src/platformsupport/edid/auroraedidparser_p.h index 57dc0a7fb..4b86fdbad 100644 --- a/src/platformsupport/edid/auroraedidparser_p.h +++ b/src/platformsupport/edid/auroraedidparser_p.h @@ -2,8 +2,7 @@ // Copyright (C) 2021 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#ifndef AURORA_EDIDPARSER_P_H -#define AURORA_EDIDPARSER_P_H +#pragma once #include #include @@ -58,4 +57,3 @@ class LIRIAURORAEDIDSUPPORT_EXPORT EdidParser } // namespace Aurora -#endif // AURORA_EDIDPARSER_P_H diff --git a/src/platformsupport/edid/auroraedidvendortable_p.h b/src/platformsupport/edid/auroraedidvendortable_p.h index 4be53b3a0..f7696786c 100644 --- a/src/platformsupport/edid/auroraedidvendortable_p.h +++ b/src/platformsupport/edid/auroraedidvendortable_p.h @@ -8,8 +8,7 @@ * src/platformsupport/edid/qedidvendortable.py script and regenerate this file. */ -#ifndef AURORA_EDIDVENDORTABLE_P_H -#define AURORA_EDIDVENDORTABLE_P_H +#pragma once // // W A R N I N G @@ -2506,4 +2505,3 @@ static const VendorTable s_edidVendorTable[] = { } // namespace Aurora -#endif // AURORA_EDIDVENDORTABLE_P_H diff --git a/src/platformsupport/kmsconvenience/aurorakmsdevice_p.h b/src/platformsupport/kmsconvenience/aurorakmsdevice_p.h index f1226bc13..dc3cc15ad 100644 --- a/src/platformsupport/kmsconvenience/aurorakmsdevice_p.h +++ b/src/platformsupport/kmsconvenience/aurorakmsdevice_p.h @@ -39,8 +39,7 @@ ** ****************************************************************************/ -#ifndef QKMSDEVICE_P_H -#define QKMSDEVICE_P_H +#pragma once // // W A R N I N G @@ -304,4 +303,3 @@ class KmsDevice } // namespace Aurora -#endif diff --git a/src/platformsupport/libinput/libinputgesture.h b/src/platformsupport/libinput/libinputgesture.h index 84fd17dcc..e9fa36ac5 100644 --- a/src/platformsupport/libinput/libinputgesture.h +++ b/src/platformsupport/libinput/libinputgesture.h @@ -24,8 +24,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef LIRI_LIBINPUTGESTURE_H -#define LIRI_LIBINPUTGESTURE_H +#pragma once #include @@ -55,4 +54,3 @@ class LIRIAURORALIBINPUT_EXPORT LibInputGesture } // namespace Aurora -#endif // LIRI_LIBINPUTGESTURE_H diff --git a/src/platformsupport/libinput/libinputhandler.h b/src/platformsupport/libinput/libinputhandler.h index 34a3a5398..63e368c13 100644 --- a/src/platformsupport/libinput/libinputhandler.h +++ b/src/platformsupport/libinput/libinputhandler.h @@ -24,8 +24,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef LIRI_LIBINPUTHANDLER_H -#define LIRI_LIBINPUTHANDLER_H +#pragma once #include #include @@ -144,4 +143,3 @@ Q_DECLARE_METATYPE(Aurora::PlatformSupport::LibInputKeyEvent) Q_DECLARE_METATYPE(Aurora::PlatformSupport::LibInputMouseEvent) Q_DECLARE_METATYPE(Aurora::PlatformSupport::LibInputTouchEvent) -#endif // LIRI_LIBINPUTHANDLER_H diff --git a/src/platformsupport/libinput/libinputhandler_p.h b/src/platformsupport/libinput/libinputhandler_p.h index 189a70499..fb9dc2184 100644 --- a/src/platformsupport/libinput/libinputhandler_p.h +++ b/src/platformsupport/libinput/libinputhandler_p.h @@ -24,8 +24,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef LIRI_LIBINPUTHANDLER_P_H -#define LIRI_LIBINPUTHANDLER_P_H +#pragma once #include #include @@ -109,4 +108,3 @@ class LIRIAURORALIBINPUT_EXPORT LibInputHandlerPrivate } // namespace Aurora -#endif // LIRI_LIBINPUTHANDLER_P_H diff --git a/src/platformsupport/libinput/libinputkeyboard.h b/src/platformsupport/libinput/libinputkeyboard.h index 43353450e..ce4dc8734 100644 --- a/src/platformsupport/libinput/libinputkeyboard.h +++ b/src/platformsupport/libinput/libinputkeyboard.h @@ -30,8 +30,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef LIRI_LIBINPUTKEYBOARD_H -#define LIRI_LIBINPUTKEYBOARD_H +#pragma once #include @@ -67,4 +66,3 @@ private Q_SLOTS: } // namespace Aurora -#endif // LIRI_LIBINPUTKEYBOARD_H diff --git a/src/platformsupport/libinput/libinputkeyboard_p.h b/src/platformsupport/libinput/libinputkeyboard_p.h index 42024c8c3..30d630798 100644 --- a/src/platformsupport/libinput/libinputkeyboard_p.h +++ b/src/platformsupport/libinput/libinputkeyboard_p.h @@ -31,8 +31,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef LIRI_LIBINPUTKEYBOARD_P_H -#define LIRI_LIBINPUTKEYBOARD_P_H +#pragma once #include "libinputhandler.h" #include "libinputkeyboard.h" @@ -89,4 +88,3 @@ class LIRIAURORALIBINPUT_EXPORT LibInputKeyboardPrivate } // namespace Aurora -#endif // LIRI_LIBINPUTKEYBOARD_P_H diff --git a/src/platformsupport/libinput/libinputpointer.h b/src/platformsupport/libinput/libinputpointer.h index 96b0e099d..e44498bdf 100644 --- a/src/platformsupport/libinput/libinputpointer.h +++ b/src/platformsupport/libinput/libinputpointer.h @@ -30,8 +30,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef LIRI_LIBINPUTPOINTER_H -#define LIRI_LIBINPUTPOINTER_H +#pragma once #include @@ -69,4 +68,3 @@ class LIRIAURORALIBINPUT_EXPORT LibInputPointer } // namespace Aurora -#endif // LIRI_LIBINPUTPOINTER_H diff --git a/src/platformsupport/libinput/libinputtouch.h b/src/platformsupport/libinput/libinputtouch.h index 8d36d72de..b77bfadf1 100644 --- a/src/platformsupport/libinput/libinputtouch.h +++ b/src/platformsupport/libinput/libinputtouch.h @@ -30,8 +30,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef LIRI_LIBINPUTTOUCH_H -#define LIRI_LIBINPUTTOUCH_H +#pragma once #include #include @@ -72,4 +71,3 @@ class LIRIAURORALIBINPUT_EXPORT LibInputTouch } // namespace Aurora -#endif // LIRI_LIBINPUTTOUCH_H diff --git a/src/platformsupport/libinput/lirilibinputglobal.h b/src/platformsupport/libinput/lirilibinputglobal.h index feb5ecf56..cb39cbabb 100644 --- a/src/platformsupport/libinput/lirilibinputglobal.h +++ b/src/platformsupport/libinput/lirilibinputglobal.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef LIRI_LIBINPUTGLOBAL_H -#define LIRI_LIBINPUTGLOBAL_H +#pragma once #include @@ -37,4 +36,3 @@ # define LIRILIBINPUT_NO_EXPORT Q_DECL_HIDDEN #endif -#endif // LIRI_LIBINPUTGLOBAL_H diff --git a/src/platformsupport/logind/logindtypes_p.h b/src/platformsupport/logind/logindtypes_p.h index 0c5d5b842..673d47f78 100644 --- a/src/platformsupport/logind/logindtypes_p.h +++ b/src/platformsupport/logind/logindtypes_p.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef LOGINDTYPES_P_H -#define LOGINDTYPES_P_H +#pragma once #include #include @@ -64,4 +63,3 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, DBusUserSession & QDBusArgument &operator<<(QDBusArgument &argument, const DBusSeat &seat); const QDBusArgument &operator>>(const QDBusArgument &argument, DBusSeat &seat); -#endif // LOGINDTYPES_P_H diff --git a/src/platformsupport/udev/qtudevglobal.h b/src/platformsupport/udev/qtudevglobal.h index 14c2477d3..82089b3b3 100644 --- a/src/platformsupport/udev/qtudevglobal.h +++ b/src/platformsupport/udev/qtudevglobal.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef QTUDEVGLOBAL_H -#define QTUDEVGLOBAL_H +#pragma once #include @@ -33,4 +32,3 @@ #endif #define QTUDEV_NO_EXPORT Q_DECL_HIDDEN -#endif // QTUDEVGLOBAL_H diff --git a/src/platformsupport/udev/udev.h b/src/platformsupport/udev/udev.h index a1e1cfddc..16b27f9af 100644 --- a/src/platformsupport/udev/udev.h +++ b/src/platformsupport/udev/udev.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef QTUDEV_H -#define QTUDEV_H +#pragma once #include @@ -56,4 +55,3 @@ class LIRIAURORAUDEV_EXPORT Udev } // namespace Aurora -#endif // QTUDEV_H diff --git a/src/platformsupport/udev/udev_p.h b/src/platformsupport/udev/udev_p.h index 7d592b8e8..3e700bff3 100644 --- a/src/platformsupport/udev/udev_p.h +++ b/src/platformsupport/udev/udev_p.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef QTUDEV_P_H -#define QTUDEV_P_H +#pragma once // // W A R N I N G @@ -66,5 +65,4 @@ class LIRIAURORAUDEV_EXPORT UdevPrivate } // namespace Aurora -#endif // QTUDEV_P_H diff --git a/src/platformsupport/udev/udevdevice.h b/src/platformsupport/udev/udevdevice.h index 506b3aa90..b129be353 100644 --- a/src/platformsupport/udev/udevdevice.h +++ b/src/platformsupport/udev/udevdevice.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef QTUDEVDEVICE_H -#define QTUDEVDEVICE_H +#pragma once #include @@ -104,4 +103,3 @@ QDebug operator<<(QDebug, const UdevDevice &); Q_DECLARE_METATYPE(Aurora::PlatformSupport::UdevDevice) -#endif // QTUDEVDEVICE_H diff --git a/src/platformsupport/udev/udevdevice_p.h b/src/platformsupport/udev/udevdevice_p.h index 0a3d3a3ff..983dc8280 100644 --- a/src/platformsupport/udev/udevdevice_p.h +++ b/src/platformsupport/udev/udevdevice_p.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef QTUDEVDEVICE_P_H -#define QTUDEVDEVICE_P_H +#pragma once // // W A R N I N G @@ -56,4 +55,3 @@ class UdevDevicePrivate } // namespace Aurora -#endif // QTUDEVDEVICE_P_H diff --git a/src/platformsupport/udev/udevenumerate.h b/src/platformsupport/udev/udevenumerate.h index 203d228a9..5df61ff25 100644 --- a/src/platformsupport/udev/udevenumerate.h +++ b/src/platformsupport/udev/udevenumerate.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef QTUDEVENUMERATE_H -#define QTUDEVENUMERATE_H +#pragma once #include @@ -49,4 +48,3 @@ class LIRIAURORAUDEV_EXPORT UdevEnumerate } // namespace Aurora -#endif // QTUDEVENUMERATE_H diff --git a/src/platformsupport/udev/udevenumerate_p.h b/src/platformsupport/udev/udevenumerate_p.h index 5474519d0..b05f792c5 100644 --- a/src/platformsupport/udev/udevenumerate_p.h +++ b/src/platformsupport/udev/udevenumerate_p.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef QTUDEVENUMERATE_P_H -#define QTUDEVENUMERATE_P_H +#pragma once // // W A R N I N G @@ -60,4 +59,3 @@ class UdevEnumeratePrivate } // namespace Aurora -#endif // UDEVENUMERATE_P_H diff --git a/src/platformsupport/udev/udevmonitor.h b/src/platformsupport/udev/udevmonitor.h index 6081152f1..111458971 100644 --- a/src/platformsupport/udev/udevmonitor.h +++ b/src/platformsupport/udev/udevmonitor.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef QTUDEVMONITOR_H -#define QTUDEVMONITOR_H +#pragma once #include @@ -66,4 +65,3 @@ class LIRIAURORAUDEV_EXPORT UdevMonitor : public QObject } // namespace Aurora -#endif // QTUDEVMONITOR_H diff --git a/src/platformsupport/udev/udevmonitor_p.h b/src/platformsupport/udev/udevmonitor_p.h index 7830c8be9..c72b0e6b0 100644 --- a/src/platformsupport/udev/udevmonitor_p.h +++ b/src/platformsupport/udev/udevmonitor_p.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef QTUDEVMONITOR_P_H -#define QTUDEVMONITOR_P_H +#pragma once // // W A R N I N G @@ -61,4 +60,3 @@ class UdevMonitorPrivate } // namespace Aurora -#endif // QTUDEVMONITOR_P_H diff --git a/src/platformsupport/xkbcommon/auroraxkbcommon_p.h b/src/platformsupport/xkbcommon/auroraxkbcommon_p.h index 05f143b40..af592ef77 100644 --- a/src/platformsupport/xkbcommon/auroraxkbcommon_p.h +++ b/src/platformsupport/xkbcommon/auroraxkbcommon_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2020 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#ifndef AURORA_XKBCOMMON_P_H -#define AURORA_XKBCOMMON_P_H +#pragma once // // W A R N I N G @@ -91,4 +90,3 @@ class LIRIAURORAXKBCOMMONSUPPORT_EXPORT XkbCommon } // namespace Aurora -#endif // AURORA_XKBCOMMON_P_H diff --git a/src/plugins/platforms/eglfs/api/libinputmanager_p.h b/src/plugins/platforms/eglfs/api/libinputmanager_p.h index 9a56cf1a4..e9d1733d9 100644 --- a/src/plugins/platforms/eglfs/api/libinputmanager_p.h +++ b/src/plugins/platforms/eglfs/api/libinputmanager_p.h @@ -21,8 +21,7 @@ * $END_LICENSE$ ***************************************************************************/ -#ifndef LIRI_LIBINPUTMANAGER_P_H -#define LIRI_LIBINPUTMANAGER_P_H +#pragma once #include @@ -59,4 +58,3 @@ class LibInputManager : public QObject } // namespace Aurora -#endif // LIRI_LIBINPUTMANAGER_P_H diff --git a/src/plugins/platforms/eglfs/api/qeglfscontext_p.h b/src/plugins/platforms/eglfs/api/qeglfscontext_p.h index 0bd6abe08..3467a98f1 100644 --- a/src/plugins/platforms/eglfs/api/qeglfscontext_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfscontext_p.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSCONTEXT_H -#define QEGLFSCONTEXT_H +#pragma once // // W A R N I N G @@ -77,4 +76,3 @@ class Q_EGLFS_EXPORT QEglFSContext : public QEGLPlatformContext QT_END_NAMESPACE -#endif // QEGLFSCONTEXT_H diff --git a/src/plugins/platforms/eglfs/api/qeglfscursor_p.h b/src/plugins/platforms/eglfs/api/qeglfscursor_p.h index af1292335..01a4011a2 100644 --- a/src/plugins/platforms/eglfs/api/qeglfscursor_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfscursor_p.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSCURSOR_H -#define QEGLFSCURSOR_H +#pragma once // // W A R N I N G @@ -164,4 +163,3 @@ class Q_EGLFS_EXPORT QEglFSCursor : public QPlatformCursor QT_END_NAMESPACE -#endif // QEGLFSCURSOR_H diff --git a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h index 3065a7f06..055a261d4 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSDEVICEINTEGRATION_H -#define QEGLFSDEVICEINTEGRATION_H +#pragma once // // W A R N I N G @@ -136,4 +135,3 @@ class Q_EGLFS_EXPORT QEglFSDeviceIntegrationFactory QT_END_NAMESPACE -#endif // QEGLDEVICEINTEGRATION_H diff --git a/src/plugins/platforms/eglfs/api/qeglfsglobal_p.h b/src/plugins/platforms/eglfs/api/qeglfsglobal_p.h index 10c25900c..6212e7d63 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsglobal_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfsglobal_p.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSGLOBAL_H -#define QEGLFSGLOBAL_H +#pragma once // // W A R N I N G @@ -77,4 +76,3 @@ QT_BEGIN_NAMESPACE QT_END_NAMESPACE -#endif diff --git a/src/plugins/platforms/eglfs/api/qeglfshooks_p.h b/src/plugins/platforms/eglfs/api/qeglfshooks_p.h index c94baad0e..a7c6aaece 100644 --- a/src/plugins/platforms/eglfs/api/qeglfshooks_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfshooks_p.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSHOOKS_H -#define QEGLFSHOOKS_H +#pragma once // // W A R N I N G @@ -67,4 +66,3 @@ Q_EGLFS_EXPORT QEglFSDeviceIntegration *qt_egl_device_integration(); QT_END_NAMESPACE -#endif // QEGLFSHOOKS_H diff --git a/src/plugins/platforms/eglfs/api/qeglfsintegration_p.h b/src/plugins/platforms/eglfs/api/qeglfsintegration_p.h index ba2158027..ae5eb10e6 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsintegration_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfsintegration_p.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSINTEGRATION_H -#define QEGLFSINTEGRATION_H +#pragma once // // W A R N I N G @@ -145,4 +144,3 @@ class Q_EGLFS_EXPORT QEglFSIntegration : public QPlatformIntegration, public QPl QT_END_NAMESPACE -#endif // QEGLFSINTEGRATION_H diff --git a/src/plugins/platforms/eglfs/api/qeglfslogindhandler_p.h b/src/plugins/platforms/eglfs/api/qeglfslogindhandler_p.h index 6ec175fcf..2eff422b9 100644 --- a/src/plugins/platforms/eglfs/api/qeglfslogindhandler_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfslogindhandler_p.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSLOGINDHANDLER_P_H -#define QEGLFSLOGINDHANDLER_P_H +#pragma once // // W A R N I N G @@ -79,4 +78,3 @@ private Q_SLOTS: QT_END_NAMESPACE -#endif // QEGLFSLOGINDHANDLER_P_H diff --git a/src/plugins/platforms/eglfs/api/qeglfsoffscreenwindow_p.h b/src/plugins/platforms/eglfs/api/qeglfsoffscreenwindow_p.h index 7d36b2d6a..7264a884a 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsoffscreenwindow_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfsoffscreenwindow_p.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSOFFSCREENWINDOW_H -#define QEGLFSOFFSCREENWINDOW_H +#pragma once // // W A R N I N G @@ -74,4 +73,3 @@ class Q_EGLFS_EXPORT QEglFSOffscreenWindow : public QPlatformOffscreenSurface QT_END_NAMESPACE -#endif // QEGLFSOFFSCREENWINDOW_H diff --git a/src/plugins/platforms/eglfs/api/qeglfsscreen_p.h b/src/plugins/platforms/eglfs/api/qeglfsscreen_p.h index d83145809..caafbbcbe 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsscreen_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfsscreen_p.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSSCREEN_H -#define QEGLFSSCREEN_H +#pragma once // // W A R N I N G @@ -118,4 +117,3 @@ class Q_EGLFS_EXPORT QEglFSScreen : public QPlatformScreen QT_END_NAMESPACE -#endif // QEGLFSSCREEN_H diff --git a/src/plugins/platforms/eglfs/api/qeglfswindow_p.h b/src/plugins/platforms/eglfs/api/qeglfswindow_p.h index aefb8493a..1e886132d 100644 --- a/src/plugins/platforms/eglfs/api/qeglfswindow_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfswindow_p.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSWINDOW_H -#define QEGLFSWINDOW_H +#pragma once // // W A R N I N G @@ -141,4 +140,3 @@ class Q_EGLFS_EXPORT QEglFSWindow : public QPlatformWindow QT_END_NAMESPACE -#endif // QEGLFSWINDOW_H diff --git a/src/plugins/platforms/eglfs/api/xcursor.h b/src/plugins/platforms/eglfs/api/xcursor.h index c1ca12c1a..9fd578910 100644 --- a/src/plugins/platforms/eglfs/api/xcursor.h +++ b/src/plugins/platforms/eglfs/api/xcursor.h @@ -23,8 +23,7 @@ * SOFTWARE. */ -#ifndef XCURSOR_H -#define XCURSOR_H +#pragma once #include @@ -64,4 +63,3 @@ void xcursor_load_theme(const char *theme, int size, void (*load_callback)(XcursorImages *, void *), void *user_data); -#endif diff --git a/src/plugins/platforms/eglfs/api/xcursortheme_p.h b/src/plugins/platforms/eglfs/api/xcursortheme_p.h index 623fd2e6e..9994e2487 100644 --- a/src/plugins/platforms/eglfs/api/xcursortheme_p.h +++ b/src/plugins/platforms/eglfs/api/xcursortheme_p.h @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -#ifndef XCURSORTHEME_H -#define XCURSORTHEME_H +#pragma once #include #include @@ -50,4 +49,3 @@ class Q_EGLFS_EXPORT XcursorTheme } // namespace Liri -#endif // XCURSORTHEME_H diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h index 1bdcfb797..286d03e1a 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSKMSGBMCURSOR_H -#define QEGLFSKMSGBMCURSOR_H +#pragma once #include #include @@ -123,4 +122,3 @@ class QEglFSKmsGbmCursor : public QPlatformCursor QT_END_NAMESPACE -#endif // QEGLFSKMSGBMCURSOR_H diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.h index d15a429ab..2f6a029b0 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmdevice.h @@ -39,8 +39,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSKMSGBMDEVICE_H -#define QEGLFSKMSGBMDEVICE_H +#pragma once #include @@ -86,4 +85,3 @@ class QEglFSKmsGbmDevice: public QEglFSKmsDevice QT_END_NAMESPACE -#endif // QEGLFSKMSGBMDEVICE_H diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h index 915d0815b..b4ce8733f 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h @@ -39,8 +39,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSKMSGBMINTEGRATION_H -#define QEGLFSKMSGBMINTEGRATION_H +#pragma once #include #include @@ -89,4 +88,3 @@ class QEglFSKmsGbmIntegration : public QEglFSKmsIntegration QT_END_NAMESPACE -#endif // QEGLFSKMSGBMINTEGRATION_H diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.h index 1ef2a3943..6885d70c3 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.h @@ -39,8 +39,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSKMSGBMSCREEN_H -#define QEGLFSKMSGBMSCREEN_H +#pragma once #include #include @@ -111,4 +110,3 @@ class QEglFSKmsGbmScreen : public QEglFSKmsScreen QT_END_NAMESPACE -#endif // QEGLFSKMSGBMSCREEN_H diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmwindow.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmwindow.h index a41295516..5d9335c11 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmwindow.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmwindow.h @@ -39,8 +39,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSKMSGBMWINDOW_H -#define QEGLFSKMSGBMWINDOW_H +#pragma once #include "private/qeglfswindow_p.h" @@ -68,4 +67,3 @@ class QEglFSKmsGbmWindow : public QEglFSWindow QT_END_NAMESPACE -#endif // QEGLFSKMSGBMWINDOW_H diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.h index 0213b36f2..7b269d280 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevice.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSKMSEGLDEVICE_H -#define QEGLFSKMSEGLDEVICE_H +#pragma once #include @@ -69,4 +68,3 @@ class QEglFSKmsEglDevice: public QEglFSKmsDevice QT_END_NAMESPACE -#endif // QEGLFSKMSEGLDEVICE_H diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.h index c4fee892b..ad9546960 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.h @@ -38,8 +38,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSKMSEGLDEVICEINTEGRATION_H -#define QEGLFSKMSEGLDEVICEINTEGRATION_H +#pragma once #include @@ -80,4 +79,3 @@ class QEglFSKmsEglDeviceIntegration : public QEglFSKmsIntegration QT_END_NAMESPACE -#endif diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.h index 6c31a5b20..38a547941 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSKMSEGLDEVICESCREEN_H -#define QEGLFSKMSEGLDEVICESCREEN_H +#pragma once #include @@ -57,4 +56,3 @@ class QEglFSKmsEglDeviceScreen : public QEglFSKmsScreen QT_END_NAMESPACE -#endif // QEGLFSKMSEGLDEVICESCREEN_H diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.h index 3ba671eb2..c5519a0c9 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.h @@ -38,8 +38,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSKMSDEVICE_H -#define QEGLFSKMSDEVICE_H +#pragma once #include @@ -68,4 +67,3 @@ class Q_EGLFS_EXPORT QEglFSKmsDevice : public KmsDevice QT_END_NAMESPACE -#endif // QEGLFSKMSDEVICE_H diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmseventreader.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmseventreader.h index 459b5398c..3b6eb13f9 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmseventreader.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmseventreader.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSKKMSEVENTREADER_H -#define QEGLFSKKMSEVENTREADER_H +#pragma once #include "qeglfsglobal_p.h" #include @@ -96,4 +95,3 @@ class Q_EGLFS_EXPORT QEglFSKmsEventReader QT_END_NAMESPACE -#endif // QEGLFSKKMSEVENTREADER_H diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmshelpers.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmshelpers.h index c9e5f04a7..347f87ca3 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmshelpers.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmshelpers.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSKMSHELPERS_H -#define QEGLFSKMSHELPERS_H +#pragma once #include @@ -57,4 +56,3 @@ inline QString q_fourccToString(uint code) QT_END_NAMESPACE -#endif // QEGLFSKMSHELPERS_H diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsintegration.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsintegration.h index 88c45290d..9e8119ab7 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsintegration.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsintegration.h @@ -39,8 +39,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSKMSINTEGRATION_H -#define QEGLFSKMSINTEGRATION_H +#pragma once #include "private/qeglfsdeviceintegration_p.h" #include @@ -88,4 +87,3 @@ class Q_EGLFS_EXPORT QEglFSKmsIntegration : public QEglFSDeviceIntegration QT_END_NAMESPACE -#endif diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h index 138d0b440..f42fad816 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h @@ -39,8 +39,7 @@ ** ****************************************************************************/ -#ifndef QEGLFSKMSSCREEN_H -#define QEGLFSKMSSCREEN_H +#pragma once #include "private/qeglfsscreen_p.h" #include @@ -126,4 +125,3 @@ class Q_EGLFS_EXPORT QEglFSKmsScreen : public QEglFSScreen QT_END_NAMESPACE -#endif diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/qeglfsx11integration.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/qeglfsx11integration.h index e083c157c..02f7424ea 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/qeglfsx11integration.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/qeglfsx11integration.h @@ -1,8 +1,7 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#ifndef QEGLFSX11INTEGRATION_H -#define QEGLFSX11INTEGRATION_H +#pragma once #include "private/qeglfsdeviceintegration_p.h" @@ -62,4 +61,3 @@ class QEglFSX11Integration : public QEglFSDeviceIntegration QT_END_NAMESPACE -#endif diff --git a/src/shared/aurorawaylandinputmethodeventbuilder_p.h b/src/shared/aurorawaylandinputmethodeventbuilder_p.h index 19f01b9bb..d4045f203 100644 --- a/src/shared/aurorawaylandinputmethodeventbuilder_p.h +++ b/src/shared/aurorawaylandinputmethodeventbuilder_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDINPUTMETHODEVENTBUILDER_H -#define AURORA_COMPOSITOR_WAYLANDINPUTMETHODEVENTBUILDER_H +#pragma once #include @@ -56,4 +55,3 @@ struct WaylandInputMethodContentType { } // namespace Aurora -#endif // AURORA_COMPOSITOR_WAYLANDINPUTMETHODEVENTBUILDER_H diff --git a/src/shared/aurorawaylandmimehelper_p.h b/src/shared/aurorawaylandmimehelper_p.h index b6dd8f4ff..eba9c6a2e 100644 --- a/src/shared/aurorawaylandmimehelper_p.h +++ b/src/shared/aurorawaylandmimehelper_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDMIMEHELPER_H -#define AURORA_COMPOSITOR_WAYLANDMIMEHELPER_H +#pragma once #include #include @@ -22,4 +21,3 @@ class WaylandMimeHelper } // namespace Aurora -#endif diff --git a/src/shared/aurorawaylandsharedmemoryformathelper_p.h b/src/shared/aurorawaylandsharedmemoryformathelper_p.h index 4a88f3ce2..2785bf450 100644 --- a/src/shared/aurorawaylandsharedmemoryformathelper_p.h +++ b/src/shared/aurorawaylandsharedmemoryformathelper_p.h @@ -1,8 +1,7 @@ // Copyright (C) 2020 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#ifndef AURORA_COMPOSITOR_WAYLANDSHAREDMEMORYFORMATHELPER_H -#define AURORA_COMPOSITOR_WAYLANDSHAREDMEMORYFORMATHELPER_H +#pragma once #include @@ -105,4 +104,3 @@ wl_shm_format WaylandSharedMemoryFormatHelper::fromQImageFormat(QImage::Format f } // namespace Aurora -#endif //QWAYLANDSHAREDMEMORYFORMATHELPER_H diff --git a/tests/auto/compositor/compositor/mockclient.h b/tests/auto/compositor/compositor/mockclient.h index 6ee9473f7..c6b485fc0 100644 --- a/tests/auto/compositor/compositor/mockclient.h +++ b/tests/auto/compositor/compositor/mockclient.h @@ -1,8 +1,7 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#ifndef MOCKCLIENT_H -#define MOCKCLIENT_H +#pragma once #include "wayland-wayland-client-protocol.h" #include @@ -123,4 +122,3 @@ private slots: } // namespace Aurora -#endif // MOCKCLIENT_H diff --git a/tests/auto/compositor/compositor/mockkeyboard.h b/tests/auto/compositor/compositor/mockkeyboard.h index 48e438a56..363149619 100644 --- a/tests/auto/compositor/compositor/mockkeyboard.h +++ b/tests/auto/compositor/compositor/mockkeyboard.h @@ -1,8 +1,7 @@ // Copyright (C) 2018 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#ifndef MOCKKEYBOARD_H -#define MOCKKEYBOARD_H +#pragma once #include #include "wayland-wayland-client-protocol.h" @@ -30,4 +29,3 @@ class MockKeyboard : public QObject } // namespace Aurora -#endif // MOCKKEYBOARD_H diff --git a/tests/auto/compositor/compositor/mockpointer.h b/tests/auto/compositor/compositor/mockpointer.h index cacc05c1a..de4a19583 100644 --- a/tests/auto/compositor/compositor/mockpointer.h +++ b/tests/auto/compositor/compositor/mockpointer.h @@ -1,8 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#ifndef MOCKPOINTER_H -#define MOCKPOINTER_H +#pragma once #include #include "wayland-wayland-client-protocol.h" @@ -27,4 +26,3 @@ class MockPointer : public QObject } // namespace Aurora -#endif // MOCKPOINTER_H diff --git a/tests/auto/compositor/compositor/mockseat.h b/tests/auto/compositor/compositor/mockseat.h index b16ee5a24..f377af7c0 100644 --- a/tests/auto/compositor/compositor/mockseat.h +++ b/tests/auto/compositor/compositor/mockseat.h @@ -26,8 +26,7 @@ ** ****************************************************************************/ -#ifndef MOCKSEAT -#define MOCKSEAT +#pragma once #include "mockpointer.h" #include "mockkeyboard.h" @@ -60,4 +59,3 @@ class MockSeat : public QObject } // namespace Aurora -#endif // MOCKSEAT_H diff --git a/tests/auto/compositor/compositor/mockxdgoutputv1.h b/tests/auto/compositor/compositor/mockxdgoutputv1.h index 8fab02ab5..2028cb554 100644 --- a/tests/auto/compositor/compositor/mockxdgoutputv1.h +++ b/tests/auto/compositor/compositor/mockxdgoutputv1.h @@ -1,8 +1,7 @@ // Copyright (C) 2019 Pier Luigi Fiorini // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#ifndef MOCKXDGOUTPUTV1_H -#define MOCKXDGOUTPUTV1_H +#pragma once #include #include @@ -44,4 +43,3 @@ class MockXdgOutputV1 : public Aurora::Client::PrivateClient::zxdg_output_v1 } // namespace Aurora -#endif // MOCKXDGOUTPUTV1_H diff --git a/tests/auto/compositor/compositor/testcompositor.h b/tests/auto/compositor/compositor/testcompositor.h index 2630c5d4d..ed3f05ae1 100644 --- a/tests/auto/compositor/compositor/testcompositor.h +++ b/tests/auto/compositor/compositor/testcompositor.h @@ -1,8 +1,7 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#ifndef TESTCOMPOSITOR_H -#define TESTCOMPOSITOR_H +#pragma once #include #include @@ -38,4 +37,3 @@ public slots: } // namespace Aurora -#endif // TESTCOMPOSITOR_H diff --git a/tests/auto/compositor/compositor/testseat.h b/tests/auto/compositor/compositor/testseat.h index 43a7e625c..e226742b4 100644 --- a/tests/auto/compositor/compositor/testseat.h +++ b/tests/auto/compositor/compositor/testseat.h @@ -1,8 +1,7 @@ // Copyright (C) 2016 LG Electronics, Inc., author: // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#ifndef TESTSEAT_H -#define TESTSEAT_H +#pragma once #include #include @@ -37,4 +36,3 @@ class TestSeat : public WaylandSeat } // namespace Aurora -#endif // TESTSEAT_H diff --git a/tests/manual/subsurface/shmwindow.h b/tests/manual/subsurface/shmwindow.h index 9d3c5ec4e..9ca095d64 100644 --- a/tests/manual/subsurface/shmwindow.h +++ b/tests/manual/subsurface/shmwindow.h @@ -1,8 +1,7 @@ // Copyright (C) 2015 LG Electronics Ltd, author: // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -#ifndef SHMWINDOW_H -#define SHMWINDOW_H +#pragma once #include @@ -20,4 +19,3 @@ class ShmWindow : public QRasterWindow int m_rotation; int m_timer; }; -#endif // SHMWINDOW_H