From c214d31c5e7aeb0bf82ecb4a9c1cd528738c8461 Mon Sep 17 00:00:00 2001 From: Ben Wiederhake Date: Sun, 18 Sep 2022 01:14:45 +0200 Subject: [PATCH] Everywhere: Fix order of includes and #pragma once --- Kernel/Arch/SafeMem.h | 4 ++-- Userland/Demos/CatDog/CatDog.h | 4 ++-- Userland/Libraries/LibC/bits/stdio_file_implementation.h | 4 ++-- Userland/Libraries/LibC/byteswap.h | 4 ++-- Userland/Libraries/LibCodeComprehension/Types.h | 4 ++-- Userland/Libraries/LibCore/UmaskScope.h | 4 ++-- Userland/Libraries/LibGPU/Config.h | 4 ++-- Userland/Services/LoginServer/LoginWindow.h | 4 ++-- Userland/Services/SpiceAgent/ConnectionToClipboardServer.h | 4 ++-- Userland/Services/SpiceAgent/SpiceAgent.h | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Kernel/Arch/SafeMem.h b/Kernel/Arch/SafeMem.h index df5be2d770..63efc585c3 100644 --- a/Kernel/Arch/SafeMem.h +++ b/Kernel/Arch/SafeMem.h @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#pragma once + #include #include #include -#pragma once - namespace Kernel { struct RegisterState; diff --git a/Userland/Demos/CatDog/CatDog.h b/Userland/Demos/CatDog/CatDog.h index 6826ec1535..87ba315ec7 100644 --- a/Userland/Demos/CatDog/CatDog.h +++ b/Userland/Demos/CatDog/CatDog.h @@ -5,6 +5,8 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#pragma once + #include #include #include @@ -15,8 +17,6 @@ #include #include -#pragma once - class CatDog final : public GUI::Widget , GUI::MouseTracker { C_OBJECT(CatDog); diff --git a/Userland/Libraries/LibC/bits/stdio_file_implementation.h b/Userland/Libraries/LibC/bits/stdio_file_implementation.h index dc37199e23..555cdcbc97 100644 --- a/Userland/Libraries/LibC/bits/stdio_file_implementation.h +++ b/Userland/Libraries/LibC/bits/stdio_file_implementation.h @@ -4,6 +4,8 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#pragma once + #include #include #include @@ -13,8 +15,6 @@ #include #include -#pragma once - struct FILE { public: FILE(int fd, int mode) diff --git a/Userland/Libraries/LibC/byteswap.h b/Userland/Libraries/LibC/byteswap.h index a94fd6f94e..139da4a271 100644 --- a/Userland/Libraries/LibC/byteswap.h +++ b/Userland/Libraries/LibC/byteswap.h @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include - #pragma once +#include + __BEGIN_DECLS #define bswap_16(x) (__builtin_bswap16(x)) diff --git a/Userland/Libraries/LibCodeComprehension/Types.h b/Userland/Libraries/LibCodeComprehension/Types.h index a1a25233cb..a8589ca35e 100644 --- a/Userland/Libraries/LibCodeComprehension/Types.h +++ b/Userland/Libraries/LibCodeComprehension/Types.h @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include - #pragma once +#include + namespace CodeComprehension { enum class Language { diff --git a/Userland/Libraries/LibCore/UmaskScope.h b/Userland/Libraries/LibCore/UmaskScope.h index f77c22956d..568aa39802 100644 --- a/Userland/Libraries/LibCore/UmaskScope.h +++ b/Userland/Libraries/LibCore/UmaskScope.h @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#pragma once + #include #include -#pragma once - namespace Core { class UmaskScope { diff --git a/Userland/Libraries/LibGPU/Config.h b/Userland/Libraries/LibGPU/Config.h index f3ab5e5c3f..30bebd41a1 100644 --- a/Userland/Libraries/LibGPU/Config.h +++ b/Userland/Libraries/LibGPU/Config.h @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include - #pragma once +#include + namespace GPU { // FIXME: These 3 types were originally introduced in LibSoftGPU and are currently needed by the device interface. diff --git a/Userland/Services/LoginServer/LoginWindow.h b/Userland/Services/LoginServer/LoginWindow.h index 6b978928d8..6b9791d5d9 100644 --- a/Userland/Services/LoginServer/LoginWindow.h +++ b/Userland/Services/LoginServer/LoginWindow.h @@ -4,14 +4,14 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#pragma once + #include #include #include #include #include -#pragma once - class LoginWindow final : public GUI::Window { C_OBJECT(LoginWindow); diff --git a/Userland/Services/SpiceAgent/ConnectionToClipboardServer.h b/Userland/Services/SpiceAgent/ConnectionToClipboardServer.h index c76e0d5ae0..d553ca7195 100644 --- a/Userland/Services/SpiceAgent/ConnectionToClipboardServer.h +++ b/Userland/Services/SpiceAgent/ConnectionToClipboardServer.h @@ -4,14 +4,14 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#pragma once + #include #include #include #include #include -#pragma once - class ConnectionToClipboardServer final : public IPC::ConnectionToServer , public ClipboardClientEndpoint { diff --git a/Userland/Services/SpiceAgent/SpiceAgent.h b/Userland/Services/SpiceAgent/SpiceAgent.h index 9ef81d7ed1..09eddda92b 100644 --- a/Userland/Services/SpiceAgent/SpiceAgent.h +++ b/Userland/Services/SpiceAgent/SpiceAgent.h @@ -4,13 +4,13 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#pragma once + #include "ConnectionToClipboardServer.h" #include #include #include -#pragma once - class SpiceAgent { public: SpiceAgent(int fd, ConnectionToClipboardServer&);