From b83cb09db194f0e18ef76f36aea3801959295f22 Mon Sep 17 00:00:00 2001 From: Ben Wiederhake Date: Mon, 2 Jan 2023 15:15:14 +0100 Subject: [PATCH] Everywhere: Fix badly-formatted includes In 7c5e30daaa615ad3a2ef55222423a747ac0a1227, the focus was "only" on Userland/Libraries/, whereas this commit cleans up the remaining headers in the repo, and any new badly-formatted include. --- AK/EnumBits.h | 2 +- AK/FlyString.h | 2 +- AK/UBSanitizer.h | 4 ++-- Tests/AK/TestVector.cpp | 2 +- .../TestLibCoreSharedSingleProducerCircularQueue.cpp | 2 +- Tests/LibRegex/Regex.cpp | 2 +- Userland/Applets/Keymap/KeymapStatusWidget.cpp | 2 +- Userland/Applications/Browser/History/HistoryModel.h | 2 +- Userland/Applications/Browser/History/HistoryWidget.h | 2 +- .../BrowserSettings/ContentFilterSettingsWidget.h | 2 +- Userland/Applications/PDFViewer/NumericInput.cpp | 2 +- Userland/Applications/PDFViewer/PDFViewerWidget.cpp | 10 +++++----- Userland/Applications/PDFViewer/PDFViewerWidget.h | 4 ++-- Userland/Applications/PDFViewer/SidebarWidget.h | 4 ++-- Userland/Applications/Piano/RollWidget.cpp | 2 +- Userland/Applications/PixelPaint/Tools/TextTool.cpp | 2 +- Userland/Applications/Presenter/PresenterWidget.cpp | 2 +- Userland/Applications/Presenter/PresenterWidget.h | 2 +- .../Applications/Spreadsheet/SpreadsheetWidget.cpp | 2 +- Userland/Applications/Spreadsheet/Workbook.cpp | 2 +- Userland/Applications/Spreadsheet/main.cpp | 2 +- Userland/DevTools/HackStudio/HackStudioWidget.h | 2 +- Userland/DevTools/HackStudio/ProjectBuilder.h | 2 +- Userland/DevTools/Profiler/FlameGraphView.cpp | 4 ++-- Userland/DevTools/UserspaceEmulator/SoftCPU.h | 2 +- Userland/Libraries/LibCore/ArgsParser.cpp | 2 +- Userland/Libraries/LibIMAP/Client.cpp | 2 +- Userland/Libraries/LibPDF/ColorSpace.h | 2 +- Userland/Libraries/LibRegex/RegexByteCode.cpp | 2 +- Userland/Services/EchoServer/Client.cpp | 2 +- Userland/Services/Taskbar/main.cpp | 2 +- .../Services/WindowServer/WMConnectionFromClient.h | 2 +- Userland/Shell/Builtin.cpp | 2 +- Userland/Utilities/fgrep.cpp | 2 +- Userland/Utilities/tar.cpp | 2 +- 35 files changed, 43 insertions(+), 43 deletions(-) diff --git a/AK/EnumBits.h b/AK/EnumBits.h index 9ee954056aa..4b8f8508f51 100644 --- a/AK/EnumBits.h +++ b/AK/EnumBits.h @@ -6,7 +6,7 @@ #pragma once -#include "AK/StdLibExtras.h" +#include // Enables bitwise operators for the specified Enum type. // diff --git a/AK/FlyString.h b/AK/FlyString.h index 5d5a1e6ed3e..74e18dbb8da 100644 --- a/AK/FlyString.h +++ b/AK/FlyString.h @@ -6,8 +6,8 @@ #pragma once -#include "AK/StringUtils.h" #include +#include namespace AK { diff --git a/AK/UBSanitizer.h b/AK/UBSanitizer.h index 2dedbacfb4a..326972e0e0c 100644 --- a/AK/UBSanitizer.h +++ b/AK/UBSanitizer.h @@ -6,9 +6,9 @@ #pragma once -#include "AK/Noncopyable.h" -#include "AK/StdLibExtras.h" #include +#include +#include #include namespace AK::UBSanitizer { diff --git a/Tests/AK/TestVector.cpp b/Tests/AK/TestVector.cpp index b7c778d746c..8444c317e65 100644 --- a/Tests/AK/TestVector.cpp +++ b/Tests/AK/TestVector.cpp @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "AK/ReverseIterator.h" #include #include #include #include +#include #include TEST_CASE(construct) diff --git a/Tests/LibCore/TestLibCoreSharedSingleProducerCircularQueue.cpp b/Tests/LibCore/TestLibCoreSharedSingleProducerCircularQueue.cpp index c691ee972ee..f022365cb69 100644 --- a/Tests/LibCore/TestLibCoreSharedSingleProducerCircularQueue.cpp +++ b/Tests/LibCore/TestLibCoreSharedSingleProducerCircularQueue.cpp @@ -4,10 +4,10 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "sched.h" #include #include #include +#include using TestQueue = Core::SharedSingleProducerCircularQueue; using QueueError = ErrorOr; diff --git a/Tests/LibRegex/Regex.cpp b/Tests/LibRegex/Regex.cpp index 7c48e74a0cb..44335aa8212 100644 --- a/Tests/LibRegex/Regex.cpp +++ b/Tests/LibRegex/Regex.cpp @@ -4,13 +4,13 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "LibRegex/RegexMatcher.h" #include // import first, to prevent warning of VERIFY* redefinition #include #include #include #include +#include #include static ECMAScriptOptions match_test_api_options(const ECMAScriptOptions options) diff --git a/Userland/Applets/Keymap/KeymapStatusWidget.cpp b/Userland/Applets/Keymap/KeymapStatusWidget.cpp index bc3b1802d94..7a1b274347e 100644 --- a/Userland/Applets/Keymap/KeymapStatusWidget.cpp +++ b/Userland/Applets/Keymap/KeymapStatusWidget.cpp @@ -5,8 +5,8 @@ */ #include "KeymapStatusWidget.h" -#include "LibGUI/ActionGroup.h" #include +#include #include #include #include diff --git a/Userland/Applications/Browser/History/HistoryModel.h b/Userland/Applications/Browser/History/HistoryModel.h index 10df2405715..6162b28db09 100644 --- a/Userland/Applications/Browser/History/HistoryModel.h +++ b/Userland/Applications/Browser/History/HistoryModel.h @@ -6,8 +6,8 @@ #pragma once -#include "Applications/Browser/History.h" #include +#include #include #include diff --git a/Userland/Applications/Browser/History/HistoryWidget.h b/Userland/Applications/Browser/History/HistoryWidget.h index 5d518f596f9..c066b96ecc0 100644 --- a/Userland/Applications/Browser/History/HistoryWidget.h +++ b/Userland/Applications/Browser/History/HistoryWidget.h @@ -6,7 +6,7 @@ #pragma once -#include "Applications/Browser/History.h" +#include "../History.h" #include "HistoryModel.h" #include #include diff --git a/Userland/Applications/BrowserSettings/ContentFilterSettingsWidget.h b/Userland/Applications/BrowserSettings/ContentFilterSettingsWidget.h index 102ada7aac9..c61ee19be5d 100644 --- a/Userland/Applications/BrowserSettings/ContentFilterSettingsWidget.h +++ b/Userland/Applications/BrowserSettings/ContentFilterSettingsWidget.h @@ -6,8 +6,8 @@ #pragma once -#include "LibGUI/CheckBox.h" #include +#include #include #include diff --git a/Userland/Applications/PDFViewer/NumericInput.cpp b/Userland/Applications/PDFViewer/NumericInput.cpp index 5c0c2e14f1e..d3ee9e01c57 100644 --- a/Userland/Applications/PDFViewer/NumericInput.cpp +++ b/Userland/Applications/PDFViewer/NumericInput.cpp @@ -5,7 +5,7 @@ */ #include "NumericInput.h" -#include "ctype.h" +#include NumericInput::NumericInput() { diff --git a/Userland/Applications/PDFViewer/PDFViewerWidget.cpp b/Userland/Applications/PDFViewer/PDFViewerWidget.cpp index 3008527613a..75c507c562b 100644 --- a/Userland/Applications/PDFViewer/PDFViewerWidget.cpp +++ b/Userland/Applications/PDFViewer/PDFViewerWidget.cpp @@ -6,11 +6,9 @@ */ #include "PDFViewerWidget.h" -#include "AK/Assertions.h" -#include "AK/DeprecatedString.h" -#include "AK/Format.h" -#include "LibGUI/Forward.h" -#include "LibPDF/Document.h" +#include +#include +#include #include #include #include @@ -19,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -30,6 +29,7 @@ #include #include #include +#include class PagedErrorsModel : public GUI::Model { diff --git a/Userland/Applications/PDFViewer/PDFViewerWidget.h b/Userland/Applications/PDFViewer/PDFViewerWidget.h index 8a4ece9d9a7..785896abe4f 100644 --- a/Userland/Applications/PDFViewer/PDFViewerWidget.h +++ b/Userland/Applications/PDFViewer/PDFViewerWidget.h @@ -6,11 +6,11 @@ #pragma once -#include "AK/NonnullRefPtr.h" -#include "AK/RefPtr.h" #include "NumericInput.h" #include "PDFViewer.h" #include "SidebarWidget.h" +#include +#include #include #include #include diff --git a/Userland/Applications/PDFViewer/SidebarWidget.h b/Userland/Applications/PDFViewer/SidebarWidget.h index e36a44950ab..ffa2cb49339 100644 --- a/Userland/Applications/PDFViewer/SidebarWidget.h +++ b/Userland/Applications/PDFViewer/SidebarWidget.h @@ -6,11 +6,11 @@ #pragma once -#include "LibGUI/ModelIndex.h" -#include "LibPDF/Document.h" #include "OutlineModel.h" +#include #include #include +#include class SidebarWidget final : public GUI::Widget { C_OBJECT(SidebarWidget) diff --git a/Userland/Applications/Piano/RollWidget.cpp b/Userland/Applications/Piano/RollWidget.cpp index ece088e7adb..25043abe667 100644 --- a/Userland/Applications/Piano/RollWidget.cpp +++ b/Userland/Applications/Piano/RollWidget.cpp @@ -8,9 +8,9 @@ */ #include "RollWidget.h" -#include "LibGUI/Event.h" #include "TrackManager.h" #include +#include #include #include #include diff --git a/Userland/Applications/PixelPaint/Tools/TextTool.cpp b/Userland/Applications/PixelPaint/Tools/TextTool.cpp index 617f4e87821..6a930669d99 100644 --- a/Userland/Applications/PixelPaint/Tools/TextTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/TextTool.cpp @@ -7,10 +7,10 @@ #include "TextTool.h" #include "../ImageEditor.h" #include "../Layer.h" -#include "LibGUI/FontPicker.h" #include #include #include +#include #include #include #include diff --git a/Userland/Applications/Presenter/PresenterWidget.cpp b/Userland/Applications/Presenter/PresenterWidget.cpp index 35ef191a99b..6e2e9104e15 100644 --- a/Userland/Applications/Presenter/PresenterWidget.cpp +++ b/Userland/Applications/Presenter/PresenterWidget.cpp @@ -5,7 +5,6 @@ */ #include "PresenterWidget.h" -#include "LibGUI/MessageBox.h" #include "Presentation.h" #include #include @@ -14,6 +13,7 @@ #include #include #include +#include #include #include #include diff --git a/Userland/Applications/Presenter/PresenterWidget.h b/Userland/Applications/Presenter/PresenterWidget.h index a3a51967486..f3c95dc62d2 100644 --- a/Userland/Applications/Presenter/PresenterWidget.h +++ b/Userland/Applications/Presenter/PresenterWidget.h @@ -6,8 +6,8 @@ #pragma once -#include "LibGUI/Action.h" #include "Presentation.h" +#include #include #include #include diff --git a/Userland/Applications/Spreadsheet/SpreadsheetWidget.cpp b/Userland/Applications/Spreadsheet/SpreadsheetWidget.cpp index b34b998ec74..20e11e2695f 100644 --- a/Userland/Applications/Spreadsheet/SpreadsheetWidget.cpp +++ b/Userland/Applications/Spreadsheet/SpreadsheetWidget.cpp @@ -7,7 +7,7 @@ #include "SpreadsheetWidget.h" #include "CellSyntaxHighlighter.h" #include "HelpWindow.h" -#include "LibFileSystemAccessClient/Client.h" +#include #include #include #include diff --git a/Userland/Applications/Spreadsheet/Workbook.cpp b/Userland/Applications/Spreadsheet/Workbook.cpp index f9adb38a2ec..04b88239458 100644 --- a/Userland/Applications/Spreadsheet/Workbook.cpp +++ b/Userland/Applications/Spreadsheet/Workbook.cpp @@ -8,13 +8,13 @@ #include "ExportDialog.h" #include "ImportDialog.h" #include "JSIntegration.h" -#include "LibGUI/MessageBox.h" #include "Readers/CSV.h" #include #include #include #include #include +#include #include #include #include diff --git a/Userland/Applications/Spreadsheet/main.cpp b/Userland/Applications/Spreadsheet/main.cpp index f95591f7902..1ded04cc03d 100644 --- a/Userland/Applications/Spreadsheet/main.cpp +++ b/Userland/Applications/Spreadsheet/main.cpp @@ -5,7 +5,6 @@ */ #include "HelpWindow.h" -#include "LibFileSystemAccessClient/Client.h" #include "Spreadsheet.h" #include "SpreadsheetWidget.h" #include @@ -13,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/Userland/DevTools/HackStudio/HackStudioWidget.h b/Userland/DevTools/HackStudio/HackStudioWidget.h index e1fc3e17af9..4441d0ea192 100644 --- a/Userland/DevTools/HackStudio/HackStudioWidget.h +++ b/Userland/DevTools/HackStudio/HackStudioWidget.h @@ -16,7 +16,6 @@ #include "GMLPreviewWidget.h" #include "Git/DiffViewer.h" #include "Git/GitWidget.h" -#include "LibGUI/Button.h" #include "Locator.h" #include "Project.h" #include "ProjectBuilder.h" @@ -25,6 +24,7 @@ #include "ToDoEntriesWidget.h" #include #include +#include #include #include #include diff --git a/Userland/DevTools/HackStudio/ProjectBuilder.h b/Userland/DevTools/HackStudio/ProjectBuilder.h index f5808b0ff38..dede1d28bb5 100644 --- a/Userland/DevTools/HackStudio/ProjectBuilder.h +++ b/Userland/DevTools/HackStudio/ProjectBuilder.h @@ -6,9 +6,9 @@ #pragma once -#include "AK/Error.h" #include "Project.h" #include "TerminalWrapper.h" +#include #include #include diff --git a/Userland/DevTools/Profiler/FlameGraphView.cpp b/Userland/DevTools/Profiler/FlameGraphView.cpp index 84749c25260..363627831d0 100644 --- a/Userland/DevTools/Profiler/FlameGraphView.cpp +++ b/Userland/DevTools/Profiler/FlameGraphView.cpp @@ -5,12 +5,12 @@ */ #include "FlameGraphView.h" -#include "DevTools/Profiler/Profile.h" -#include "LibGfx/Forward.h" +#include "Profile.h" #include #include #include #include +#include #include namespace Profiler { diff --git a/Userland/DevTools/UserspaceEmulator/SoftCPU.h b/Userland/DevTools/UserspaceEmulator/SoftCPU.h index 4e1bc5d3c91..250e3e07cfd 100644 --- a/Userland/DevTools/UserspaceEmulator/SoftCPU.h +++ b/Userland/DevTools/UserspaceEmulator/SoftCPU.h @@ -6,13 +6,13 @@ #pragma once -#include "AK/Debug.h" #include "Emulator.h" #include "Region.h" #include "SoftFPU.h" #include "SoftVPU.h" #include "ValueWithShadow.h" #include +#include #include #include diff --git a/Userland/Libraries/LibCore/ArgsParser.cpp b/Userland/Libraries/LibCore/ArgsParser.cpp index 2d145b365c8..0c18654daef 100644 --- a/Userland/Libraries/LibCore/ArgsParser.cpp +++ b/Userland/Libraries/LibCore/ArgsParser.cpp @@ -5,8 +5,8 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "AK/JsonObject.h" #include +#include #include #include #include diff --git a/Userland/Libraries/LibIMAP/Client.cpp b/Userland/Libraries/LibIMAP/Client.cpp index 0ce5a6a4c0d..56b4dc822ba 100644 --- a/Userland/Libraries/LibIMAP/Client.cpp +++ b/Userland/Libraries/LibIMAP/Client.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "AK/OwnPtr.h" +#include #include #include diff --git a/Userland/Libraries/LibPDF/ColorSpace.h b/Userland/Libraries/LibPDF/ColorSpace.h index 08bc660e7da..9ff28aa0f1d 100644 --- a/Userland/Libraries/LibPDF/ColorSpace.h +++ b/Userland/Libraries/LibPDF/ColorSpace.h @@ -6,8 +6,8 @@ #pragma once -#include "AK/Forward.h" #include +#include #include #include diff --git a/Userland/Libraries/LibRegex/RegexByteCode.cpp b/Userland/Libraries/LibRegex/RegexByteCode.cpp index f3e669c00f9..dee4dd9f57c 100644 --- a/Userland/Libraries/LibRegex/RegexByteCode.cpp +++ b/Userland/Libraries/LibRegex/RegexByteCode.cpp @@ -5,11 +5,11 @@ */ #include "RegexByteCode.h" -#include "AK/StringBuilder.h" #include "RegexDebug.h" #include #include #include +#include #include namespace regex { diff --git a/Userland/Services/EchoServer/Client.cpp b/Userland/Services/EchoServer/Client.cpp index 2538ffa24f9..f7203d51156 100644 --- a/Userland/Services/EchoServer/Client.cpp +++ b/Userland/Services/EchoServer/Client.cpp @@ -5,7 +5,7 @@ */ #include "Client.h" -#include "LibCore/EventLoop.h" +#include Client::Client(int id, NonnullOwnPtr socket) : m_id(id) diff --git a/Userland/Services/Taskbar/main.cpp b/Userland/Services/Taskbar/main.cpp index eb24883eb47..af5626fadfa 100644 --- a/Userland/Services/Taskbar/main.cpp +++ b/Userland/Services/Taskbar/main.cpp @@ -5,7 +5,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "LibGUI/Window.h" #include "ShutdownDialog.h" #include "TaskbarWindow.h" #include @@ -25,6 +24,7 @@ #include #include #include +#include #include #include #include diff --git a/Userland/Services/WindowServer/WMConnectionFromClient.h b/Userland/Services/WindowServer/WMConnectionFromClient.h index 731f1f52797..5b6ce7d54bd 100644 --- a/Userland/Services/WindowServer/WMConnectionFromClient.h +++ b/Userland/Services/WindowServer/WMConnectionFromClient.h @@ -6,8 +6,8 @@ #pragma once -#include "AK/NonnullRefPtr.h" #include +#include #include #include #include diff --git a/Userland/Shell/Builtin.cpp b/Userland/Shell/Builtin.cpp index d49a2f4283b..e0315d8ee91 100644 --- a/Userland/Shell/Builtin.cpp +++ b/Userland/Shell/Builtin.cpp @@ -5,8 +5,8 @@ */ #include "AST.h" +#include "Formatter.h" #include "Shell.h" -#include "Shell/Formatter.h" #include #include #include diff --git a/Userland/Utilities/fgrep.cpp b/Userland/Utilities/fgrep.cpp index 8fddc99f965..2866b548d89 100644 --- a/Userland/Utilities/fgrep.cpp +++ b/Userland/Utilities/fgrep.cpp @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "AK/DeprecatedString.h" #include +#include #include #include #include diff --git a/Userland/Utilities/tar.cpp b/Userland/Utilities/tar.cpp index 4a19f83f9db..73473d52302 100644 --- a/Userland/Utilities/tar.cpp +++ b/Userland/Utilities/tar.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "LibCore/Directory.h" #include #include #include @@ -13,6 +12,7 @@ #include #include #include +#include #include #include #include