From c911781c211b24c67d01aa93fc12b1d83538febc Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Fri, 7 Jul 2023 22:48:11 -0400 Subject: [PATCH] Everywhere: Remove needless trailing semi-colons after functions This is a new option in clang-format-16. --- .clang-format | 1 + AK/SinglyLinkedList.h | 2 +- AK/StdLibExtraDetails.h | 2 +- AK/Time.h | 14 ++-- AK/URL.h | 2 +- Kernel/Arch/aarch64/RPi/Timer.cpp | 2 +- Kernel/Arch/x86_64/Interrupts/IOAPIC.h | 2 +- Kernel/Arch/x86_64/Processor.cpp | 2 +- Kernel/Bus/PCI/Definitions.h | 2 +- Kernel/Bus/PCI/Device.h | 2 +- .../Devices/GPU/Console/VGATextModeConsole.h | 2 +- Kernel/Devices/GPU/Management.h | 2 +- Kernel/Devices/Storage/ATA/AHCI/Definitions.h | 2 +- Kernel/Devices/Storage/ATA/AHCI/Port.h | 4 +- Kernel/Devices/Storage/ATA/ATAPort.cpp | 4 +- .../Devices/Storage/ATA/GenericIDE/Channel.h | 2 +- Kernel/Devices/Storage/NVMe/NVMeController.h | 4 +- .../Devices/Storage/NVMe/NVMeInterruptQueue.h | 2 +- Kernel/Devices/Storage/NVMe/NVMeNameSpace.h | 2 +- Kernel/Devices/Storage/NVMe/NVMeQueue.h | 2 +- Kernel/FileSystem/BlockBasedFileSystem.h | 2 +- Kernel/FileSystem/FATFS/FileSystem.h | 2 +- Kernel/FileSystem/Inode.h | 2 +- Kernel/FileSystem/InodeWatcher.h | 2 +- Kernel/FileSystem/SysFS/Component.h | 4 +- Kernel/Heap/Heap.h | 2 +- Kernel/Interrupts/GenericInterruptHandler.h | 4 +- Kernel/Memory/Region.h | 4 +- Kernel/Memory/RingBuffer.h | 2 +- Kernel/Net/IPv4SocketTuple.h | 10 +-- Kernel/Net/Intel/E1000NetworkAdapter.h | 2 +- Kernel/Security/Credentials.h | 2 +- Kernel/Syscalls/execve.cpp | 2 +- Kernel/Syscalls/realpath.cpp | 2 +- Kernel/Syscalls/uname.cpp | 25 +++--- Kernel/Tasks/FinalizerTask.cpp | 2 +- Kernel/Tasks/Process.cpp | 2 +- Kernel/Tasks/Process.h | 6 +- Kernel/Tasks/Thread.h | 2 +- Kernel/Time/TimerQueue.h | 2 +- Ladybird/Tab.h | 2 +- Meta/Lagom/Wasm/js_repl.cpp | 2 +- Tests/AK/TestCircularBuffer.cpp | 6 +- Tests/AK/TestOptional.cpp | 4 +- Tests/AK/TestTypeTraits.cpp | 2 +- Tests/LibCore/TestLibCoreArgsParser.cpp | 2 +- Userland/Applets/Audio/main.cpp | 2 +- Userland/Applications/3DFileViewer/main.cpp | 4 +- .../Applications/AnalogClock/AnalogClock.cpp | 2 +- .../Browser/ElementSizePreviewWidget.h | 6 +- .../DisplaySettings/ThemesSettingsWidget.cpp | 2 +- .../Applications/Magnifier/MagnifierWidget.h | 2 +- Userland/Applications/Piano/TrackManager.h | 2 +- Userland/Applications/PixelPaint/Guide.h | 2 +- .../Applications/PixelPaint/ImageEditor.h | 2 +- Userland/Applications/PixelPaint/Tools/Tool.h | 2 +- Userland/Applications/SpaceAnalyzer/Tree.h | 2 +- .../Applications/Spreadsheet/ImportDialog.cpp | 2 +- .../Spreadsheet/SpreadsheetView.h | 2 +- .../SystemMonitor/ThreadStackWidget.cpp | 6 +- .../DevTools/GMLPlayground/MainWidget.cpp | 4 +- Userland/DevTools/HackStudio/Git/GitWidget.h | 2 +- .../DevTools/HackStudio/HackStudioWidget.cpp | 2 +- .../DevTools/Profiler/FilesystemEventModel.h | 2 +- .../DevTools/Profiler/PercentageFormatting.h | 2 +- Userland/DevTools/Profiler/Profile.h | 2 +- Userland/DevTools/UserspaceEmulator/Region.h | 2 +- .../DevTools/UserspaceEmulator/SoftCPU.cpp | 4 +- Userland/DevTools/UserspaceEmulator/SoftCPU.h | 2 +- .../DevTools/UserspaceEmulator/SoftFPU.cpp | 10 +-- Userland/Games/2048/Game.cpp | 2 +- Userland/Games/Chess/ChessWidget.h | 14 ++-- Userland/Games/GameOfLife/Pattern.h | 2 +- Userland/Games/Hearts/Game.cpp | 2 +- Userland/Libraries/LibArchive/TarStream.h | 2 +- Userland/Libraries/LibAudio/Loader.h | 4 +- Userland/Libraries/LibC/stdlib.cpp | 2 +- Userland/Libraries/LibCards/Card.h | 2 +- .../Libraries/LibCodeComprehension/Types.h | 2 +- .../Libraries/LibCompress/DeflateTables.h | 10 +-- Userland/Libraries/LibCompress/Lzma.cpp | 2 +- Userland/Libraries/LibCore/Account.h | 2 +- Userland/Libraries/LibCore/ArgsParser.h | 2 +- Userland/Libraries/LibCore/Debounce.h | 2 +- Userland/Libraries/LibCore/DirectoryEntry.cpp | 2 +- Userland/Libraries/LibCore/Socket.h | 4 +- Userland/Libraries/LibCore/UDPServer.h | 2 +- Userland/Libraries/LibCpp/AST.h | 2 +- .../LibCpp/SemanticSyntaxHighlighter.h | 4 +- .../LibCrypto/BigFraction/BigFraction.cpp | 2 +- .../LibCrypto/BigInt/SignedBigInteger.h | 2 +- .../Libraries/LibCrypto/Checksum/Adler32.cpp | 2 +- .../Libraries/LibCrypto/Checksum/CRC32.cpp | 6 +- Userland/Libraries/LibCrypto/Cipher/AES.h | 10 +-- Userland/Libraries/LibCrypto/Cipher/Cipher.h | 2 +- .../Libraries/LibCrypto/Curves/Ed25519.cpp | 2 +- Userland/Libraries/LibCrypto/Hash/MD5.cpp | 8 +- .../Libraries/LibDSP/ProcessorParameter.h | 2 +- Userland/Libraries/LibEDID/EDID.h | 2 +- Userland/Libraries/LibELF/DynamicLoader.h | 2 +- Userland/Libraries/LibGL/GLContext.h | 2 +- Userland/Libraries/LibGL/Tex/TextureUnit.h | 8 +- Userland/Libraries/LibGUI/Application.h | 2 +- Userland/Libraries/LibGUI/ColorInput.cpp | 2 +- Userland/Libraries/LibGUI/Desktop.h | 2 +- Userland/Libraries/LibGUI/EditingEngine.cpp | 18 ++-- .../Libraries/LibGUI/FilteringProxyModel.h | 2 +- Userland/Libraries/LibGUI/TabWidget.h | 4 +- Userland/Libraries/LibGUI/TextEditor.cpp | 2 +- Userland/Libraries/LibGUI/TextEditor.h | 8 +- .../Libraries/LibGUI/VimEditingEngine.cpp | 12 +-- Userland/Libraries/LibGUI/Widget.h | 4 +- .../Libraries/LibGUI/Wizards/WizardPage.h | 2 +- Userland/Libraries/LibGemini/Document.h | 2 +- .../LibGfx/Filters/BrightnessFilter.h | 2 +- .../LibGfx/Filters/ColorBlindnessFilter.cpp | 2 +- .../Libraries/LibGfx/Filters/ContrastFilter.h | 2 +- .../LibGfx/Filters/GrayscaleFilter.h | 2 +- .../Libraries/LibGfx/Filters/InvertFilter.h | 2 +- .../Libraries/LibGfx/Filters/OpacityFilter.h | 2 +- .../Libraries/LibGfx/Filters/SepiaFilter.h | 2 +- .../Libraries/LibGfx/Filters/TintFilter.h | 2 +- Userland/Libraries/LibGfx/Font/BitmapFont.h | 2 +- .../LibGfx/Font/OpenType/Hinting/Opcodes.h | 4 +- .../Libraries/LibGfx/GradientPainting.cpp | 2 +- .../LibGfx/ImageFormats/JPEGWriter.cpp | 4 +- .../LibGfx/ImageFormats/PNGWriter.cpp | 4 +- .../LibGfx/ImageFormats/TinyVGLoader.h | 2 +- Userland/Libraries/LibGfx/PaintStyle.h | 2 +- Userland/Libraries/LibGfx/Painter.cpp | 2 +- Userland/Libraries/LibIMAP/Objects.h | 2 +- Userland/Libraries/LibIMAP/Parser.h | 2 +- Userland/Libraries/LibJS/AST.h | 10 +-- Userland/Libraries/LibJS/Bytecode/Op.cpp | 6 +- Userland/Libraries/LibJS/Heap/MarkedVector.h | 2 +- Userland/Libraries/LibJS/Lexer.h | 6 +- Userland/Libraries/LibJS/Runtime/Array.h | 2 +- .../LibJS/Runtime/ECMAScriptFunctionObject.h | 10 +-- .../Libraries/LibJS/Runtime/FunctionObject.h | 2 +- .../LibJS/Runtime/IndexedProperties.h | 6 +- .../LibJS/Runtime/Intl/DateTimeFormat.h | 38 ++++----- .../Libraries/LibJS/Runtime/NativeFunction.h | 2 +- Userland/Libraries/LibJS/Runtime/Object.h | 2 +- .../LibJS/Runtime/Temporal/TimeZone.h | 4 +- Userland/Libraries/LibJS/Runtime/TypedArray.h | 2 +- Userland/Libraries/LibJS/Runtime/VM.h | 2 +- Userland/Libraries/LibJS/Runtime/Value.h | 4 +- Userland/Libraries/LibJS/Runtime/WeakMap.h | 4 +- Userland/Libraries/LibJS/Runtime/WeakRef.h | 4 +- Userland/Libraries/LibJS/Runtime/WeakSet.h | 4 +- Userland/Libraries/LibKeyboard/CharacterMap.h | 2 +- Userland/Libraries/LibLine/Editor.cpp | 2 +- Userland/Libraries/LibManual/PageNode.h | 4 +- Userland/Libraries/LibPCIDB/Database.h | 2 +- Userland/Libraries/LibPDF/ColorSpace.h | 4 +- Userland/Libraries/LibPDF/DocumentParser.h | 2 +- Userland/Libraries/LibPDF/Filter.cpp | 20 ++--- Userland/Libraries/LibPDF/Fonts/PDFFont.h | 2 +- Userland/Libraries/LibPDF/Fonts/Type0Font.cpp | 2 +- Userland/Libraries/LibPDF/ObjectDerivatives.h | 6 +- .../LibPartition/MBRPartitionTable.h | 4 +- Userland/Libraries/LibRegex/RegexParser.h | 2 +- Userland/Libraries/LibSQL/AST/AST.h | 4 +- Userland/Libraries/LibSyntax/Highlighter.h | 4 +- .../Libraries/LibSyntax/HighlighterClient.h | 2 +- .../Libraries/LibTest/JavaScriptTestRunner.h | 2 +- Userland/Libraries/LibTest/TestRunner.h | 2 +- Userland/Libraries/LibUSBDB/Database.h | 2 +- Userland/Libraries/LibVT/Terminal.h | 6 +- Userland/Libraries/LibVT/TerminalWidget.cpp | 2 +- Userland/Libraries/LibVT/TerminalWidget.h | 4 +- .../Color/CodingIndependentCodePoints.h | 8 +- .../Libraries/LibVideo/PlaybackManager.cpp | 6 +- Userland/Libraries/LibVideo/PlaybackManager.h | 8 +- .../LibVideo/VP9/ProbabilityTables.h | 84 +++++++++---------- .../LibVirtGPU/CommandBufferBuilder.cpp | 2 +- Userland/Libraries/LibWasm/Types.h | 4 +- Userland/Libraries/LibWeb/ARIA/ARIAMixin.h | 2 +- Userland/Libraries/LibWeb/ARIA/RoleType.h | 2 +- Userland/Libraries/LibWeb/CSS/CSSImportRule.h | 2 +- .../Libraries/LibWeb/CSS/CSSKeyframeRule.h | 2 +- .../Libraries/LibWeb/CSS/CSSKeyframesRule.h | 2 +- Userland/Libraries/LibWeb/CSS/CSSMediaRule.h | 2 +- Userland/Libraries/LibWeb/CSS/CSSStyleRule.h | 2 +- .../Libraries/LibWeb/CSS/CSSSupportsRule.h | 2 +- .../Libraries/LibWeb/CSS/GridTrackPlacement.h | 2 +- Userland/Libraries/LibWeb/CSS/GridTrackSize.h | 2 +- Userland/Libraries/LibWeb/CSS/LengthBox.h | 4 +- .../Libraries/LibWeb/CSS/Parser/Parser.cpp | 8 +- .../Libraries/LibWeb/CSS/StyleComputer.cpp | 2 +- .../CSS/StyleValues/CalculatedStyleValue.cpp | 6 +- .../CSS/StyleValues/CalculatedStyleValue.h | 10 +-- .../LibWeb/CSS/StyleValues/ColorStyleValue.h | 2 +- .../CSS/StyleValues/ContentStyleValue.h | 2 +- .../StyleValues/FilterValueListStyleValue.h | 2 +- .../CSS/StyleValues/FlexFlowStyleValue.h | 2 +- .../LibWeb/CSS/StyleValues/FlexStyleValue.h | 2 +- .../LibWeb/CSS/StyleValues/FontStyleValue.h | 2 +- .../CSS/StyleValues/FrequencyStyleValue.h | 2 +- .../StyleValues/GridTemplateAreaStyleValue.h | 2 +- .../GridTrackPlacementShorthandStyleValue.h | 2 +- .../GridTrackPlacementStyleValue.h | 2 +- .../GridTrackSizeListShorthandStyleValue.h | 2 +- .../CSS/StyleValues/PlaceContentStyleValue.h | 2 +- Userland/Libraries/LibWeb/Crypto/Crypto.cpp | 2 +- Userland/Libraries/LibWeb/DOM/Document.h | 4 +- Userland/Libraries/LibWeb/DOM/Event.h | 2 +- .../Libraries/LibWeb/Encoding/TextDecoder.h | 2 +- .../Libraries/LibWeb/HTML/BrowsingContext.h | 2 +- .../Libraries/LibWeb/HTML/HTMLBodyElement.h | 2 +- .../LibWeb/HTML/HTMLDetailsElement.h | 2 +- .../Libraries/LibWeb/HTML/HTMLInputElement.h | 2 +- .../Libraries/LibWeb/HTML/HTMLLIElement.h | 2 +- .../LibWeb/HTML/HTMLSummaryElement.h | 2 +- Userland/Libraries/LibWeb/HTML/Navigable.h | 18 ++-- .../LibWeb/HTML/RemoteBrowsingContext.cpp | 2 +- .../LibWeb/HTML/RemoteBrowsingContext.h | 4 +- .../LibWeb/HTML/Scripting/Fetching.h | 4 +- .../LibWeb/HTML/Scripting/ModuleMap.h | 4 +- .../LibWeb/HTML/Scripting/ModuleScript.h | 4 +- .../LibWeb/HTML/TraversableNavigable.h | 10 +-- .../LibWeb/Layout/FlexFormattingContext.cpp | 2 +- .../LibWeb/Layout/GridFormattingContext.h | 8 +- .../Libraries/LibWeb/Layout/LayoutState.h | 2 +- .../Libraries/LibWeb/Loader/LoadRequest.h | 4 +- .../LibWeb/Painting/BorderPainting.h | 2 +- .../Libraries/LibWeb/Painting/PaintableBox.h | 2 +- .../Libraries/LibWeb/WebAudio/AudioContext.h | 4 +- .../LibWeb/WebAudio/BaseAudioContext.h | 12 +-- .../Libraries/LibWeb/WebSockets/WebSocket.h | 4 +- .../Libraries/LibWeb/XHR/XMLHttpRequest.h | 2 +- .../NotificationServer/NotificationWindow.h | 2 +- Userland/Services/SpiceAgent/MessageHeader.h | 8 +- Userland/Services/TelnetServer/Command.h | 2 +- Userland/Services/WindowServer/Menu.h | 2 +- .../Services/WindowServer/WindowManager.h | 2 +- Userland/Shell/AST.h | 4 +- Userland/Utilities/lscpu.cpp | 2 +- Userland/Utilities/nc.cpp | 2 +- Userland/Utilities/ping.cpp | 2 +- Userland/Utilities/sed.cpp | 2 +- Userland/Utilities/shot.cpp | 6 +- Userland/Utilities/sql.cpp | 2 +- 243 files changed, 483 insertions(+), 481 deletions(-) diff --git a/.clang-format b/.clang-format index 81d89b059b..14fbe60da2 100644 --- a/.clang-format +++ b/.clang-format @@ -16,6 +16,7 @@ InsertNewlineAtEOF: true LineEnding: LF NamespaceIndentation: None QualifierAlignment: Right +RemoveSemicolon: true RequiresClausePosition: WithFollowing RequiresExpressionIndentation: OuterScope SpaceAfterTemplateKeyword: false diff --git a/AK/SinglyLinkedList.h b/AK/SinglyLinkedList.h index 3c04b0eea9..488d1f93d5 100644 --- a/AK/SinglyLinkedList.h +++ b/AK/SinglyLinkedList.h @@ -47,7 +47,7 @@ public: { m_removed = true; list.remove(*this); - }; + } private: friend ListType; diff --git a/AK/StdLibExtraDetails.h b/AK/StdLibExtraDetails.h index 54cc7849a8..15a3df47ce 100644 --- a/AK/StdLibExtraDetails.h +++ b/AK/StdLibExtraDetails.h @@ -448,7 +448,7 @@ inline constexpr bool IsFundamental = IsArithmetic || IsVoid || IsNullPoin template struct IntegerSequence { using Type = T; - static constexpr unsigned size() noexcept { return sizeof...(Ts); }; + static constexpr unsigned size() noexcept { return sizeof...(Ts); } }; template diff --git a/AK/Time.h b/AK/Time.h index 57b60a45d1..ab30bb41e6 100644 --- a/AK/Time.h +++ b/AK/Time.h @@ -221,9 +221,9 @@ public: [[nodiscard]] static Duration from_timespec(const struct timespec&); [[nodiscard]] static Duration from_timeval(const struct timeval&); // We don't pull in for the pretty min/max definitions because this file is also included in the Kernel - [[nodiscard]] constexpr static Duration min() { return Duration(-__INT64_MAX__ - 1LL, 0); }; - [[nodiscard]] constexpr static Duration zero() { return Duration(0, 0); }; - [[nodiscard]] constexpr static Duration max() { return Duration(__INT64_MAX__, 999'999'999); }; + [[nodiscard]] constexpr static Duration min() { return Duration(-__INT64_MAX__ - 1LL, 0); } + [[nodiscard]] constexpr static Duration zero() { return Duration(0, 0); } + [[nodiscard]] constexpr static Duration max() { return Duration(__INT64_MAX__, 999'999'999); } // Truncates towards zero (2.8s to 2s, -2.8s to -2s). [[nodiscard]] i64 to_truncated_seconds() const; @@ -433,15 +433,15 @@ public: [[nodiscard]] i64 truncated_seconds_since_epoch() const { return m_offset.to_truncated_seconds(); } // Offsetting a UNIX time by a duration yields another UNIX time. - constexpr UnixDateTime operator+(Duration const& other) const { return UnixDateTime { m_offset + other }; }; + constexpr UnixDateTime operator+(Duration const& other) const { return UnixDateTime { m_offset + other }; } constexpr UnixDateTime& operator+=(Duration const& other) { this->m_offset = this->m_offset + other; return *this; - }; - constexpr UnixDateTime operator-(Duration const& other) const { return UnixDateTime { m_offset - other }; }; + } + constexpr UnixDateTime operator-(Duration const& other) const { return UnixDateTime { m_offset - other }; } // Subtracting two UNIX times yields their time difference. - constexpr Duration operator-(UnixDateTime const& other) const { return m_offset - other.m_offset; }; + constexpr Duration operator-(UnixDateTime const& other) const { return m_offset - other.m_offset; } #ifndef KERNEL [[nodiscard]] static UnixDateTime now(); diff --git a/AK/URL.h b/AK/URL.h index 744239d77f..4e8caf078e 100644 --- a/AK/URL.h +++ b/AK/URL.h @@ -115,7 +115,7 @@ public: static URL create_with_url_or_path(DeprecatedString const&); static URL create_with_file_scheme(DeprecatedString const& path, DeprecatedString const& fragment = {}, DeprecatedString const& hostname = {}); static URL create_with_help_scheme(DeprecatedString const& path, DeprecatedString const& fragment = {}, DeprecatedString const& hostname = {}); - static URL create_with_data(DeprecatedString mime_type, DeprecatedString payload, bool is_base64 = false) { return URL(move(mime_type), move(payload), is_base64); }; + static URL create_with_data(DeprecatedString mime_type, DeprecatedString payload, bool is_base64 = false) { return URL(move(mime_type), move(payload), is_base64); } static bool scheme_requires_port(StringView); static u16 default_port_for_scheme(StringView); diff --git a/Kernel/Arch/aarch64/RPi/Timer.cpp b/Kernel/Arch/aarch64/RPi/Timer.cpp index f39977a0aa..4fd36f82f1 100644 --- a/Kernel/Arch/aarch64/RPi/Timer.cpp +++ b/Kernel/Arch/aarch64/RPi/Timer.cpp @@ -67,7 +67,7 @@ bool Timer::handle_irq(RegisterState const& regs) clear_interrupt(TimerID::Timer1); return result; -}; +} u64 Timer::update_time(u64& seconds_since_boot, u32& ticks_this_second, bool query_only) { diff --git a/Kernel/Arch/x86_64/Interrupts/IOAPIC.h b/Kernel/Arch/x86_64/Interrupts/IOAPIC.h index fb6d9c1eae..cbd8863165 100644 --- a/Kernel/Arch/x86_64/Interrupts/IOAPIC.h +++ b/Kernel/Arch/x86_64/Interrupts/IOAPIC.h @@ -51,7 +51,7 @@ public: virtual u16 get_irr() const override; virtual u32 gsi_base() const override { return m_gsi_base; } virtual size_t interrupt_vectors_count() const override { return m_redirection_entries_count; } - virtual StringView model() const override { return "IOAPIC"sv; }; + virtual StringView model() const override { return "IOAPIC"sv; } virtual IRQControllerType type() const override { return IRQControllerType::i82093AA; } private: diff --git a/Kernel/Arch/x86_64/Processor.cpp b/Kernel/Arch/x86_64/Processor.cpp index 06069eef6b..42672d35c8 100644 --- a/Kernel/Arch/x86_64/Processor.cpp +++ b/Kernel/Arch/x86_64/Processor.cpp @@ -1538,7 +1538,7 @@ NAKED void thread_context_first_enter(void) " cld \n" " call context_first_init \n" " jmp common_trap_exit \n"); -}; +} NAKED void do_assume_context(Thread*, u32) { diff --git a/Kernel/Bus/PCI/Definitions.h b/Kernel/Bus/PCI/Definitions.h index 7196b5dd43..65c4d4b371 100644 --- a/Kernel/Bus/PCI/Definitions.h +++ b/Kernel/Bus/PCI/Definitions.h @@ -374,7 +374,7 @@ public: u32 get_msix_table_offset() const { return m_msix_info.table_offset; } bool is_msi_capable() const { return m_msi_info.count > 0; } - bool is_msi_64bit_address_format() { return m_msi_info.message_address_64_bit_format; }; + bool is_msi_64bit_address_format() { return m_msi_info.message_address_64_bit_format; } Spinlock& operation_lock() { return m_operation_lock; } Spinlock& operation_lock() const { return m_operation_lock; } diff --git a/Kernel/Bus/PCI/Device.h b/Kernel/Bus/PCI/Device.h index f6529fe5fc..734493f205 100644 --- a/Kernel/Bus/PCI/Device.h +++ b/Kernel/Bus/PCI/Device.h @@ -35,7 +35,7 @@ struct [[gnu::packed]] MSIxTableEntry { class Device { public: - DeviceIdentifier const& device_identifier() const { return *m_pci_identifier; }; + DeviceIdentifier const& device_identifier() const { return *m_pci_identifier; } virtual ~Device() = default; diff --git a/Kernel/Devices/GPU/Console/VGATextModeConsole.h b/Kernel/Devices/GPU/Console/VGATextModeConsole.h index ad5a46db56..2c1533418d 100644 --- a/Kernel/Devices/GPU/Console/VGATextModeConsole.h +++ b/Kernel/Devices/GPU/Console/VGATextModeConsole.h @@ -14,7 +14,7 @@ namespace Kernel::Graphics { class VGATextModeConsole final : public Console { public: static NonnullLockRefPtr initialize(); - virtual size_t chars_per_line() const override { return width(); }; + virtual size_t chars_per_line() const override { return width(); } virtual bool has_hardware_cursor() const override { return true; } virtual bool is_hardware_paged_capable() const override { return true; } diff --git a/Kernel/Devices/GPU/Management.h b/Kernel/Devices/GPU/Management.h index c25fb95e92..7a832bdb82 100644 --- a/Kernel/Devices/GPU/Management.h +++ b/Kernel/Devices/GPU/Management.h @@ -30,7 +30,7 @@ public: static bool is_initialized(); bool initialize(); - unsigned allocate_minor_device_number() { return m_current_minor_number++; }; + unsigned allocate_minor_device_number() { return m_current_minor_number++; } GraphicsManagement(); void attach_new_display_connector(Badge, DisplayConnector&); diff --git a/Kernel/Devices/Storage/ATA/AHCI/Definitions.h b/Kernel/Devices/Storage/ATA/AHCI/Definitions.h index ffab5a4912..0628ca3a04 100644 --- a/Kernel/Devices/Storage/ATA/AHCI/Definitions.h +++ b/Kernel/Devices/Storage/ATA/AHCI/Definitions.h @@ -177,7 +177,7 @@ public: return indices; } - u32 bit_mask() const { return m_bit_mask; }; + u32 bit_mask() const { return m_bit_mask; } // Disable default implementations that would use surprising integer promotion. bool operator==(MaskedBitField const&) const = delete; diff --git a/Kernel/Devices/Storage/ATA/AHCI/Port.h b/Kernel/Devices/Storage/ATA/AHCI/Port.h index 88f9e2d2c0..7024dfaac3 100644 --- a/Kernel/Devices/Storage/ATA/AHCI/Port.h +++ b/Kernel/Devices/Storage/ATA/AHCI/Port.h @@ -42,7 +42,7 @@ public: u32 port_index() const { return m_port_index; } u32 representative_port_index() const { return port_index() + 1; } bool is_operable() const; - bool is_atapi_attached() const { return m_port_registers.sig == (u32)ATA::DeviceSignature::ATAPI; }; + bool is_atapi_attached() const { return m_port_registers.sig == (u32)ATA::DeviceSignature::ATAPI; } LockRefPtr connected_device() const { return m_connected_device; } @@ -96,7 +96,7 @@ private: Optional try_to_find_unused_command_header(); - ALWAYS_INLINE bool is_interface_disabled() const { return (m_port_registers.ssts & 0xf) == 4; }; + ALWAYS_INLINE bool is_interface_disabled() const { return (m_port_registers.ssts & 0xf) == 4; } ALWAYS_INLINE void wait_until_condition_met_or_timeout(size_t delay_in_microseconds, size_t retries, Function condition_being_met) const; diff --git a/Kernel/Devices/Storage/ATA/ATAPort.cpp b/Kernel/Devices/Storage/ATA/ATAPort.cpp index 7c8ca01d3a..5f9bc3b09f 100644 --- a/Kernel/Devices/Storage/ATA/ATAPort.cpp +++ b/Kernel/Devices/Storage/ATA/ATAPort.cpp @@ -24,7 +24,7 @@ public: ~ATAPortInterruptDisabler() { (void)m_port->enable_interrupts(); - }; + } private: LockRefPtr m_port; @@ -40,7 +40,7 @@ public: ~ATAPortInterruptCleaner() { (void)m_port->force_clear_interrupts(); - }; + } private: LockRefPtr m_port; diff --git a/Kernel/Devices/Storage/ATA/GenericIDE/Channel.h b/Kernel/Devices/Storage/ATA/GenericIDE/Channel.h index 73834d4d8c..d28a3b961b 100644 --- a/Kernel/Devices/Storage/ATA/GenericIDE/Channel.h +++ b/Kernel/Devices/Storage/ATA/GenericIDE/Channel.h @@ -77,7 +77,7 @@ public: bool operator<(IOWindowGroup const&) const = delete; bool operator>(IOWindowGroup const&) const = delete; - IOWindow& io_window() const { return *m_io_window; }; + IOWindow& io_window() const { return *m_io_window; } IOWindow& control_window() const { return *m_control_window; } IOWindow* bus_master_window() const { return m_bus_master_window.ptr(); } diff --git a/Kernel/Devices/Storage/NVMe/NVMeController.h b/Kernel/Devices/Storage/NVMe/NVMeController.h index 96fdc6003d..ac41104264 100644 --- a/Kernel/Devices/Storage/NVMe/NVMeController.h +++ b/Kernel/Devices/Storage/NVMe/NVMeController.h @@ -51,8 +51,8 @@ public: return 0; } - bool is_admin_queue_ready() { return m_admin_queue_ready; }; - void set_admin_queue_ready_flag() { m_admin_queue_ready = true; }; + bool is_admin_queue_ready() { return m_admin_queue_ready; } + void set_admin_queue_ready_flag() { m_admin_queue_ready = true; } private: NVMeController(PCI::DeviceIdentifier const&, u32 hardware_relative_controller_id); diff --git a/Kernel/Devices/Storage/NVMe/NVMeInterruptQueue.h b/Kernel/Devices/Storage/NVMe/NVMeInterruptQueue.h index f8fc9790ff..2e2d2547ab 100644 --- a/Kernel/Devices/Storage/NVMe/NVMeInterruptQueue.h +++ b/Kernel/Devices/Storage/NVMe/NVMeInterruptQueue.h @@ -17,7 +17,7 @@ public: static ErrorOr> try_create(PCI::Device& device, NonnullOwnPtr rw_dma_region, NonnullRefPtr rw_dma_page, u16 qid, u8 irq, u32 q_depth, OwnPtr cq_dma_region, OwnPtr sq_dma_region, Memory::TypedMapping db_regs); void submit_sqe(NVMeSubmission& submission) override; virtual ~NVMeInterruptQueue() override {}; - virtual StringView purpose() const override { return "NVMe"sv; }; + virtual StringView purpose() const override { return "NVMe"sv; } void initialize_interrupt_queue(); protected: diff --git a/Kernel/Devices/Storage/NVMe/NVMeNameSpace.h b/Kernel/Devices/Storage/NVMe/NVMeNameSpace.h index 98009194b4..342c7d24e2 100644 --- a/Kernel/Devices/Storage/NVMe/NVMeNameSpace.h +++ b/Kernel/Devices/Storage/NVMe/NVMeNameSpace.h @@ -25,7 +25,7 @@ class NVMeNameSpace : public StorageDevice { public: static ErrorOr> try_create(NVMeController const&, Vector> queues, u16 nsid, size_t storage_size, size_t lba_size); - CommandSet command_set() const override { return CommandSet::NVMe; }; + CommandSet command_set() const override { return CommandSet::NVMe; } void start_request(AsyncBlockDeviceRequest& request) override; private: diff --git a/Kernel/Devices/Storage/NVMe/NVMeQueue.h b/Kernel/Devices/Storage/NVMe/NVMeQueue.h index 1a0d61c8c6..0afc18518d 100644 --- a/Kernel/Devices/Storage/NVMe/NVMeQueue.h +++ b/Kernel/Devices/Storage/NVMe/NVMeQueue.h @@ -43,7 +43,7 @@ class NVMeController; class NVMeQueue : public AtomicRefCounted { public: static ErrorOr> try_create(NVMeController& device, u16 qid, u8 irq, u32 q_depth, OwnPtr cq_dma_region, OwnPtr sq_dma_region, Memory::TypedMapping db_regs, QueueType queue_type); - bool is_admin_queue() { return m_admin_queue; }; + bool is_admin_queue() { return m_admin_queue; } u16 submit_sync_sqe(NVMeSubmission&); void read(AsyncBlockDeviceRequest& request, u16 nsid, u64 index, u32 count); void write(AsyncBlockDeviceRequest& request, u16 nsid, u64 index, u32 count); diff --git a/Kernel/FileSystem/BlockBasedFileSystem.h b/Kernel/FileSystem/BlockBasedFileSystem.h index 24a6f16cc7..c14e389231 100644 --- a/Kernel/FileSystem/BlockBasedFileSystem.h +++ b/Kernel/FileSystem/BlockBasedFileSystem.h @@ -17,7 +17,7 @@ public: virtual ~BlockBasedFileSystem() override; - u64 logical_block_size() const { return m_logical_block_size; }; + u64 logical_block_size() const { return m_logical_block_size; } virtual void flush_writes() override; void flush_writes_impl(); diff --git a/Kernel/FileSystem/FATFS/FileSystem.h b/Kernel/FileSystem/FATFS/FileSystem.h index d02f2c96ca..794d7200e2 100644 --- a/Kernel/FileSystem/FATFS/FileSystem.h +++ b/Kernel/FileSystem/FATFS/FileSystem.h @@ -41,7 +41,7 @@ private: static constexpr u32 first_data_cluster = 2; - FAT32BootRecord const* boot_record() const { return reinterpret_cast(m_boot_record->data()); }; + FAT32BootRecord const* boot_record() const { return reinterpret_cast(m_boot_record->data()); } BlockBasedFileSystem::BlockIndex first_block_of_cluster(u32 cluster) const; diff --git a/Kernel/FileSystem/Inode.h b/Kernel/FileSystem/Inode.h index e0acae019e..be477cd1ca 100644 --- a/Kernel/FileSystem/Inode.h +++ b/Kernel/FileSystem/Inode.h @@ -107,7 +107,7 @@ public: ErrorOr apply_flock(Process const&, OpenFileDescription const&, Userspace, ShouldBlock); ErrorOr get_flock(OpenFileDescription const&, Userspace) const; void remove_flocks_for_description(OpenFileDescription const&); - Thread::FlockBlockerSet& flock_blocker_set() { return m_flock_blocker_set; }; + Thread::FlockBlockerSet& flock_blocker_set() { return m_flock_blocker_set; } protected: Inode(FileSystem&, InodeIndex); diff --git a/Kernel/FileSystem/InodeWatcher.h b/Kernel/FileSystem/InodeWatcher.h index 8b8f23cec4..cded67fb70 100644 --- a/Kernel/FileSystem/InodeWatcher.h +++ b/Kernel/FileSystem/InodeWatcher.h @@ -53,7 +53,7 @@ public: virtual ErrorOr close() override; virtual ErrorOr> pseudo_path(OpenFileDescription const&) const override; - virtual StringView class_name() const override { return "InodeWatcher"sv; }; + virtual StringView class_name() const override { return "InodeWatcher"sv; } virtual bool is_inode_watcher() const override { return true; } void notify_inode_event(Badge, InodeIdentifier, InodeWatcherEvent::Type, StringView name = {}); diff --git a/Kernel/FileSystem/SysFS/Component.h b/Kernel/FileSystem/SysFS/Component.h index baebafe0b2..2352420306 100644 --- a/Kernel/FileSystem/SysFS/Component.h +++ b/Kernel/FileSystem/SysFS/Component.h @@ -31,7 +31,7 @@ public: virtual StringView name() const = 0; virtual ErrorOr read_bytes(off_t, size_t, UserOrKernelBuffer&, OpenFileDescription*) const { return Error::from_errno(ENOTIMPL); } virtual ErrorOr traverse_as_directory(FileSystemID, Function(FileSystem::DirectoryEntryView const&)>) const { VERIFY_NOT_REACHED(); } - virtual RefPtr lookup(StringView) { VERIFY_NOT_REACHED(); }; + virtual RefPtr lookup(StringView) { VERIFY_NOT_REACHED(); } virtual mode_t permissions() const; virtual ErrorOr truncate(u64) { return EPERM; } virtual size_t size() const { return 0; } @@ -40,7 +40,7 @@ public: virtual ErrorOr> to_inode(SysFS const&) const; - InodeIndex component_index() const { return m_component_index; }; + InodeIndex component_index() const { return m_component_index; } virtual ~SysFSComponent() = default; diff --git a/Kernel/Heap/Heap.h b/Kernel/Heap/Heap.h index 775bd86857..4b31352bbc 100644 --- a/Kernel/Heap/Heap.h +++ b/Kernel/Heap/Heap.h @@ -156,7 +156,7 @@ public: size_t total_chunks() const { return m_total_chunks; } size_t total_bytes() const { return m_total_chunks * CHUNK_SIZE; } - size_t free_chunks() const { return m_total_chunks - m_allocated_chunks; }; + size_t free_chunks() const { return m_total_chunks - m_allocated_chunks; } size_t free_bytes() const { return free_chunks() * CHUNK_SIZE; } size_t allocated_chunks() const { return m_allocated_chunks; } size_t allocated_bytes() const { return m_allocated_chunks * CHUNK_SIZE; } diff --git a/Kernel/Interrupts/GenericInterruptHandler.h b/Kernel/Interrupts/GenericInterruptHandler.h index cb2e492d5e..40249ba7a5 100644 --- a/Kernel/Interrupts/GenericInterruptHandler.h +++ b/Kernel/Interrupts/GenericInterruptHandler.h @@ -48,8 +48,8 @@ public: virtual bool eoi() = 0; void increment_call_count(); - void set_reserved() { m_reserved = true; }; - bool reserved() const { return m_reserved; }; + void set_reserved() { m_reserved = true; } + bool reserved() const { return m_reserved; } protected: void change_interrupt_number(u8 number); diff --git a/Kernel/Memory/Region.h b/Kernel/Memory/Region.h index d0573eeffe..be2a435f72 100644 --- a/Kernel/Memory/Region.h +++ b/Kernel/Memory/Region.h @@ -207,8 +207,8 @@ public: [[nodiscard]] bool mmapped_from_readable() const { return m_mmapped_from_readable; } [[nodiscard]] bool mmapped_from_writable() const { return m_mmapped_from_writable; } - void start_handling_page_fault(Badge) { m_in_progress_page_faults++; }; - void finish_handling_page_fault(Badge) { m_in_progress_page_faults--; }; + void start_handling_page_fault(Badge) { m_in_progress_page_faults++; } + void finish_handling_page_fault(Badge) { m_in_progress_page_faults--; } private: Region(); diff --git a/Kernel/Memory/RingBuffer.h b/Kernel/Memory/RingBuffer.h index 7e90512bf9..43ea60d6f4 100644 --- a/Kernel/Memory/RingBuffer.h +++ b/Kernel/Memory/RingBuffer.h @@ -26,7 +26,7 @@ public: size_t used_bytes() const { return m_num_used_bytes; } PhysicalAddress start_of_region() const { return m_region->physical_page(0)->paddr(); } VirtualAddress vaddr() const { return m_region->vaddr(); } - size_t bytes_till_end() const { return (m_capacity_in_bytes - ((m_start_of_used + m_num_used_bytes) % m_capacity_in_bytes)) % m_capacity_in_bytes; }; + size_t bytes_till_end() const { return (m_capacity_in_bytes - ((m_start_of_used + m_num_used_bytes) % m_capacity_in_bytes)) % m_capacity_in_bytes; } private: RingBuffer(NonnullOwnPtr region, size_t capacity); diff --git a/Kernel/Net/IPv4SocketTuple.h b/Kernel/Net/IPv4SocketTuple.h index 96b9e57d81..774e1132a9 100644 --- a/Kernel/Net/IPv4SocketTuple.h +++ b/Kernel/Net/IPv4SocketTuple.h @@ -24,15 +24,15 @@ public: , m_peer_address(peer_address) , m_peer_port(peer_port) {}; - IPv4Address local_address() const { return m_local_address; }; - u16 local_port() const { return m_local_port; }; - IPv4Address peer_address() const { return m_peer_address; }; - u16 peer_port() const { return m_peer_port; }; + IPv4Address local_address() const { return m_local_address; } + u16 local_port() const { return m_local_port; } + IPv4Address peer_address() const { return m_peer_address; } + u16 peer_port() const { return m_peer_port; } bool operator==(IPv4SocketTuple const& other) const { return other.local_address() == m_local_address && other.local_port() == m_local_port && other.peer_address() == m_peer_address && other.peer_port() == m_peer_port; - }; + } ErrorOr> to_string() const { diff --git a/Kernel/Net/Intel/E1000NetworkAdapter.h b/Kernel/Net/Intel/E1000NetworkAdapter.h index c9d9e93f10..bc42e48503 100644 --- a/Kernel/Net/Intel/E1000NetworkAdapter.h +++ b/Kernel/Net/Intel/E1000NetworkAdapter.h @@ -27,7 +27,7 @@ public: virtual ~E1000NetworkAdapter() override; virtual void send_raw(ReadonlyBytes) override; - virtual bool link_up() override { return m_link_up; }; + virtual bool link_up() override { return m_link_up; } virtual i32 link_speed() override; virtual bool link_full_duplex() override; diff --git a/Kernel/Security/Credentials.h b/Kernel/Security/Credentials.h index cc6b88052d..7f3f33d5f7 100644 --- a/Kernel/Security/Credentials.h +++ b/Kernel/Security/Credentials.h @@ -26,7 +26,7 @@ public: UserID suid() const { return m_suid; } GroupID sgid() const { return m_sgid; } ReadonlySpan extra_gids() const { return m_extra_gids.span(); } - SessionID sid() const { return m_sid; }; + SessionID sid() const { return m_sid; } ProcessGroupID pgid() const { return m_pgid; } bool in_group(GroupID) const; diff --git a/Kernel/Syscalls/execve.cpp b/Kernel/Syscalls/execve.cpp index 3f26682ce6..93363ca768 100644 --- a/Kernel/Syscalls/execve.cpp +++ b/Kernel/Syscalls/execve.cpp @@ -199,7 +199,7 @@ static ErrorOr get_required_load_range(OpenFileDescription& p VERIFY(range.end > range.start); return range; -}; +} static ErrorOr get_load_offset(const ElfW(Ehdr) & main_program_header, OpenFileDescription& main_program_description, OpenFileDescription* interpreter_description) { diff --git a/Kernel/Syscalls/realpath.cpp b/Kernel/Syscalls/realpath.cpp index 48bc990fa8..cc566030d0 100644 --- a/Kernel/Syscalls/realpath.cpp +++ b/Kernel/Syscalls/realpath.cpp @@ -26,6 +26,6 @@ ErrorOr Process::sys$realpath(Userspacecharacters(), size_to_copy)); // Note: we return the whole size here, not the copied size. return ideal_size; -}; +} } diff --git a/Kernel/Syscalls/uname.cpp b/Kernel/Syscalls/uname.cpp index 3b13fff8a9..9da13d0e6b 100644 --- a/Kernel/Syscalls/uname.cpp +++ b/Kernel/Syscalls/uname.cpp @@ -11,24 +11,25 @@ namespace Kernel { +#if ARCH(X86_64) +# define UNAME_MACHINE "x86_64" +#elif ARCH(AARCH64) +# define UNAME_MACHINE "AArch64" +#else +# error Unknown architecture +#endif + ErrorOr Process::sys$uname(Userspace user_buf) { VERIFY_NO_PROCESS_BIG_LOCK(this); TRY(require_promise(Pledge::stdio)); - utsname buf - { + utsname buf { "SerenityOS", - {}, // Hostname, filled in below. - {}, // "Release" (1.0-dev), filled in below. - {}, // "Revision" (git commit hash), filled in below. -#if ARCH(X86_64) - "x86_64", -#elif ARCH(AARCH64) - "AArch64", -#else -# error Unknown architecture -#endif + {}, // Hostname, filled in below. + {}, // "Release" (1.0-dev), filled in below. + {}, // "Revision" (git commit hash), filled in below. + UNAME_MACHINE }; auto version_string = TRY(KString::formatted("{}.{}-dev", SERENITY_MAJOR_REVISION, SERENITY_MINOR_REVISION)); diff --git a/Kernel/Tasks/FinalizerTask.cpp b/Kernel/Tasks/FinalizerTask.cpp index 94ab0241d6..643ea6f1c2 100644 --- a/Kernel/Tasks/FinalizerTask.cpp +++ b/Kernel/Tasks/FinalizerTask.cpp @@ -24,7 +24,7 @@ static void finalizer_task(void*) else g_finalizer_wait_queue->wait_forever(finalizer_task_name); } -}; +} UNMAP_AFTER_INIT void FinalizerTask::spawn() { diff --git a/Kernel/Tasks/Process.cpp b/Kernel/Tasks/Process.cpp index 6f78745af2..ebef656bc5 100644 --- a/Kernel/Tasks/Process.cpp +++ b/Kernel/Tasks/Process.cpp @@ -1066,7 +1066,7 @@ ErrorOr Process::try_set_coredump_property(StringView key, StringView valu auto key_kstring = TRY(KString::try_create(key)); auto value_kstring = TRY(KString::try_create(value)); return set_coredump_property(move(key_kstring), move(value_kstring)); -}; +} static constexpr StringView to_string(Pledge promise) { diff --git a/Kernel/Tasks/Process.h b/Kernel/Tasks/Process.h index 97b43bb3ce..fb42f7795c 100644 --- a/Kernel/Tasks/Process.h +++ b/Kernel/Tasks/Process.h @@ -484,13 +484,13 @@ public: RefPtr executable(); RefPtr executable() const; - UnixDateTime creation_time() const { return m_creation_time; }; + UnixDateTime creation_time() const { return m_creation_time; } static constexpr size_t max_arguments_size = Thread::default_userspace_stack_size / 8; static constexpr size_t max_environment_size = Thread::default_userspace_stack_size / 8; static constexpr size_t max_auxiliary_size = Thread::default_userspace_stack_size / 8; - Vector> const& arguments() const { return m_arguments; }; - Vector> const& environment() const { return m_environment; }; + Vector> const& arguments() const { return m_arguments; } + Vector> const& environment() const { return m_environment; } ErrorOr exec(NonnullOwnPtr path, Vector> arguments, Vector> environment, Thread*& new_main_thread, InterruptsState& previous_interrupts_state, int recursion_depth = 0); diff --git a/Kernel/Tasks/Thread.h b/Kernel/Tasks/Thread.h index b5aa4f0dba..74d33a89b6 100644 --- a/Kernel/Tasks/Thread.h +++ b/Kernel/Tasks/Thread.h @@ -1066,7 +1066,7 @@ public: ErrorOr> backtrace(); - Blocker const* blocker() const { return m_blocker; }; + Blocker const* blocker() const { return m_blocker; } Kernel::Mutex const* blocking_mutex() const { return m_blocking_mutex; } #if LOCK_DEBUG diff --git a/Kernel/Time/TimerQueue.h b/Kernel/Time/TimerQueue.h index 7258c33eca..84961d5ba3 100644 --- a/Kernel/Time/TimerQueue.h +++ b/Kernel/Time/TimerQueue.h @@ -63,7 +63,7 @@ private: void clear_cancelled() { return m_cancelled.store(false, AK::memory_order_release); } bool set_cancelled() { return m_cancelled.exchange(true, AK::memory_order_acq_rel); } - bool is_in_use() { return m_in_use.load(AK::memory_order_acquire); }; + bool is_in_use() { return m_in_use.load(AK::memory_order_acquire); } void set_in_use() { m_in_use.store(true, AK::memory_order_release); } void clear_in_use() { return m_in_use.store(false, AK::memory_order_release); } diff --git a/Ladybird/Tab.h b/Ladybird/Tab.h index 1228eabff2..49b2572ac5 100644 --- a/Ladybird/Tab.h +++ b/Ladybird/Tab.h @@ -53,7 +53,7 @@ public: void show_inspector_window(InspectorTarget = InspectorTarget::Document); void show_console_window(); - Ladybird::ConsoleWidget* console() { return m_console_widget; }; + Ladybird::ConsoleWidget* console() { return m_console_widget; } public slots: void focus_location_editor(); diff --git a/Meta/Lagom/Wasm/js_repl.cpp b/Meta/Lagom/Wasm/js_repl.cpp index 6d5673a007..955485d837 100644 --- a/Meta/Lagom/Wasm/js_repl.cpp +++ b/Meta/Lagom/Wasm/js_repl.cpp @@ -63,7 +63,7 @@ void displayln(CheckedFormatString format_string, Args const&... args) void displayln() { user_display("\n", 1); } class UserDisplayStream final : public Stream { - virtual ErrorOr read_some(Bytes) override { return Error::from_string_view("Not readable"sv); }; + virtual ErrorOr read_some(Bytes) override { return Error::from_string_view("Not readable"sv); } virtual ErrorOr write_some(ReadonlyBytes bytes) override { user_display(bit_cast(bytes.data()), bytes.size()); diff --git a/Tests/AK/TestCircularBuffer.cpp b/Tests/AK/TestCircularBuffer.cpp index 3ee57e0f02..ec563b3c51 100644 --- a/Tests/AK/TestCircularBuffer.cpp +++ b/Tests/AK/TestCircularBuffer.cpp @@ -20,7 +20,7 @@ void safe_write(CircularBuffer& buffer, u8 i) Bytes b { &i, 1 }; auto written_bytes = buffer.write(b); EXPECT_EQ(written_bytes, 1ul); -}; +} void safe_read(CircularBuffer& buffer, u8 supposed_result) { @@ -29,12 +29,12 @@ void safe_read(CircularBuffer& buffer, u8 supposed_result) b = buffer.read(b); EXPECT_EQ(b.size(), 1ul); EXPECT_EQ(*b.data(), supposed_result); -}; +} void safe_discard(CircularBuffer& buffer, size_t size) { TRY_OR_FAIL(buffer.discard(size)); -}; +} } diff --git a/Tests/AK/TestOptional.cpp b/Tests/AK/TestOptional.cpp index c0ee05859e..99c1da2153 100644 --- a/Tests/AK/TestOptional.cpp +++ b/Tests/AK/TestOptional.cpp @@ -186,13 +186,13 @@ TEST_CASE(test_copy_ctor_and_dtor_called) : m_was_move_constructed(other.m_was_move_constructed) { EXPECT(false); - }; + } MoveChecker(MoveChecker&& other) : m_was_move_constructed(other.m_was_move_constructed) { m_was_move_constructed = true; - }; + } bool& m_was_move_constructed; }; diff --git a/Tests/AK/TestTypeTraits.cpp b/Tests/AK/TestTypeTraits.cpp index fcd0e061c1..4e2c438dee 100644 --- a/Tests/AK/TestTypeTraits.cpp +++ b/Tests/AK/TestTypeTraits.cpp @@ -138,7 +138,7 @@ TEST_CASE(IsConvertible) }; struct C { A a; - operator A() { return a; }; + operator A() { return a; } }; struct D { }; diff --git a/Tests/LibCore/TestLibCoreArgsParser.cpp b/Tests/LibCore/TestLibCoreArgsParser.cpp index 21deb35be3..3363553618 100644 --- a/Tests/LibCore/TestLibCoreArgsParser.cpp +++ b/Tests/LibCore/TestLibCoreArgsParser.cpp @@ -314,7 +314,7 @@ TEST_CASE(combination_of_bool_options_with_positional_vector_string) parser.add_positional_argument(positionals, "pos", "pos", Core::ArgsParser::Required::No); }); EXPECT_EQ(parser_result.result, false); -}; +} TEST_CASE(stop_on_first_non_option) { diff --git a/Userland/Applets/Audio/main.cpp b/Userland/Applets/Audio/main.cpp index 52938f28c3..25b31e82d2 100644 --- a/Userland/Applets/Audio/main.cpp +++ b/Userland/Applets/Audio/main.cpp @@ -119,7 +119,7 @@ private: }; return {}; - }; + } public: virtual ~AudioWidget() override = default; diff --git a/Userland/Applications/3DFileViewer/main.cpp b/Userland/Applications/3DFileViewer/main.cpp index 00ddec96eb..1cc8ec34f7 100644 --- a/Userland/Applications/3DFileViewer/main.cpp +++ b/Userland/Applications/3DFileViewer/main.cpp @@ -38,7 +38,7 @@ public: void toggle_rotate_y() { m_rotate_y = !m_rotate_y; } void toggle_rotate_z() { m_rotate_z = !m_rotate_z; } void set_rotation_speed(float speed) { m_rotation_speed = speed; } - void set_stat_label(RefPtr l) { m_stats = l; }; + void set_stat_label(RefPtr l) { m_stats = l; } void set_wrap_s_mode(GLint mode) { m_wrap_s_mode = mode; } void set_wrap_t_mode(GLint mode) { m_wrap_t_mode = mode; } void set_texture_scale(float scale) { m_texture_scale = scale; } @@ -168,7 +168,7 @@ void GLContextWidget::resize_event(GUI::ResizeEvent& event) if (m_stats) m_stats->set_x(width() - m_stats->width() - 6); -}; +} void GLContextWidget::mousemove_event(GUI::MouseEvent& event) { diff --git a/Userland/Applications/AnalogClock/AnalogClock.cpp b/Userland/Applications/AnalogClock/AnalogClock.cpp index bd3975f9dd..c421a5680e 100644 --- a/Userland/Applications/AnalogClock/AnalogClock.cpp +++ b/Userland/Applications/AnalogClock/AnalogClock.cpp @@ -96,7 +96,7 @@ void AnalogClock::draw_hand(GUI::Painter& painter, double angle, double length, painter.draw_line(left_wing_point, indicator_point, palette().threed_highlight()); painter.draw_line(left_wing_point, tail_point, palette().threed_highlight()); } -}; +} void AnalogClock::draw_seconds_hand(GUI::Painter& painter, double angle) { diff --git a/Userland/Applications/Browser/ElementSizePreviewWidget.h b/Userland/Applications/Browser/ElementSizePreviewWidget.h index 691aaf00a7..dfe62f67d5 100644 --- a/Userland/Applications/Browser/ElementSizePreviewWidget.h +++ b/Userland/Applications/Browser/ElementSizePreviewWidget.h @@ -17,9 +17,9 @@ class ElementSizePreviewWidget final : public GUI::AbstractScrollableWidget { C_OBJECT(ElementSizePreviewWidget) public: - void set_box_model(Web::Layout::BoxModelMetrics box_model) { m_node_box_sizing = box_model; }; - void set_node_content_height(float height) { m_node_content_height = height; }; - void set_node_content_width(float width) { m_node_content_width = width; }; + void set_box_model(Web::Layout::BoxModelMetrics box_model) { m_node_box_sizing = box_model; } + void set_node_content_height(float height) { m_node_content_height = height; } + void set_node_content_width(float width) { m_node_content_width = width; } private: virtual void paint_event(GUI::PaintEvent&) override; diff --git a/Userland/Applications/DisplaySettings/ThemesSettingsWidget.cpp b/Userland/Applications/DisplaySettings/ThemesSettingsWidget.cpp index 3bec479b6c..36ec4cb92b 100644 --- a/Userland/Applications/DisplaySettings/ThemesSettingsWidget.cpp +++ b/Userland/Applications/DisplaySettings/ThemesSettingsWidget.cpp @@ -21,7 +21,7 @@ namespace DisplaySettings { static ErrorOr get_color_scheme_name_from_pathname(StringView color_scheme_path) { return TRY(String::from_deprecated_string(color_scheme_path.replace("/res/color-schemes/"sv, ""sv, ReplaceMode::FirstOnly).replace(".ini"sv, ""sv, ReplaceMode::FirstOnly))); -}; +} ErrorOr> ThemesSettingsWidget::try_create(bool& background_settings_changed) { diff --git a/Userland/Applications/Magnifier/MagnifierWidget.h b/Userland/Applications/Magnifier/MagnifierWidget.h index 99a1d757d5..5dd8d0ec54 100644 --- a/Userland/Applications/Magnifier/MagnifierWidget.h +++ b/Userland/Applications/Magnifier/MagnifierWidget.h @@ -34,7 +34,7 @@ public: void lock_location(bool); void display_previous_frame(); void display_next_frame(); - RefPtr current_bitmap() const { return m_grabbed_bitmap; }; + RefPtr current_bitmap() const { return m_grabbed_bitmap; } virtual Optional calculated_min_size() const override { diff --git a/Userland/Applications/Piano/TrackManager.h b/Userland/Applications/Piano/TrackManager.h index 8abffa0bf2..bdf5e25d50 100644 --- a/Userland/Applications/Piano/TrackManager.h +++ b/Userland/Applications/Piano/TrackManager.h @@ -27,7 +27,7 @@ public: ~TrackManager() = default; NonnullRefPtr current_track() { return *m_tracks[m_current_track]; } - size_t track_count() { return m_tracks.size(); }; + size_t track_count() { return m_tracks.size(); } size_t current_track_index() const { return m_current_track; } void set_current_track(size_t track_index) { diff --git a/Userland/Applications/PixelPaint/Guide.h b/Userland/Applications/PixelPaint/Guide.h index 6de1e5b59c..fdae6caf1a 100644 --- a/Userland/Applications/PixelPaint/Guide.h +++ b/Userland/Applications/PixelPaint/Guide.h @@ -28,7 +28,7 @@ public: static NonnullRefPtr construct(Orientation orientation, float offset) { return make_ref_counted(orientation, offset); - }; + } Orientation orientation() const { return m_orientation; } float offset() const { return m_offset; } diff --git a/Userland/Applications/PixelPaint/ImageEditor.h b/Userland/Applications/PixelPaint/ImageEditor.h index a349ecb323..da8b03c0d8 100644 --- a/Userland/Applications/PixelPaint/ImageEditor.h +++ b/Userland/Applications/PixelPaint/ImageEditor.h @@ -125,7 +125,7 @@ public: void set_unmodified(); void update_modified(); Function on_appended_status_info_change; - DeprecatedString appended_status_info() { return m_appended_status_info; }; + DeprecatedString appended_status_info() { return m_appended_status_info; } void set_appended_status_info(DeprecatedString); DeprecatedString generate_unique_layer_name(DeprecatedString const& original_layer_name); diff --git a/Userland/Applications/PixelPaint/Tools/Tool.h b/Userland/Applications/PixelPaint/Tools/Tool.h index 579f0fdb70..393c37b0e8 100644 --- a/Userland/Applications/PixelPaint/Tools/Tool.h +++ b/Userland/Applications/PixelPaint/Tools/Tool.h @@ -83,7 +83,7 @@ public: virtual StringView tool_name() const = 0; // We only set the override_alt_key flag to true since the override is false by default. If false is desired do not call method. - virtual bool is_overriding_alt() { return false; }; + virtual bool is_overriding_alt() { return false; } protected: Tool() = default; diff --git a/Userland/Applications/SpaceAnalyzer/Tree.h b/Userland/Applications/SpaceAnalyzer/Tree.h index f37ff8075b..663f261434 100644 --- a/Userland/Applications/SpaceAnalyzer/Tree.h +++ b/Userland/Applications/SpaceAnalyzer/Tree.h @@ -54,7 +54,7 @@ public: TreeNode& root() { return m_root; - }; + } private: Tree(DeprecatedString root_name) diff --git a/Userland/Applications/Spreadsheet/ImportDialog.cpp b/Userland/Applications/Spreadsheet/ImportDialog.cpp index 242621b0ed..19d830b52b 100644 --- a/Userland/Applications/Spreadsheet/ImportDialog.cpp +++ b/Userland/Applications/Spreadsheet/ImportDialog.cpp @@ -146,7 +146,7 @@ auto CSVImportDialogPage::make_reader() -> Optional behaviors = behaviors | Reader::ParserBehavior::TrimTrailingFieldSpaces; return Reader::XSV(m_csv, move(traits), behaviors); -}; +} void CSVImportDialogPage::update_preview() diff --git a/Userland/Applications/Spreadsheet/SpreadsheetView.h b/Userland/Applications/Spreadsheet/SpreadsheetView.h index 829b98a151..a040416ba1 100644 --- a/Userland/Applications/Spreadsheet/SpreadsheetView.h +++ b/Userland/Applications/Spreadsheet/SpreadsheetView.h @@ -107,7 +107,7 @@ public: void move_cursor(GUI::AbstractView::CursorMovement); - NonnullRefPtr model() { return m_sheet_model; }; + NonnullRefPtr model() { return m_sheet_model; } private: virtual void hide_event(GUI::HideEvent&) override; diff --git a/Userland/Applications/SystemMonitor/ThreadStackWidget.cpp b/Userland/Applications/SystemMonitor/ThreadStackWidget.cpp index 5be4316650..00e5a8c838 100644 --- a/Userland/Applications/SystemMonitor/ThreadStackWidget.cpp +++ b/Userland/Applications/SystemMonitor/ThreadStackWidget.cpp @@ -26,8 +26,8 @@ class ThreadStackModel final : public GUI::Model { }; public: - int column_count(GUI::ModelIndex const&) const override { return 3; }; - int row_count(GUI::ModelIndex const&) const override { return m_symbols.size(); }; + int column_count(GUI::ModelIndex const&) const override { return 3; } + int row_count(GUI::ModelIndex const&) const override { return m_symbols.size(); } bool is_column_sortable(int) const override { return false; } ErrorOr column_name(int column) const override @@ -57,7 +57,7 @@ public: default: VERIFY_NOT_REACHED(); } - }; + } void set_symbols(Vector const& symbols) { diff --git a/Userland/DevTools/GMLPlayground/MainWidget.cpp b/Userland/DevTools/GMLPlayground/MainWidget.cpp index fc43f5988f..bfa729988f 100644 --- a/Userland/DevTools/GMLPlayground/MainWidget.cpp +++ b/Userland/DevTools/GMLPlayground/MainWidget.cpp @@ -115,7 +115,7 @@ MainWidget::MainWidget() void MainWidget::update_title() { window()->set_title(DeprecatedString::formatted("{}[*] - GML Playground", m_file_path.is_empty() ? "Untitled"sv : m_file_path.view())); -}; +} void MainWidget::load_file(FileSystemAccessClient::File file) { @@ -130,7 +130,7 @@ void MainWidget::load_file(FileSystemAccessClient::File file) update_title(); GUI::Application::the()->set_most_recently_open_file(file.filename()); -}; +} ErrorOr MainWidget::initialize_menubar(GUI::Window& window) { diff --git a/Userland/DevTools/HackStudio/Git/GitWidget.h b/Userland/DevTools/HackStudio/Git/GitWidget.h index 7bc7180a37..5240662bef 100644 --- a/Userland/DevTools/HackStudio/Git/GitWidget.h +++ b/Userland/DevTools/HackStudio/Git/GitWidget.h @@ -23,7 +23,7 @@ public: void refresh(); void set_view_diff_callback(ViewDiffCallback callback); - bool initialized() const { return !m_git_repo.is_null(); }; + bool initialized() const { return !m_git_repo.is_null(); } void change_repo(DeprecatedString const& repo_root); private: diff --git a/Userland/DevTools/HackStudio/HackStudioWidget.cpp b/Userland/DevTools/HackStudio/HackStudioWidget.cpp index b86a778b60..9f62f95f4f 100644 --- a/Userland/DevTools/HackStudio/HackStudioWidget.cpp +++ b/Userland/DevTools/HackStudio/HackStudioWidget.cpp @@ -1167,7 +1167,7 @@ void HackStudioWidget::run() void HackStudioWidget::hide_action_tabs() { m_action_tab_widget->set_preferred_height(24); -}; +} Project& HackStudioWidget::project() { diff --git a/Userland/DevTools/Profiler/FilesystemEventModel.h b/Userland/DevTools/Profiler/FilesystemEventModel.h index 784484ecd6..68963ebf9d 100644 --- a/Userland/DevTools/Profiler/FilesystemEventModel.h +++ b/Userland/DevTools/Profiler/FilesystemEventModel.h @@ -27,7 +27,7 @@ public: Vector>& children() { return m_children; } Vector> const& children() const { return m_children; } - FileEventNode* parent() { return m_parent; }; + FileEventNode* parent() { return m_parent; } FileEventNode& create_recursively(DeprecatedString); diff --git a/Userland/DevTools/Profiler/PercentageFormatting.h b/Userland/DevTools/Profiler/PercentageFormatting.h index cf6bdc383b..7d9716fd83 100644 --- a/Userland/DevTools/Profiler/PercentageFormatting.h +++ b/Userland/DevTools/Profiler/PercentageFormatting.h @@ -23,6 +23,6 @@ DeprecatedString format_percentage(auto value, auto total) "{}.{:02}", percentage_full_precision / percent_digits_rounding, percentage_full_precision % percent_digits_rounding); -}; +} } diff --git a/Userland/DevTools/Profiler/Profile.h b/Userland/DevTools/Profiler/Profile.h index b204045744..433d1a2668 100644 --- a/Userland/DevTools/Profiler/Profile.h +++ b/Userland/DevTools/Profiler/Profile.h @@ -84,7 +84,7 @@ public: auto new_child = ProfileNode::create(m_process, object_name, move(symbol), address, offset, timestamp, pid); add_child(new_child); return new_child; - }; + } ProfileNode* parent() { return m_parent; } ProfileNode const* parent() const { return m_parent; } diff --git a/Userland/DevTools/UserspaceEmulator/Region.h b/Userland/DevTools/UserspaceEmulator/Region.h index 9309ae38a5..79b8458dd8 100644 --- a/Userland/DevTools/UserspaceEmulator/Region.h +++ b/Userland/DevTools/UserspaceEmulator/Region.h @@ -70,7 +70,7 @@ public: protected: Region(u32 base, u32 size, bool mmap = false); - void set_range(Range r) { m_range = r; }; + void set_range(Range r) { m_range = r; } private: Emulator& m_emulator; diff --git a/Userland/DevTools/UserspaceEmulator/SoftCPU.cpp b/Userland/DevTools/UserspaceEmulator/SoftCPU.cpp index 0dac808670..f6d7bda34b 100644 --- a/Userland/DevTools/UserspaceEmulator/SoftCPU.cpp +++ b/Userland/DevTools/UserspaceEmulator/SoftCPU.cpp @@ -3184,8 +3184,8 @@ void SoftCPU::CVTSD2SS_xmm1_xmm2m64(X86::Instruction const&) { TODO_INSN(); } void SoftCPU::CVTDQ2PS_xmm1_xmm2m128(X86::Instruction const&) { TODO_INSN(); } void SoftCPU::CVTPS2DQ_xmm1_xmm2m128(X86::Instruction const&) { TODO_INSN(); } void SoftCPU::CVTTPS2DQ_xmm1_xmm2m128(X86::Instruction const&) { TODO_INSN(); } -void SoftCPU::SUBPD_xmm1_xmm2m128(X86::Instruction const&) { TODO_INSN(); }; -void SoftCPU::SUBSD_xmm1_xmm2m32(X86::Instruction const&) { TODO_INSN(); }; +void SoftCPU::SUBPD_xmm1_xmm2m128(X86::Instruction const&) { TODO_INSN(); } +void SoftCPU::SUBSD_xmm1_xmm2m32(X86::Instruction const&) { TODO_INSN(); } void SoftCPU::MINPD_xmm1_xmm2m128(X86::Instruction const&) { TODO_INSN(); } void SoftCPU::MINSD_xmm1_xmm2m32(X86::Instruction const&) { TODO_INSN(); } void SoftCPU::DIVPD_xmm1_xmm2m128(X86::Instruction const&) { TODO_INSN(); } diff --git a/Userland/DevTools/UserspaceEmulator/SoftCPU.h b/Userland/DevTools/UserspaceEmulator/SoftCPU.h index 250e3e07cf..3fbfde7681 100644 --- a/Userland/DevTools/UserspaceEmulator/SoftCPU.h +++ b/Userland/DevTools/UserspaceEmulator/SoftCPU.h @@ -294,7 +294,7 @@ public: long double fpu_get(u8 index) { return m_fpu.fpu_get(index); } long double fpu_pop() { return m_fpu.fpu_pop(); } - MMX mmx_get(u8 index) const { return m_fpu.mmx_get(index); }; + MMX mmx_get(u8 index) const { return m_fpu.mmx_get(index); } void set_eax(ValueWithShadow value) { gpr32(X86::RegisterEAX) = value; } void set_ebx(ValueWithShadow value) { gpr32(X86::RegisterEBX) = value; } diff --git a/Userland/DevTools/UserspaceEmulator/SoftFPU.cpp b/Userland/DevTools/UserspaceEmulator/SoftFPU.cpp index dd39aeaff5..e0b74eee54 100644 --- a/Userland/DevTools/UserspaceEmulator/SoftFPU.cpp +++ b/Userland/DevTools/UserspaceEmulator/SoftFPU.cpp @@ -1133,7 +1133,7 @@ void SoftFPU::FNINIT(const X86::Instruction&) m_fpu_ds = 0; m_fpu_iop = 0; -}; +} void SoftFPU::FNCLEX(const X86::Instruction&) { m_fpu_error_invalid = 0; @@ -1718,7 +1718,7 @@ void SoftFPU::MOVD_mm1_rm32(const X86::Instruction& insn) // upper half is zeroed out mmx_set(mmx_index, { .raw = insn.modrm().read32(m_cpu, insn).value() }); mmx_common(); -}; +} void SoftFPU::MOVD_rm32_mm2(const X86::Instruction& insn) { VERIFY(!insn.has_operand_size_override_prefix()); /* SSE2 */ @@ -1727,7 +1727,7 @@ void SoftFPU::MOVD_rm32_mm2(const X86::Instruction& insn) insn.modrm().write32(m_cpu, insn, shadow_wrap_as_initialized(static_cast(mmx_get(mmx_index).raw))); mmx_common(); -}; +} void SoftFPU::MOVQ_mm1_mm2m64(const X86::Instruction& insn) { @@ -1757,8 +1757,8 @@ void SoftFPU::MOVQ_mm1m64_mm2(const X86::Instruction& insn) } mmx_common(); } -void SoftFPU::MOVQ_mm1_rm64(const X86::Instruction&) { TODO_INSN(); }; // long mode -void SoftFPU::MOVQ_rm64_mm2(const X86::Instruction&) { TODO_INSN(); }; // long mode +void SoftFPU::MOVQ_mm1_rm64(const X86::Instruction&) { TODO_INSN(); } // long mode +void SoftFPU::MOVQ_rm64_mm2(const X86::Instruction&) { TODO_INSN(); } // long mode // EMPTY MMX STATE void SoftFPU::EMMS(const X86::Instruction&) diff --git a/Userland/Games/2048/Game.cpp b/Userland/Games/2048/Game.cpp index 51bb55a863..70f29fd840 100644 --- a/Userland/Games/2048/Game.cpp +++ b/Userland/Games/2048/Game.cpp @@ -152,7 +152,7 @@ static bool has_no_neighbors(ReadonlySpan const& row) return false; return has_no_neighbors(row.slice(1, row.size() - 1)); -}; +} bool Game::Board::is_stalled() { diff --git a/Userland/Games/Chess/ChessWidget.h b/Userland/Games/Chess/ChessWidget.h index effd928e2b..79a5665a23 100644 --- a/Userland/Games/Chess/ChessWidget.h +++ b/Userland/Games/Chess/ChessWidget.h @@ -33,17 +33,17 @@ public: virtual void mousemove_event(GUI::MouseEvent&) override; virtual void keydown_event(GUI::KeyEvent&) override; - Chess::Board& board() { return m_board; }; - Chess::Board const& board() const { return m_board; }; + Chess::Board& board() { return m_board; } + Chess::Board const& board() const { return m_board; } - Chess::Board& board_playback() { return m_board_playback; }; - Chess::Board const& board_playback() const { return m_board_playback; }; + Chess::Board& board_playback() { return m_board_playback; } + Chess::Board const& board_playback() const { return m_board_playback; } - Chess::Color side() const { return m_side; }; - void set_side(Chess::Color side) { m_side = side; }; + Chess::Color side() const { return m_side; } + void set_side(Chess::Color side) { m_side = side; } void set_piece_set(StringView set); - DeprecatedString const& piece_set() const { return m_piece_set; }; + DeprecatedString const& piece_set() const { return m_piece_set; } Optional mouse_to_square(GUI::MouseEvent& event) const; diff --git a/Userland/Games/GameOfLife/Pattern.h b/Userland/Games/GameOfLife/Pattern.h index 9a445a4d56..e603d1dde2 100644 --- a/Userland/Games/GameOfLife/Pattern.h +++ b/Userland/Games/GameOfLife/Pattern.h @@ -15,7 +15,7 @@ class Pattern final { public: Pattern(Vector); - Vector pattern() { return m_pattern; }; + Vector pattern() { return m_pattern; } GUI::Action* action() { return m_action; } void set_action(GUI::Action*); void rotate_clockwise(); diff --git a/Userland/Games/Hearts/Game.cpp b/Userland/Games/Hearts/Game.cpp index 2da8c16a16..dd273a8b0f 100644 --- a/Userland/Games/Hearts/Game.cpp +++ b/Userland/Games/Hearts/Game.cpp @@ -91,7 +91,7 @@ Game::Game() }; reset(); -}; +} void Game::reset() { diff --git a/Userland/Libraries/LibArchive/TarStream.h b/Userland/Libraries/LibArchive/TarStream.h index 070d067cda..71bbaf1277 100644 --- a/Userland/Libraries/LibArchive/TarStream.h +++ b/Userland/Libraries/LibArchive/TarStream.h @@ -21,7 +21,7 @@ public: virtual ErrorOr read_some(Bytes) override; virtual ErrorOr write_some(ReadonlyBytes) override; virtual bool is_eof() const override; - virtual bool is_open() const override { return true; }; + virtual bool is_open() const override { return true; } virtual void close() override {}; private: diff --git a/Userland/Libraries/LibAudio/Loader.h b/Userland/Libraries/LibAudio/Loader.h index 04dbc200d8..2e103416fb 100644 --- a/Userland/Libraries/LibAudio/Loader.h +++ b/Userland/Libraries/LibAudio/Loader.h @@ -74,7 +74,7 @@ public: virtual PcmSampleFormat pcm_format() = 0; Metadata const& metadata() const { return m_metadata; } - Vector const& pictures() const { return m_pictures; }; + Vector const& pictures() const { return m_pictures; } protected: NonnullOwnPtr m_stream; @@ -111,7 +111,7 @@ public: u16 bits_per_sample() const { return pcm_bits_per_sample(m_plugin->pcm_format()); } PcmSampleFormat pcm_format() const { return m_plugin->pcm_format(); } Metadata const& metadata() const { return m_plugin->metadata(); } - Vector const& pictures() const { return m_plugin->pictures(); }; + Vector const& pictures() const { return m_plugin->pictures(); } private: static ErrorOr, LoaderError> create_plugin(NonnullOwnPtr stream); diff --git a/Userland/Libraries/LibC/stdlib.cpp b/Userland/Libraries/LibC/stdlib.cpp index bedd5f4675..d1e7139461 100644 --- a/Userland/Libraries/LibC/stdlib.cpp +++ b/Userland/Libraries/LibC/stdlib.cpp @@ -125,7 +125,7 @@ public: return DigitConsumeDecision::Consumed; } - T number() const { return m_num; }; + T number() const { return m_num; } private: bool can_append_digit(int digit) diff --git a/Userland/Libraries/LibCards/Card.h b/Userland/Libraries/LibCards/Card.h index 7bf0570ec8..0083e8291f 100644 --- a/Userland/Libraries/LibCards/Card.h +++ b/Userland/Libraries/LibCards/Card.h @@ -91,7 +91,7 @@ public: Gfx::IntRect const& rect() const { return m_rect; } Gfx::IntPoint position() const { return m_rect.location(); } Gfx::IntPoint old_position() const { return m_old_position; } - Rank rank() const { return m_rank; }; + Rank rank() const { return m_rank; } Suit suit() const { return m_suit; } bool is_old_position_valid() const { return m_old_position_valid; } diff --git a/Userland/Libraries/LibCodeComprehension/Types.h b/Userland/Libraries/LibCodeComprehension/Types.h index 67f0bc2a4a..d5943cd28b 100644 --- a/Userland/Libraries/LibCodeComprehension/Types.h +++ b/Userland/Libraries/LibCodeComprehension/Types.h @@ -105,7 +105,7 @@ struct TokenInfo { #undef __SEMANTIC } VERIFY_NOT_REACHED(); - }; + } }; struct TodoEntry { diff --git a/Userland/Libraries/LibCompress/DeflateTables.h b/Userland/Libraries/LibCompress/DeflateTables.h index f069e046e6..339750a7b6 100644 --- a/Userland/Libraries/LibCompress/DeflateTables.h +++ b/Userland/Libraries/LibCompress/DeflateTables.h @@ -112,7 +112,7 @@ static consteval Array generate_length_to_symbol() array[len] = packed_length_symbols[base_length].symbol; } return array; -}; +} static constexpr auto length_to_symbol = generate_length_to_symbol(); static consteval Array generate_distance_to_base_lo() @@ -125,7 +125,7 @@ static consteval Array generate_distance_to_base_lo() array[dist - 1] = packed_distances[base_distance].symbol; } return array; -}; +} static constexpr auto distance_to_base_lo = generate_distance_to_base_lo(); static consteval Array generate_distance_to_base_hi() { @@ -137,7 +137,7 @@ static consteval Array generate_distance_to_base_hi() array[(dist - 1) >> 7] = packed_distances[base_distance].symbol; } return array; -}; +} static constexpr auto distance_to_base_hi = generate_distance_to_base_hi(); static consteval Array generate_fixed_literal_bit_lengths() @@ -147,7 +147,7 @@ static consteval Array generate_fixed_literal_bit_lengths() array.span().slice(fixed_literal_bits[i].base_value, fixed_literal_bits[i + 1].base_value - fixed_literal_bits[i].base_value).fill(fixed_literal_bits[i].bits); } return array; -}; +} static constexpr auto fixed_literal_bit_lengths = generate_fixed_literal_bit_lengths(); static consteval Array generate_fixed_distance_bit_lengths() @@ -155,7 +155,7 @@ static consteval Array generate_fixed_distance_bit_lengths() Array array; array.fill(5); return array; -}; +} static constexpr auto fixed_distance_bit_lengths = generate_fixed_distance_bit_lengths(); static consteval u8 reverse8(u8 value) diff --git a/Userland/Libraries/LibCompress/Lzma.cpp b/Userland/Libraries/LibCompress/Lzma.cpp index 04a0b74012..568dc39241 100644 --- a/Userland/Libraries/LibCompress/Lzma.cpp +++ b/Userland/Libraries/LibCompress/Lzma.cpp @@ -860,7 +860,7 @@ void LzmaState::update_state_after_match() m_state = 7; else m_state = 10; -}; +} void LzmaState::update_state_after_rep() { diff --git a/Userland/Libraries/LibCore/Account.h b/Userland/Libraries/LibCore/Account.h index dbec2113e3..acd9e81c4d 100644 --- a/Userland/Libraries/LibCore/Account.h +++ b/Userland/Libraries/LibCore/Account.h @@ -52,7 +52,7 @@ public: void set_gid(gid_t gid) { m_gid = gid; } void set_shell(StringView shell) { m_shell = shell; } void set_gecos(StringView gecos) { m_gecos = gecos; } - void set_deleted() { m_deleted = true; }; + void set_deleted() { m_deleted = true; } void set_extra_gids(Vector extra_gids) { m_extra_gids = move(extra_gids); } void delete_password(); diff --git a/Userland/Libraries/LibCore/ArgsParser.h b/Userland/Libraries/LibCore/ArgsParser.h index 1a1c900fc0..d73841b539 100644 --- a/Userland/Libraries/LibCore/ArgsParser.h +++ b/Userland/Libraries/LibCore/ArgsParser.h @@ -77,7 +77,7 @@ public: } // *Without* trailing newline! - void set_general_help(char const* help_string) { m_general_help = help_string; }; + void set_general_help(char const* help_string) { m_general_help = help_string; } void set_stop_on_first_non_option(bool stop_on_first_non_option) { m_stop_on_first_non_option = stop_on_first_non_option; } void print_usage(FILE*, StringView argv0); void print_usage_terminal(FILE*, StringView argv0); diff --git a/Userland/Libraries/LibCore/Debounce.h b/Userland/Libraries/LibCore/Debounce.h index d4a3fae820..02dec51a61 100644 --- a/Userland/Libraries/LibCore/Debounce.h +++ b/Userland/Libraries/LibCore/Debounce.h @@ -24,6 +24,6 @@ auto debounce(int timeout, TFunction function) } timer->start(); }; -}; +} } diff --git a/Userland/Libraries/LibCore/DirectoryEntry.cpp b/Userland/Libraries/LibCore/DirectoryEntry.cpp index 8603922676..4a3f762ef1 100644 --- a/Userland/Libraries/LibCore/DirectoryEntry.cpp +++ b/Userland/Libraries/LibCore/DirectoryEntry.cpp @@ -42,6 +42,6 @@ DirectoryEntry DirectoryEntry::from_dirent(dirent const& de) .type = directory_entry_type_from_posix(de.d_type), .name = de.d_name, }; -}; +} } diff --git a/Userland/Libraries/LibCore/Socket.h b/Userland/Libraries/LibCore/Socket.h index aca07477e7..55e18cdaea 100644 --- a/Userland/Libraries/LibCore/Socket.h +++ b/Userland/Libraries/LibCore/Socket.h @@ -179,8 +179,8 @@ public: virtual ErrorOr read_some(Bytes buffer) override { return m_helper.read(buffer, default_flags()); } virtual ErrorOr write_some(ReadonlyBytes buffer) override { return m_helper.write(buffer, default_flags()); } virtual bool is_eof() const override { return m_helper.is_eof(); } - virtual bool is_open() const override { return m_helper.is_open(); }; - virtual void close() override { m_helper.close(); }; + virtual bool is_open() const override { return m_helper.is_open(); } + virtual void close() override { m_helper.close(); } virtual ErrorOr pending_bytes() const override { return m_helper.pending_bytes(); } virtual ErrorOr can_read_without_blocking(int timeout = 0) const override { return m_helper.can_read_without_blocking(timeout); } virtual void set_notifications_enabled(bool enabled) override diff --git a/Userland/Libraries/LibCore/UDPServer.h b/Userland/Libraries/LibCore/UDPServer.h index 53e1407c57..f94f33a0a6 100644 --- a/Userland/Libraries/LibCore/UDPServer.h +++ b/Userland/Libraries/LibCore/UDPServer.h @@ -29,7 +29,7 @@ public: { struct sockaddr_in saddr; return receive(size, saddr); - }; + } ErrorOr send(ReadonlyBytes, sockaddr_in const& to); diff --git a/Userland/Libraries/LibCpp/AST.h b/Userland/Libraries/LibCpp/AST.h index d0f3c5725c..2e3c717afb 100644 --- a/Userland/Libraries/LibCpp/AST.h +++ b/Userland/Libraries/LibCpp/AST.h @@ -466,7 +466,7 @@ public: { } - void append_dimension(StringView dim) { m_dimensions.append(dim); }; + void append_dimension(StringView dim) { m_dimensions.append(dim); } private: Vector m_dimensions; diff --git a/Userland/Libraries/LibCpp/SemanticSyntaxHighlighter.h b/Userland/Libraries/LibCpp/SemanticSyntaxHighlighter.h index 21c9dc4baf..eb8787e67d 100644 --- a/Userland/Libraries/LibCpp/SemanticSyntaxHighlighter.h +++ b/Userland/Libraries/LibCpp/SemanticSyntaxHighlighter.h @@ -35,8 +35,8 @@ public: virtual bool is_cpp_semantic_highlighter() const override { return true; } protected: - virtual Vector matching_token_pairs_impl() const override { return m_simple_syntax_highlighter.matching_token_pairs_impl(); }; - virtual bool token_types_equal(u64 token1, u64 token2) const override { return m_simple_syntax_highlighter.token_types_equal(token1, token2); }; + virtual Vector matching_token_pairs_impl() const override { return m_simple_syntax_highlighter.matching_token_pairs_impl(); } + virtual bool token_types_equal(u64 token1, u64 token2) const override { return m_simple_syntax_highlighter.token_types_equal(token1, token2); } private: void update_spans(Vector const&, Gfx::Palette const&); diff --git a/Userland/Libraries/LibCrypto/BigFraction/BigFraction.cpp b/Userland/Libraries/LibCrypto/BigFraction/BigFraction.cpp index 028ec45e47..f7694db5a7 100644 --- a/Userland/Libraries/LibCrypto/BigFraction/BigFraction.cpp +++ b/Userland/Libraries/LibCrypto/BigFraction/BigFraction.cpp @@ -39,7 +39,7 @@ BigFraction::BigFraction(StringView sv) auto fraction_length = UnsignedBigInteger(static_cast(fraction_part_view.length())); *this = BigFraction(move(integer_part)) + BigFraction(move(fractional_part), NumberTheory::Power("10"_bigint, move(fraction_length))); -}; +} BigFraction BigFraction::operator+(BigFraction const& rhs) const { diff --git a/Userland/Libraries/LibCrypto/BigInt/SignedBigInteger.h b/Userland/Libraries/LibCrypto/BigInt/SignedBigInteger.h index 28d79deda4..83168baa97 100644 --- a/Userland/Libraries/LibCrypto/BigInt/SignedBigInteger.h +++ b/Userland/Libraries/LibCrypto/BigInt/SignedBigInteger.h @@ -108,7 +108,7 @@ public: // These get + 1 byte for the sign. [[nodiscard]] size_t length() const { return m_unsigned_data.length() + 1; } - [[nodiscard]] size_t trimmed_length() const { return m_unsigned_data.trimmed_length() + 1; }; + [[nodiscard]] size_t trimmed_length() const { return m_unsigned_data.trimmed_length() + 1; } [[nodiscard]] SignedBigInteger plus(SignedBigInteger const& other) const; [[nodiscard]] SignedBigInteger minus(SignedBigInteger const& other) const; diff --git a/Userland/Libraries/LibCrypto/Checksum/Adler32.cpp b/Userland/Libraries/LibCrypto/Checksum/Adler32.cpp index 8cfcd4d0bb..93406c10e3 100644 --- a/Userland/Libraries/LibCrypto/Checksum/Adler32.cpp +++ b/Userland/Libraries/LibCrypto/Checksum/Adler32.cpp @@ -16,7 +16,7 @@ void Adler32::update(ReadonlyBytes data) m_state_a = (m_state_a + data.at(i)) % 65521; m_state_b = (m_state_b + m_state_a) % 65521; } -}; +} u32 Adler32::digest() { diff --git a/Userland/Libraries/LibCrypto/Checksum/CRC32.cpp b/Userland/Libraries/LibCrypto/Checksum/CRC32.cpp index e837611d46..8979ab1d49 100644 --- a/Userland/Libraries/LibCrypto/Checksum/CRC32.cpp +++ b/Userland/Libraries/LibCrypto/Checksum/CRC32.cpp @@ -41,7 +41,7 @@ void CRC32::update(ReadonlyBytes span) ++data; --size; } -}; +} // FIXME: On Intel, use _mm_crc32_u8 / _mm_crc32_u64 if available (SSE 4.2). @@ -133,7 +133,7 @@ void CRC32::update(ReadonlyBytes data) for (auto byte : aligned_data) m_state = single_byte_crc(m_state, byte); -}; +} # else @@ -164,7 +164,7 @@ void CRC32::update(ReadonlyBytes data) for (size_t i = 0; i < data.size(); i++) { m_state = table[(m_state ^ data.at(i)) & 0xFF] ^ (m_state >> 8); } -}; +} # endif #endif diff --git a/Userland/Libraries/LibCrypto/Cipher/AES.h b/Userland/Libraries/LibCrypto/Cipher/AES.h index 24b6c33f72..16747cd5a3 100644 --- a/Userland/Libraries/LibCrypto/Cipher/AES.h +++ b/Userland/Libraries/LibCrypto/Cipher/AES.h @@ -34,7 +34,7 @@ public: CipherBlock::overwrite(data, length); } - constexpr static size_t block_size() { return BlockSizeInBits / 8; }; + constexpr static size_t block_size() { return BlockSizeInBits / 8; } virtual ReadonlyBytes bytes() const override { return ReadonlyBytes { m_data, sizeof(m_data) }; } virtual Bytes bytes() override { return Bytes { m_data, sizeof(m_data) }; } @@ -59,10 +59,10 @@ private: }; struct AESCipherKey : public CipherKey { - virtual ReadonlyBytes bytes() const override { return ReadonlyBytes { m_rd_keys, sizeof(m_rd_keys) }; }; + virtual ReadonlyBytes bytes() const override { return ReadonlyBytes { m_rd_keys, sizeof(m_rd_keys) }; } virtual void expand_encrypt_key(ReadonlyBytes user_key, size_t bits) override; virtual void expand_decrypt_key(ReadonlyBytes user_key, size_t bits) override; - static bool is_valid_key_size(size_t bits) { return bits == 128 || bits == 192 || bits == 256; }; + static bool is_valid_key_size(size_t bits) { return bits == 128 || bits == 192 || bits == 256; } #ifndef KERNEL DeprecatedString to_deprecated_string() const; @@ -114,8 +114,8 @@ public: { } - virtual AESCipherKey const& key() const override { return m_key; }; - virtual AESCipherKey& key() override { return m_key; }; + virtual AESCipherKey const& key() const override { return m_key; } + virtual AESCipherKey& key() override { return m_key; } virtual void encrypt_block(BlockType const& in, BlockType& out) override; virtual void decrypt_block(BlockType const& in, BlockType& out) override; diff --git a/Userland/Libraries/LibCrypto/Cipher/Cipher.h b/Userland/Libraries/LibCrypto/Cipher/Cipher.h index 9af2440d35..bcf5db362d 100644 --- a/Userland/Libraries/LibCrypto/Cipher/Cipher.h +++ b/Userland/Libraries/LibCrypto/Cipher/Cipher.h @@ -81,7 +81,7 @@ private: struct CipherKey { virtual ReadonlyBytes bytes() const = 0; - static bool is_valid_key_size(size_t) { return false; }; + static bool is_valid_key_size(size_t) { return false; } virtual ~CipherKey() = default; diff --git a/Userland/Libraries/LibCrypto/Curves/Ed25519.cpp b/Userland/Libraries/LibCrypto/Curves/Ed25519.cpp index 4f10e7cdf9..faad52257f 100644 --- a/Userland/Libraries/LibCrypto/Curves/Ed25519.cpp +++ b/Userland/Libraries/LibCrypto/Curves/Ed25519.cpp @@ -21,7 +21,7 @@ ErrorOr Ed25519::generate_private_key() auto buffer = TRY(ByteBuffer::create_uninitialized(key_size())); fill_with_random(buffer); return buffer; -}; +} // https://datatracker.ietf.org/doc/html/rfc8032#section-5.1.5 ErrorOr Ed25519::generate_public_key(ReadonlyBytes private_key) diff --git a/Userland/Libraries/LibCrypto/Hash/MD5.cpp b/Userland/Libraries/LibCrypto/Hash/MD5.cpp index ddf775e7f3..916e3b7c57 100644 --- a/Userland/Libraries/LibCrypto/Hash/MD5.cpp +++ b/Userland/Libraries/LibCrypto/Hash/MD5.cpp @@ -8,10 +8,10 @@ #include #include -static constexpr u32 F(u32 x, u32 y, u32 z) { return (x & y) | ((~x) & z); }; -static constexpr u32 G(u32 x, u32 y, u32 z) { return (x & z) | ((~z) & y); }; -static constexpr u32 H(u32 x, u32 y, u32 z) { return x ^ y ^ z; }; -static constexpr u32 I(u32 x, u32 y, u32 z) { return y ^ (x | ~z); }; +static constexpr u32 F(u32 x, u32 y, u32 z) { return (x & y) | ((~x) & z); } +static constexpr u32 G(u32 x, u32 y, u32 z) { return (x & z) | ((~z) & y); } +static constexpr u32 H(u32 x, u32 y, u32 z) { return x ^ y ^ z; } +static constexpr u32 I(u32 x, u32 y, u32 z) { return y ^ (x | ~z); } static constexpr u32 ROTATE_LEFT(u32 x, size_t n) { return (x << n) | (x >> (32 - n)); diff --git a/Userland/Libraries/LibDSP/ProcessorParameter.h b/Userland/Libraries/LibDSP/ProcessorParameter.h index d0d6a8c176..1469370a87 100644 --- a/Userland/Libraries/LibDSP/ProcessorParameter.h +++ b/Userland/Libraries/LibDSP/ProcessorParameter.h @@ -78,7 +78,7 @@ public: return static_cast(value()); } - ParameterT value() const { return m_value; }; + ParameterT value() const { return m_value; } void set_value(ParameterT value) { set_value_sneaky(value, DSP::Detail::ProcessorParameterSetValueTag {}); diff --git a/Userland/Libraries/LibEDID/EDID.h b/Userland/Libraries/LibEDID/EDID.h index f5479253cd..9f6e1ce8e5 100644 --- a/Userland/Libraries/LibEDID/EDID.h +++ b/Userland/Libraries/LibEDID/EDID.h @@ -254,7 +254,7 @@ public: }; ALWAYS_INLINE Source source() const { return m_source; } - ALWAYS_INLINE unsigned width() const { return m_width; }; + ALWAYS_INLINE unsigned width() const { return m_width; } ALWAYS_INLINE unsigned height() const { return m_height; } ALWAYS_INLINE unsigned refresh_rate() const diff --git a/Userland/Libraries/LibELF/DynamicLoader.h b/Userland/Libraries/LibELF/DynamicLoader.h index 3ffe266ab4..b944627fa2 100644 --- a/Userland/Libraries/LibELF/DynamicLoader.h +++ b/Userland/Libraries/LibELF/DynamicLoader.h @@ -72,7 +72,7 @@ public: // Stage 4 of loading: initializers void load_stage_4(); - void set_tls_offset(size_t offset) { m_tls_offset = offset; }; + void set_tls_offset(size_t offset) { m_tls_offset = offset; } size_t tls_size_of_current_object() const { return m_tls_size_of_current_object; } size_t tls_alignment_of_current_object() const { return m_tls_alignment_of_current_object; } size_t tls_offset() const { return m_tls_offset; } diff --git a/Userland/Libraries/LibGL/GLContext.h b/Userland/Libraries/LibGL/GLContext.h index 9ead5e60fa..d7e5a27708 100644 --- a/Userland/Libraries/LibGL/GLContext.h +++ b/Userland/Libraries/LibGL/GLContext.h @@ -106,7 +106,7 @@ public: GLContext(RefPtr driver, NonnullOwnPtr, Gfx::Bitmap&); ~GLContext(); - NonnullRefPtr frontbuffer() const { return m_frontbuffer; }; + NonnullRefPtr frontbuffer() const { return m_frontbuffer; } void present(); void gl_begin(GLenum mode); diff --git a/Userland/Libraries/LibGL/Tex/TextureUnit.h b/Userland/Libraries/LibGL/Tex/TextureUnit.h index dba911a9c8..7607857f4a 100644 --- a/Userland/Libraries/LibGL/Tex/TextureUnit.h +++ b/Userland/Libraries/LibGL/Tex/TextureUnit.h @@ -44,13 +44,13 @@ public: void set_rgb_source(size_t index, GLenum source) { m_rgb_source[index] = source; } GLenum rgb_source(size_t index) const { return m_rgb_source[index]; } - bool texture_1d_enabled() const { return m_texture_1d_enabled; }; + bool texture_1d_enabled() const { return m_texture_1d_enabled; } void set_texture_1d_enabled(bool texture_1d_enabled) { m_texture_1d_enabled = texture_1d_enabled; } - bool texture_2d_enabled() const { return m_texture_2d_enabled; }; + bool texture_2d_enabled() const { return m_texture_2d_enabled; } void set_texture_2d_enabled(bool texture_2d_enabled) { m_texture_2d_enabled = texture_2d_enabled; } - bool texture_3d_enabled() const { return m_texture_3d_enabled; }; + bool texture_3d_enabled() const { return m_texture_3d_enabled; } void set_texture_3d_enabled(bool texture_3d_enabled) { m_texture_3d_enabled = texture_3d_enabled; } - bool texture_cube_map_enabled() const { return m_texture_cube_map_enabled; }; + bool texture_cube_map_enabled() const { return m_texture_cube_map_enabled; } void set_texture_cube_map_enabled(bool texture_cube_map_enabled) { m_texture_cube_map_enabled = texture_cube_map_enabled; } FloatMatrix4x4& texture_matrix() { return m_texture_matrix_stack.last(); } diff --git a/Userland/Libraries/LibGUI/Application.h b/Userland/Libraries/LibGUI/Application.h index b25674bfd6..e67ab40b86 100644 --- a/Userland/Libraries/LibGUI/Application.h +++ b/Userland/Libraries/LibGUI/Application.h @@ -44,7 +44,7 @@ public: void show_tooltip(DeprecatedString, Widget const* tooltip_source_widget); void show_tooltip_immediately(DeprecatedString, Widget const* tooltip_source_widget); void hide_tooltip(); - Widget const* tooltip_source_widget() { return m_tooltip_source_widget; }; + Widget const* tooltip_source_widget() { return m_tooltip_source_widget; } bool quit_when_last_window_deleted() const { return m_quit_when_last_window_deleted; } void set_quit_when_last_window_deleted(bool b) { m_quit_when_last_window_deleted = b; } diff --git a/Userland/Libraries/LibGUI/ColorInput.cpp b/Userland/Libraries/LibGUI/ColorInput.cpp index f31026a775..e15344f6d8 100644 --- a/Userland/Libraries/LibGUI/ColorInput.cpp +++ b/Userland/Libraries/LibGUI/ColorInput.cpp @@ -52,7 +52,7 @@ void ColorInput::set_color_internal(Color color, AllowCallback allow_callback, b void ColorInput::set_color(Color color, AllowCallback allow_callback) { set_color_internal(color, allow_callback, true); -}; +} void ColorInput::mousedown_event(MouseEvent& event) { diff --git a/Userland/Libraries/LibGUI/Desktop.h b/Userland/Libraries/LibGUI/Desktop.h index 395bbc1cd5..4a6808d909 100644 --- a/Userland/Libraries/LibGUI/Desktop.h +++ b/Userland/Libraries/LibGUI/Desktop.h @@ -35,7 +35,7 @@ public: RefPtr wallpaper_bitmap() const; bool set_wallpaper(RefPtr wallpaper_bitmap, Optional path); - void set_system_effects(Vector effects) { m_system_effects = { effects }; }; + void set_system_effects(Vector effects) { m_system_effects = { effects }; } SystemEffects const& system_effects() const { return m_system_effects; } Gfx::IntRect rect() const { return m_bounding_rect; } diff --git a/Userland/Libraries/LibGUI/EditingEngine.cpp b/Userland/Libraries/LibGUI/EditingEngine.cpp index 6a18ded445..9b62133ab2 100644 --- a/Userland/Libraries/LibGUI/EditingEngine.cpp +++ b/Userland/Libraries/LibGUI/EditingEngine.cpp @@ -306,7 +306,7 @@ EditingEngine::DidMoveALine EditingEngine::move_one_up(KeyEvent const& event) m_editor->set_cursor(new_cursor); } return DidMoveALine::No; -}; +} EditingEngine::DidMoveALine EditingEngine::move_one_down(KeyEvent const& event) { @@ -323,7 +323,7 @@ EditingEngine::DidMoveALine EditingEngine::move_one_down(KeyEvent const& event) m_editor->set_cursor(new_cursor); } return DidMoveALine::No; -}; +} void EditingEngine::move_up(double page_height_factor) { @@ -333,7 +333,7 @@ void EditingEngine::move_up(double page_height_factor) TextPosition new_cursor = m_editor->text_position_at_content_position(position_above); m_editor->set_cursor(new_cursor); } -}; +} void EditingEngine::move_down(double page_height_factor) { @@ -348,22 +348,22 @@ void EditingEngine::move_down(double page_height_factor) void EditingEngine::move_page_up() { move_up(1); -}; +} void EditingEngine::move_page_down() { move_down(1); -}; +} void EditingEngine::move_to_first_line() { m_editor->set_cursor(0, 0); -}; +} void EditingEngine::move_to_last_line() { m_editor->set_cursor(m_editor->line_count() - 1, m_editor->lines()[m_editor->line_count() - 1]->length()); -}; +} void EditingEngine::get_selection_line_boundaries(Badge, size_t& first_line, size_t& last_line) { @@ -389,14 +389,14 @@ void EditingEngine::delete_char() if (!m_editor->is_editable()) return; m_editor->do_delete(); -}; +} void EditingEngine::delete_line() { if (!m_editor->is_editable()) return; m_editor->delete_current_line(); -}; +} MoveLineUpOrDownCommand::MoveLineUpOrDownCommand(TextDocument& document, KeyEvent event, EditingEngine& engine) : TextDocumentUndoCommand(document) diff --git a/Userland/Libraries/LibGUI/FilteringProxyModel.h b/Userland/Libraries/LibGUI/FilteringProxyModel.h index 4506aa6cd5..032e226177 100644 --- a/Userland/Libraries/LibGUI/FilteringProxyModel.h +++ b/Userland/Libraries/LibGUI/FilteringProxyModel.h @@ -31,7 +31,7 @@ public: virtual ~FilteringProxyModel() override { m_model->unregister_client(*this); - }; + } virtual int row_count(ModelIndex const& = ModelIndex()) const override; virtual int column_count(ModelIndex const& = ModelIndex()) const override; diff --git a/Userland/Libraries/LibGUI/TabWidget.h b/Userland/Libraries/LibGUI/TabWidget.h index 2abd3dfb45..643ecd68f7 100644 --- a/Userland/Libraries/LibGUI/TabWidget.h +++ b/Userland/Libraries/LibGUI/TabWidget.h @@ -102,9 +102,9 @@ public: int uniform_tab_width() const; void set_bar_visible(bool bar_visible); - bool is_bar_visible() const { return m_bar_visible; }; + bool is_bar_visible() const { return m_bar_visible; } - void set_close_button_enabled(bool close_button_enabled) { m_close_button_enabled = close_button_enabled; }; + void set_close_button_enabled(bool close_button_enabled) { m_close_button_enabled = close_button_enabled; } bool close_button_enabled() const { return m_close_button_enabled; } void set_reorder_allowed(bool reorder_allowed) { m_reorder_allowed = reorder_allowed; } diff --git a/Userland/Libraries/LibGUI/TextEditor.cpp b/Userland/Libraries/LibGUI/TextEditor.cpp index 41443a1478..e337fd561c 100644 --- a/Userland/Libraries/LibGUI/TextEditor.cpp +++ b/Userland/Libraries/LibGUI/TextEditor.cpp @@ -1364,7 +1364,7 @@ void TextEditor::add_code_point(u32 code_point) m_autocomplete_timer->start(); } insert_at_cursor_or_replace_selection(sb.to_deprecated_string()); -}; +} void TextEditor::reset_cursor_blink() { diff --git a/Userland/Libraries/LibGUI/TextEditor.h b/Userland/Libraries/LibGUI/TextEditor.h index f03a92837a..2a310027df 100644 --- a/Userland/Libraries/LibGUI/TextEditor.h +++ b/Userland/Libraries/LibGUI/TextEditor.h @@ -76,7 +76,7 @@ public: void set_automatic_indentation_enabled(bool enabled) { m_automatic_indentation_enabled = enabled; } virtual int soft_tab_width() const final { return m_soft_tab_width; } - void set_soft_tab_width(int width) { m_soft_tab_width = width; }; + void set_soft_tab_width(int width) { m_soft_tab_width = width; } WrappingMode wrapping_mode() const { return m_wrapping_mode; } bool is_wrapping_enabled() const { return m_wrapping_mode != WrappingMode::NoWrap; } @@ -221,7 +221,7 @@ public: bool is_in_drag_select() const { return m_in_drag_select; } - TextRange& selection() { return m_selection; }; + TextRange& selection() { return m_selection; } void did_update_selection(); void did_change(AllowCallback = AllowCallback::Yes); void update_cursor(); @@ -308,8 +308,8 @@ private: // ^Syntax::HighlighterClient virtual Vector const& spans() const final { return document().spans(); } virtual void set_span_at_index(size_t index, TextDocumentSpan span) final { document().set_span_at_index(index, move(span)); } - virtual Vector& folding_regions() final { return document().folding_regions(); }; - virtual Vector const& folding_regions() const final { return document().folding_regions(); }; + virtual Vector& folding_regions() final { return document().folding_regions(); } + virtual Vector const& folding_regions() const final { return document().folding_regions(); } virtual void highlighter_did_request_update() final { update(); } virtual DeprecatedString highlighter_did_request_text() const final { return text(); } virtual GUI::TextDocument& highlighter_did_request_document() final { return document(); } diff --git a/Userland/Libraries/LibGUI/VimEditingEngine.cpp b/Userland/Libraries/LibGUI/VimEditingEngine.cpp index c5db672af4..06f9147026 100644 --- a/Userland/Libraries/LibGUI/VimEditingEngine.cpp +++ b/Userland/Libraries/LibGUI/VimEditingEngine.cpp @@ -1371,7 +1371,7 @@ void VimEditingEngine::switch_to_normal_mode() m_previous_key = {}; clear_visual_mode_data(); m_motion.reset(); -}; +} void VimEditingEngine::switch_to_insert_mode() { @@ -1380,7 +1380,7 @@ void VimEditingEngine::switch_to_insert_mode() m_previous_key = {}; clear_visual_mode_data(); m_motion.reset(); -}; +} void VimEditingEngine::switch_to_visual_mode() { @@ -1448,12 +1448,12 @@ void VimEditingEngine::clear_visual_mode_data() void VimEditingEngine::move_half_page_up() { move_up(0.5); -}; +} void VimEditingEngine::move_half_page_down() { move_down(0.5); -}; +} void VimEditingEngine::yank(YankType type) { @@ -1544,7 +1544,7 @@ void VimEditingEngine::move_to_previous_empty_lines_block() TextPosition new_cursor = { line_idx, 0 }; m_editor->set_cursor(new_cursor); -}; +} void VimEditingEngine::move_to_next_empty_lines_block() { @@ -1564,7 +1564,7 @@ void VimEditingEngine::move_to_next_empty_lines_block() TextPosition new_cursor = { line_idx, 0 }; m_editor->set_cursor(new_cursor); -}; +} void VimEditingEngine::casefold_selection(Casing casing) { diff --git a/Userland/Libraries/LibGUI/Widget.h b/Userland/Libraries/LibGUI/Widget.h index 0e2fd65781..28f56d6a8c 100644 --- a/Userland/Libraries/LibGUI/Widget.h +++ b/Userland/Libraries/LibGUI/Widget.h @@ -200,8 +200,8 @@ public: Gfx::IntRect rect() const { return { 0, 0, width(), height() }; } Gfx::IntSize size() const { return m_relative_rect.size(); } - Gfx::IntRect content_rect() const { return this->content_margins().applied_to(rect()); }; - Gfx::IntSize content_size() const { return this->content_rect().size(); }; + Gfx::IntRect content_rect() const { return this->content_margins().applied_to(rect()); } + Gfx::IntSize content_size() const { return this->content_rect().size(); } // Invalidate the widget (or an area thereof), causing a repaint to happen soon. void update(); diff --git a/Userland/Libraries/LibGUI/Wizards/WizardPage.h b/Userland/Libraries/LibGUI/Wizards/WizardPage.h index c1501d0ca0..738ffbe744 100644 --- a/Userland/Libraries/LibGUI/Wizards/WizardPage.h +++ b/Userland/Libraries/LibGUI/Wizards/WizardPage.h @@ -18,7 +18,7 @@ class WizardPage : public AbstractWizardPage { static ErrorOr> create(StringView title, StringView subtitle); - Widget& body_widget() { return *m_body_widget; }; + Widget& body_widget() { return *m_body_widget; } void set_page_title(String); void set_page_subtitle(String); diff --git a/Userland/Libraries/LibGemini/Document.h b/Userland/Libraries/LibGemini/Document.h index 0fecac4092..488a5ccf11 100644 --- a/Userland/Libraries/LibGemini/Document.h +++ b/Userland/Libraries/LibGemini/Document.h @@ -34,7 +34,7 @@ public: static NonnullRefPtr parse(StringView source, const URL&); - const URL& url() const { return m_url; }; + const URL& url() const { return m_url; } private: explicit Document(const URL& url) diff --git a/Userland/Libraries/LibGfx/Filters/BrightnessFilter.h b/Userland/Libraries/LibGfx/Filters/BrightnessFilter.h index 85303ba9ae..a308f98323 100644 --- a/Userland/Libraries/LibGfx/Filters/BrightnessFilter.h +++ b/Userland/Libraries/LibGfx/Filters/BrightnessFilter.h @@ -35,7 +35,7 @@ protected: convert_channel(original.blue()), original.alpha() }; - }; + } }; } diff --git a/Userland/Libraries/LibGfx/Filters/ColorBlindnessFilter.cpp b/Userland/Libraries/LibGfx/Filters/ColorBlindnessFilter.cpp index 7924ccd69c..f2c7de3de5 100644 --- a/Userland/Libraries/LibGfx/Filters/ColorBlindnessFilter.cpp +++ b/Userland/Libraries/LibGfx/Filters/ColorBlindnessFilter.cpp @@ -79,6 +79,6 @@ Color ColorBlindnessFilter::convert_color(Color original) (u8)(original.red() * m_red_in_green_band + original.green() * m_green_in_green_band + original.blue() * m_blue_in_green_band), (u8)(original.red() * m_red_in_blue_band + original.green() * m_green_in_blue_band + original.blue() * m_blue_in_blue_band), original.alpha()); -}; +} } diff --git a/Userland/Libraries/LibGfx/Filters/ContrastFilter.h b/Userland/Libraries/LibGfx/Filters/ContrastFilter.h index 5bcb6764df..8f0e3fb777 100644 --- a/Userland/Libraries/LibGfx/Filters/ContrastFilter.h +++ b/Userland/Libraries/LibGfx/Filters/ContrastFilter.h @@ -35,7 +35,7 @@ protected: convert_channel(original.blue()), original.alpha() }; - }; + } }; } diff --git a/Userland/Libraries/LibGfx/Filters/GrayscaleFilter.h b/Userland/Libraries/LibGfx/Filters/GrayscaleFilter.h index 64050b2578..999088498e 100644 --- a/Userland/Libraries/LibGfx/Filters/GrayscaleFilter.h +++ b/Userland/Libraries/LibGfx/Filters/GrayscaleFilter.h @@ -19,7 +19,7 @@ public: virtual StringView class_name() const override { return "GrayscaleFilter"sv; } protected: - Color convert_color(Color original) override { return original.to_grayscale(); }; + Color convert_color(Color original) override { return original.to_grayscale(); } }; } diff --git a/Userland/Libraries/LibGfx/Filters/InvertFilter.h b/Userland/Libraries/LibGfx/Filters/InvertFilter.h index 991070fac7..5c13189712 100644 --- a/Userland/Libraries/LibGfx/Filters/InvertFilter.h +++ b/Userland/Libraries/LibGfx/Filters/InvertFilter.h @@ -19,7 +19,7 @@ public: virtual StringView class_name() const override { return "InvertFilter"sv; } protected: - Color convert_color(Color original) override { return original.inverted(); }; + Color convert_color(Color original) override { return original.inverted(); } }; } diff --git a/Userland/Libraries/LibGfx/Filters/OpacityFilter.h b/Userland/Libraries/LibGfx/Filters/OpacityFilter.h index 5e16907355..b56b2905d6 100644 --- a/Userland/Libraries/LibGfx/Filters/OpacityFilter.h +++ b/Userland/Libraries/LibGfx/Filters/OpacityFilter.h @@ -27,7 +27,7 @@ protected: Color convert_color(Color original) override { return original.with_alpha(m_amount * 255); - }; + } }; } diff --git a/Userland/Libraries/LibGfx/Filters/SepiaFilter.h b/Userland/Libraries/LibGfx/Filters/SepiaFilter.h index 63bebe743a..7fa5b72e0b 100644 --- a/Userland/Libraries/LibGfx/Filters/SepiaFilter.h +++ b/Userland/Libraries/LibGfx/Filters/SepiaFilter.h @@ -25,7 +25,7 @@ public: } protected: - Color convert_color(Color original) override { return original.sepia(m_amount); }; + Color convert_color(Color original) override { return original.sepia(m_amount); } }; } diff --git a/Userland/Libraries/LibGfx/Filters/TintFilter.h b/Userland/Libraries/LibGfx/Filters/TintFilter.h index c471a573a0..5c083f2272 100644 --- a/Userland/Libraries/LibGfx/Filters/TintFilter.h +++ b/Userland/Libraries/LibGfx/Filters/TintFilter.h @@ -29,7 +29,7 @@ protected: return Color::from_rgb(dest.value()) .mixed_with(m_color, m_amount) .with_alpha(dest.alpha()); - }; + } private: Gfx::Color m_color; diff --git a/Userland/Libraries/LibGfx/Font/BitmapFont.h b/Userland/Libraries/LibGfx/Font/BitmapFont.h index b6bc305eff..cd9827ea59 100644 --- a/Userland/Libraries/LibGfx/Font/BitmapFont.h +++ b/Userland/Libraries/LibGfx/Font/BitmapFont.h @@ -142,7 +142,7 @@ private: template int unicode_view_width(T const& view) const; - void update_x_height() { m_x_height = m_baseline - m_mean_line; }; + void update_x_height() { m_x_height = m_baseline - m_mean_line; } virtual bool has_color_bitmaps() const override { return false; } diff --git a/Userland/Libraries/LibGfx/Font/OpenType/Hinting/Opcodes.h b/Userland/Libraries/LibGfx/Font/OpenType/Hinting/Opcodes.h index 97eacd27ab..0ccfd0696f 100644 --- a/Userland/Libraries/LibGfx/Font/OpenType/Hinting/Opcodes.h +++ b/Userland/Libraries/LibGfx/Font/OpenType/Hinting/Opcodes.h @@ -166,9 +166,9 @@ struct Instruction { bool d() const; bool e() const; - u8 flag_bits() const { return m_flag_bits; }; + u8 flag_bits() const { return m_flag_bits; } Opcode opcode() const { return m_opcode; } - ReadonlyBytes values() const { return m_values; }; + ReadonlyBytes values() const { return m_values; } Instruction(Opcode opcode, ReadonlyBytes values = {}); diff --git a/Userland/Libraries/LibGfx/GradientPainting.cpp b/Userland/Libraries/LibGfx/GradientPainting.cpp index 8e98b31ceb..b7e8e1a0bf 100644 --- a/Userland/Libraries/LibGfx/GradientPainting.cpp +++ b/Userland/Libraries/LibGfx/GradientPainting.cpp @@ -86,7 +86,7 @@ public: if (m_use_premultiplied_alpha == UsePremultipliedAlpha::Yes) return a.mixed_with(b, amount); return a.interpolate(b, amount); - }; + } Color get_color(i64 index) const { diff --git a/Userland/Libraries/LibGfx/ImageFormats/JPEGWriter.cpp b/Userland/Libraries/LibGfx/ImageFormats/JPEGWriter.cpp index 623e2b8e96..87bab3de59 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/JPEGWriter.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/JPEGWriter.cpp @@ -262,7 +262,7 @@ private: ErrorOr write_symbol(OutputHuffmanTable::Symbol symbol) { return m_bit_stream.write_bits(symbol.word, symbol.code_length); - }; + } ErrorOr encode_dc(OutputHuffmanTable const& dc_table, i16 const component[], u8 component_id) { @@ -327,7 +327,7 @@ private: { VERIFY(coefficient >= -2047 && coefficient <= 2047); return floor(log2(abs(coefficient))) + 1; - }; + } QuantizationTable m_luminance_quantization_table {}; QuantizationTable m_chrominance_quantization_table {}; diff --git a/Userland/Libraries/LibGfx/ImageFormats/PNGWriter.cpp b/Userland/Libraries/LibGfx/ImageFormats/PNGWriter.cpp index ad1c7afa51..1b2532d3dc 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/PNGWriter.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/PNGWriter.cpp @@ -24,8 +24,8 @@ class PNGChunk { public: explicit PNGChunk(String); - auto const& data() const { return m_data; }; - String const& type() const { return m_type; }; + auto const& data() const { return m_data; } + String const& type() const { return m_type; } ErrorOr reserve(size_t bytes) { return m_data.try_ensure_capacity(bytes); } template diff --git a/Userland/Libraries/LibGfx/ImageFormats/TinyVGLoader.h b/Userland/Libraries/LibGfx/ImageFormats/TinyVGLoader.h index d6b8cd181e..6baa3bac64 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/TinyVGLoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/TinyVGLoader.h @@ -87,7 +87,7 @@ public: virtual size_t frame_count() override { return 1; } virtual size_t first_animated_frame_index() override { return 0; } virtual ErrorOr frame(size_t index, Optional ideal_size = {}) override; - virtual ErrorOr> icc_data() override { return OptionalNone {}; }; + virtual ErrorOr> icc_data() override { return OptionalNone {}; } virtual ~TinyVGImageDecoderPlugin() override = default; diff --git a/Userland/Libraries/LibGfx/PaintStyle.h b/Userland/Libraries/LibGfx/PaintStyle.h index ad0bea6a96..3aac3a015e 100644 --- a/Userland/Libraries/LibGfx/PaintStyle.h +++ b/Userland/Libraries/LibGfx/PaintStyle.h @@ -36,7 +36,7 @@ public: private: // Simple paint styles can simply override sample_color() if they can easily generate a color from a coordinate. - virtual Color sample_color(IntPoint) const { return Color(); }; + virtual Color sample_color(IntPoint) const { return Color(); } }; class SolidColorPaintStyle final : public PaintStyle { diff --git a/Userland/Libraries/LibGfx/Painter.cpp b/Userland/Libraries/LibGfx/Painter.cpp index f0c4c10454..96d888c811 100644 --- a/Userland/Libraries/LibGfx/Painter.cpp +++ b/Userland/Libraries/LibGfx/Painter.cpp @@ -58,7 +58,7 @@ ALWAYS_INLINE static Color color_for_format(BitmapFormat format, ARGB32 value) default: VERIFY_NOT_REACHED(); } -}; +} template ALWAYS_INLINE Color get_pixel(Gfx::Bitmap const& bitmap, int x, int y) diff --git a/Userland/Libraries/LibIMAP/Objects.h b/Userland/Libraries/LibIMAP/Objects.h index a06186e5dd..9e4555753e 100644 --- a/Userland/Libraries/LibIMAP/Objects.h +++ b/Userland/Libraries/LibIMAP/Objects.h @@ -735,7 +735,7 @@ public: ResponseData& data() { return m_data; } - DeprecatedString response_text() { return m_response_text; }; + DeprecatedString response_text() { return m_response_text; } SolidResponse() : SolidResponse(ResponseStatus::Bad, -1) diff --git a/Userland/Libraries/LibIMAP/Parser.h b/Userland/Libraries/LibIMAP/Parser.h index e7d8bf9680..feffef60d4 100644 --- a/Userland/Libraries/LibIMAP/Parser.h +++ b/Userland/Libraries/LibIMAP/Parser.h @@ -30,7 +30,7 @@ private: StringView consume_while(Function should_consume); StringView consume_until_end_of_line(); - bool at_end() { return position >= m_buffer.size(); }; + bool at_end() { return position >= m_buffer.size(); } unsigned parse_number(); Optional try_parse_number(); diff --git a/Userland/Libraries/LibJS/AST.h b/Userland/Libraries/LibJS/AST.h index b70fe9eca6..8284739055 100644 --- a/Userland/Libraries/LibJS/AST.h +++ b/Userland/Libraries/LibJS/AST.h @@ -231,7 +231,7 @@ public: virtual void dump(int indent) const override; virtual Bytecode::CodeGenerationErrorOr generate_bytecode(Bytecode::Generator&) const override; - Expression const& expression() const { return m_expression; }; + Expression const& expression() const { return m_expression; } private: virtual bool is_expression_statement() const override { return true; } @@ -709,7 +709,7 @@ public: StringView name() const { return m_name ? m_name->string().view() : ""sv; } DeprecatedString const& source_text() const { return m_source_text; } Statement const& body() const { return *m_body; } - Vector const& parameters() const { return m_parameters; }; + Vector const& parameters() const { return m_parameters; } i32 function_length() const { return m_function_length; } Vector const& local_variables_names() const { return m_local_variables_names; } bool is_strict_mode() const { return m_is_strict_mode; } @@ -1345,7 +1345,7 @@ public: using ClassValue = Variant; virtual ThrowCompletionOr class_element_evaluation(VM&, Object& home_object) const = 0; - virtual Optional private_bound_identifier() const { return {}; }; + virtual Optional private_bound_identifier() const { return {}; } private: bool m_is_static { false }; @@ -1804,7 +1804,7 @@ public: ThrowCompletionOr for_each_bound_identifier(ThrowCompletionOrVoidCallback&&) const override; - virtual bool is_constant_declaration() const override { return m_declaration_kind == DeclarationKind::Const; }; + virtual bool is_constant_declaration() const override { return m_declaration_kind == DeclarationKind::Const; } virtual bool is_lexical_declaration() const override { return m_declaration_kind != DeclarationKind::Var; } @@ -1830,7 +1830,7 @@ public: ThrowCompletionOr for_each_bound_identifier(ThrowCompletionOrVoidCallback&&) const override; - virtual bool is_constant_declaration() const override { return true; }; + virtual bool is_constant_declaration() const override { return true; } virtual bool is_lexical_declaration() const override { return true; } diff --git a/Userland/Libraries/LibJS/Bytecode/Op.cpp b/Userland/Libraries/LibJS/Bytecode/Op.cpp index 9e5c1ed43a..60387a05ab 100644 --- a/Userland/Libraries/LibJS/Bytecode/Op.cpp +++ b/Userland/Libraries/LibJS/Bytecode/Op.cpp @@ -625,7 +625,7 @@ ThrowCompletionOr DeleteById::execute_impl(Bytecode::Interpreter& interpre auto reference = Reference { base_value, identifier, {}, strict }; interpreter.accumulator() = Value(TRY(reference.delete_(vm))); return {}; -}; +} ThrowCompletionOr DeleteByIdWithThis::execute_impl(Bytecode::Interpreter& interpreter) const { @@ -636,7 +636,7 @@ ThrowCompletionOr DeleteByIdWithThis::execute_impl(Bytecode::Interpreter& auto reference = Reference { base_value, identifier, interpreter.reg(m_this_value), strict }; interpreter.accumulator() = Value(TRY(reference.delete_(vm))); return {}; -}; +} ThrowCompletionOr Jump::execute_impl(Bytecode::Interpreter& interpreter) const { @@ -1139,7 +1139,7 @@ ThrowCompletionOr DeleteByValueWithThis::execute_impl(Bytecode::Interprete auto reference = Reference { base_value, property_key, interpreter.reg(m_this_value), strict }; interpreter.accumulator() = Value(TRY(reference.delete_(vm))); return {}; -}; +} ThrowCompletionOr GetIterator::execute_impl(Bytecode::Interpreter& interpreter) const { diff --git a/Userland/Libraries/LibJS/Heap/MarkedVector.h b/Userland/Libraries/LibJS/Heap/MarkedVector.h index 153de0aec4..8710c32689 100644 --- a/Userland/Libraries/LibJS/Heap/MarkedVector.h +++ b/Userland/Libraries/LibJS/Heap/MarkedVector.h @@ -74,7 +74,7 @@ public: roots.set(value); } } - }; + } }; } diff --git a/Userland/Libraries/LibJS/Lexer.h b/Userland/Libraries/LibJS/Lexer.h index dfce81c795..ebe0df73d7 100644 --- a/Userland/Libraries/LibJS/Lexer.h +++ b/Userland/Libraries/LibJS/Lexer.h @@ -21,10 +21,10 @@ public: Token next(); - DeprecatedString const& source() const { return m_source; }; - String const& filename() const { return m_filename; }; + DeprecatedString const& source() const { return m_source; } + String const& filename() const { return m_filename; } - void disallow_html_comments() { m_allow_html_comments = false; }; + void disallow_html_comments() { m_allow_html_comments = false; } Token force_slash_as_regex(); diff --git a/Userland/Libraries/LibJS/Runtime/Array.h b/Userland/Libraries/LibJS/Runtime/Array.h index 1ed0e6875c..8c5dda2b48 100644 --- a/Userland/Libraries/LibJS/Runtime/Array.h +++ b/Userland/Libraries/LibJS/Runtime/Array.h @@ -58,7 +58,7 @@ public: virtual ThrowCompletionOr internal_delete(PropertyKey const&) override; virtual ThrowCompletionOr> internal_own_property_keys() const override; - [[nodiscard]] bool length_is_writable() const { return m_length_writable; }; + [[nodiscard]] bool length_is_writable() const { return m_length_writable; } protected: explicit Array(Object& prototype); diff --git a/Userland/Libraries/LibJS/Runtime/ECMAScriptFunctionObject.h b/Userland/Libraries/LibJS/Runtime/ECMAScriptFunctionObject.h index 3f3dec88c4..c11419f190 100644 --- a/Userland/Libraries/LibJS/Runtime/ECMAScriptFunctionObject.h +++ b/Userland/Libraries/LibJS/Runtime/ECMAScriptFunctionObject.h @@ -45,19 +45,19 @@ public: void make_method(Object& home_object); Statement const& ecmascript_code() const { return m_ecmascript_code; } - Vector const& formal_parameters() const { return m_formal_parameters; }; + Vector const& formal_parameters() const { return m_formal_parameters; } - virtual DeprecatedFlyString const& name() const override { return m_name; }; + virtual DeprecatedFlyString const& name() const override { return m_name; } void set_name(DeprecatedFlyString const& name); - void set_is_class_constructor() { m_is_class_constructor = true; }; + void set_is_class_constructor() { m_is_class_constructor = true; } auto& bytecode_executable() const { return m_bytecode_executable; } Environment* environment() { return m_environment; } virtual Realm* realm() const override { return m_realm; } - ConstructorKind constructor_kind() const { return m_constructor_kind; }; + ConstructorKind constructor_kind() const { return m_constructor_kind; } void set_constructor_kind(ConstructorKind constructor_kind) { m_constructor_kind = constructor_kind; } ThisMode this_mode() const { return m_this_mode; } @@ -72,7 +72,7 @@ public: void add_field(ClassFieldDefinition field) { m_fields.append(move(field)); } Vector const& private_methods() const { return m_private_methods; } - void add_private_method(PrivateElement method) { m_private_methods.append(move(method)); }; + void add_private_method(PrivateElement method) { m_private_methods.append(move(method)); } // This is for IsSimpleParameterList (static semantics) bool has_simple_parameter_list() const { return m_has_simple_parameter_list; } diff --git a/Userland/Libraries/LibJS/Runtime/FunctionObject.h b/Userland/Libraries/LibJS/Runtime/FunctionObject.h index b75cdaba2a..f11187fa28 100644 --- a/Userland/Libraries/LibJS/Runtime/FunctionObject.h +++ b/Userland/Libraries/LibJS/Runtime/FunctionObject.h @@ -39,7 +39,7 @@ public: // [[Realm]] virtual Realm* realm() const { return nullptr; } - virtual Vector const& local_variables_names() const { VERIFY_NOT_REACHED(); }; + virtual Vector const& local_variables_names() const { VERIFY_NOT_REACHED(); } protected: explicit FunctionObject(Realm&, Object* prototype); diff --git a/Userland/Libraries/LibJS/Runtime/IndexedProperties.h b/Userland/Libraries/LibJS/Runtime/IndexedProperties.h index b972362952..4532d01a54 100644 --- a/Userland/Libraries/LibJS/Runtime/IndexedProperties.h +++ b/Userland/Libraries/LibJS/Runtime/IndexedProperties.h @@ -101,7 +101,7 @@ public: IndexedPropertyIterator& operator*(); bool operator!=(IndexedPropertyIterator const&) const; - u32 index() const { return m_index; }; + u32 index() const { return m_index; } private: void skip_empty_indices(); @@ -129,8 +129,8 @@ public: void append(Value value, PropertyAttributes attributes = default_attributes) { put(array_like_size(), value, attributes); } - IndexedPropertyIterator begin(bool skip_empty = true) const { return IndexedPropertyIterator(*this, 0, skip_empty); }; - IndexedPropertyIterator end() const { return IndexedPropertyIterator(*this, array_like_size(), false); }; + IndexedPropertyIterator begin(bool skip_empty = true) const { return IndexedPropertyIterator(*this, 0, skip_empty); } + IndexedPropertyIterator end() const { return IndexedPropertyIterator(*this, array_like_size(), false); } bool is_empty() const { return array_like_size() == 0; } size_t array_like_size() const { return m_storage ? m_storage->array_like_size() : 0; } diff --git a/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.h b/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.h index 6f7720c803..504a76e8f1 100644 --- a/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.h +++ b/Userland/Libraries/LibJS/Runtime/Intl/DateTimeFormat.h @@ -65,62 +65,62 @@ public: void set_time_zone(String time_zone) { m_time_zone = move(time_zone); } bool has_date_style() const { return m_date_style.has_value(); } - Style date_style() const { return *m_date_style; }; - StringView date_style_string() const { return style_to_string(*m_date_style); }; - void set_date_style(StringView style) { m_date_style = style_from_string(style); }; + Style date_style() const { return *m_date_style; } + StringView date_style_string() const { return style_to_string(*m_date_style); } + void set_date_style(StringView style) { m_date_style = style_from_string(style); } bool has_time_style() const { return m_time_style.has_value(); } - Style time_style() const { return *m_time_style; }; - StringView time_style_string() const { return style_to_string(*m_time_style); }; - void set_time_style(StringView style) { m_time_style = style_from_string(style); }; + Style time_style() const { return *m_time_style; } + StringView time_style_string() const { return style_to_string(*m_time_style); } + void set_time_style(StringView style) { m_time_style = style_from_string(style); } - String const& pattern() const { return Patterns::pattern; }; + String const& pattern() const { return Patterns::pattern; } void set_pattern(String pattern) { Patterns::pattern = move(pattern); } - ReadonlySpan<::Locale::CalendarRangePattern> range_patterns() const { return m_range_patterns.span(); }; + ReadonlySpan<::Locale::CalendarRangePattern> range_patterns() const { return m_range_patterns.span(); } void set_range_patterns(Vector<::Locale::CalendarRangePattern> range_patterns) { m_range_patterns = move(range_patterns); } bool has_era() const { return Patterns::era.has_value(); } - ::Locale::CalendarPatternStyle era() const { return *Patterns::era; }; + ::Locale::CalendarPatternStyle era() const { return *Patterns::era; } StringView era_string() const { return ::Locale::calendar_pattern_style_to_string(*Patterns::era); } bool has_year() const { return Patterns::year.has_value(); } - ::Locale::CalendarPatternStyle year() const { return *Patterns::year; }; + ::Locale::CalendarPatternStyle year() const { return *Patterns::year; } StringView year_string() const { return ::Locale::calendar_pattern_style_to_string(*Patterns::year); } bool has_month() const { return Patterns::month.has_value(); } - ::Locale::CalendarPatternStyle month() const { return *Patterns::month; }; + ::Locale::CalendarPatternStyle month() const { return *Patterns::month; } StringView month_string() const { return ::Locale::calendar_pattern_style_to_string(*Patterns::month); } bool has_weekday() const { return Patterns::weekday.has_value(); } - ::Locale::CalendarPatternStyle weekday() const { return *Patterns::weekday; }; + ::Locale::CalendarPatternStyle weekday() const { return *Patterns::weekday; } StringView weekday_string() const { return ::Locale::calendar_pattern_style_to_string(*Patterns::weekday); } bool has_day() const { return Patterns::day.has_value(); } - ::Locale::CalendarPatternStyle day() const { return *Patterns::day; }; + ::Locale::CalendarPatternStyle day() const { return *Patterns::day; } StringView day_string() const { return ::Locale::calendar_pattern_style_to_string(*Patterns::day); } bool has_day_period() const { return Patterns::day_period.has_value(); } - ::Locale::CalendarPatternStyle day_period() const { return *Patterns::day_period; }; + ::Locale::CalendarPatternStyle day_period() const { return *Patterns::day_period; } StringView day_period_string() const { return ::Locale::calendar_pattern_style_to_string(*Patterns::day_period); } bool has_hour() const { return Patterns::hour.has_value(); } - ::Locale::CalendarPatternStyle hour() const { return *Patterns::hour; }; + ::Locale::CalendarPatternStyle hour() const { return *Patterns::hour; } StringView hour_string() const { return ::Locale::calendar_pattern_style_to_string(*Patterns::hour); } bool has_minute() const { return Patterns::minute.has_value(); } - ::Locale::CalendarPatternStyle minute() const { return *Patterns::minute; }; + ::Locale::CalendarPatternStyle minute() const { return *Patterns::minute; } StringView minute_string() const { return ::Locale::calendar_pattern_style_to_string(*Patterns::minute); } bool has_second() const { return Patterns::second.has_value(); } - ::Locale::CalendarPatternStyle second() const { return *Patterns::second; }; + ::Locale::CalendarPatternStyle second() const { return *Patterns::second; } StringView second_string() const { return ::Locale::calendar_pattern_style_to_string(*Patterns::second); } bool has_fractional_second_digits() const { return Patterns::fractional_second_digits.has_value(); } - u8 fractional_second_digits() const { return *Patterns::fractional_second_digits; }; + u8 fractional_second_digits() const { return *Patterns::fractional_second_digits; } bool has_time_zone_name() const { return Patterns::time_zone_name.has_value(); } - ::Locale::CalendarPatternStyle time_zone_name() const { return *Patterns::time_zone_name; }; + ::Locale::CalendarPatternStyle time_zone_name() const { return *Patterns::time_zone_name; } StringView time_zone_name_string() const { return ::Locale::calendar_pattern_style_to_string(*Patterns::time_zone_name); } NativeFunction* bound_format() const { return m_bound_format; } diff --git a/Userland/Libraries/LibJS/Runtime/NativeFunction.h b/Userland/Libraries/LibJS/Runtime/NativeFunction.h index 22485968af..49c3bb2698 100644 --- a/Userland/Libraries/LibJS/Runtime/NativeFunction.h +++ b/Userland/Libraries/LibJS/Runtime/NativeFunction.h @@ -34,7 +34,7 @@ public: virtual ThrowCompletionOr call(); virtual ThrowCompletionOr> construct(FunctionObject& new_target); - virtual DeprecatedFlyString const& name() const override { return m_name; }; + virtual DeprecatedFlyString const& name() const override { return m_name; } virtual bool is_strict_mode() const override; virtual bool has_constructor() const override { return false; } virtual Realm* realm() const override { return m_realm; } diff --git a/Userland/Libraries/LibJS/Runtime/Object.h b/Userland/Libraries/LibJS/Runtime/Object.h index b047a59abf..bde5890b5c 100644 --- a/Userland/Libraries/LibJS/Runtime/Object.h +++ b/Userland/Libraries/LibJS/Runtime/Object.h @@ -148,7 +148,7 @@ public: Value get_without_side_effects(PropertyKey const&) const; - void define_direct_property(PropertyKey const& property_key, Value value, PropertyAttributes attributes) { storage_set(property_key, { value, attributes }); }; + void define_direct_property(PropertyKey const& property_key, Value value, PropertyAttributes attributes) { storage_set(property_key, { value, attributes }); } void define_direct_accessor(PropertyKey const&, FunctionObject* getter, FunctionObject* setter, PropertyAttributes attributes); using IntrinsicAccessor = Value (*)(Realm&); diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/TimeZone.h b/Userland/Libraries/LibJS/Runtime/Temporal/TimeZone.h index e94a313ad2..89327ef1c4 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/TimeZone.h +++ b/Userland/Libraries/LibJS/Runtime/Temporal/TimeZone.h @@ -25,8 +25,8 @@ public: [[nodiscard]] String const& identifier() const { return m_identifier; } [[nodiscard]] Optional const& offset_nanoseconds() const { return m_offset_nanoseconds; } - void set_identifier(String identifier) { m_identifier = move(identifier); }; - void set_offset_nanoseconds(OffsetType offset_nanoseconds) { m_offset_nanoseconds = offset_nanoseconds; }; + void set_identifier(String identifier) { m_identifier = move(identifier); } + void set_offset_nanoseconds(OffsetType offset_nanoseconds) { m_offset_nanoseconds = offset_nanoseconds; } private: explicit TimeZone(Object& prototype); diff --git a/Userland/Libraries/LibJS/Runtime/TypedArray.h b/Userland/Libraries/LibJS/Runtime/TypedArray.h index e8f8c68e5e..f925ad72ca 100644 --- a/Userland/Libraries/LibJS/Runtime/TypedArray.h +++ b/Userland/Libraries/LibJS/Runtime/TypedArray.h @@ -423,7 +423,7 @@ public: return { reinterpret_cast(m_viewed_array_buffer->buffer().data() + m_byte_offset), m_array_length }; } - virtual size_t element_size() const override { return sizeof(UnderlyingBufferDataType); }; + virtual size_t element_size() const override { return sizeof(UnderlyingBufferDataType); } bool is_unclamped_integer_element_type() const override { diff --git a/Userland/Libraries/LibJS/Runtime/VM.h b/Userland/Libraries/LibJS/Runtime/VM.h index 7d427fee04..bea1c5fbf0 100644 --- a/Userland/Libraries/LibJS/Runtime/VM.h +++ b/Userland/Libraries/LibJS/Runtime/VM.h @@ -187,7 +187,7 @@ public: ThrowCompletionOr resolve_this_binding(); - StackInfo const& stack_info() const { return m_stack_info; }; + StackInfo const& stack_info() const { return m_stack_info; } HashMap> const& global_symbol_registry() const { return m_global_symbol_registry; } HashMap>& global_symbol_registry() { return m_global_symbol_registry; } diff --git a/Userland/Libraries/LibJS/Runtime/Value.h b/Userland/Libraries/LibJS/Runtime/Value.h index 41569fc52d..0ae0386bab 100644 --- a/Userland/Libraries/LibJS/Runtime/Value.h +++ b/Userland/Libraries/LibJS/Runtime/Value.h @@ -138,8 +138,8 @@ public: bool is_object() const { return m_value.tag == OBJECT_TAG; } bool is_boolean() const { return m_value.tag == BOOLEAN_TAG; } bool is_symbol() const { return m_value.tag == SYMBOL_TAG; } - bool is_accessor() const { return m_value.tag == ACCESSOR_TAG; }; - bool is_bigint() const { return m_value.tag == BIGINT_TAG; }; + bool is_accessor() const { return m_value.tag == ACCESSOR_TAG; } + bool is_bigint() const { return m_value.tag == BIGINT_TAG; } bool is_nullish() const { return (m_value.tag & IS_NULLISH_EXTRACT_PATTERN) == IS_NULLISH_PATTERN; } bool is_cell() const { return (m_value.tag & IS_CELL_PATTERN) == IS_CELL_PATTERN; } ThrowCompletionOr is_array(VM&) const; diff --git a/Userland/Libraries/LibJS/Runtime/WeakMap.h b/Userland/Libraries/LibJS/Runtime/WeakMap.h index c8b60e590e..e99ca29c3a 100644 --- a/Userland/Libraries/LibJS/Runtime/WeakMap.h +++ b/Userland/Libraries/LibJS/Runtime/WeakMap.h @@ -23,8 +23,8 @@ public: virtual ~WeakMap() override = default; - HashMap, Value> const& values() const { return m_values; }; - HashMap, Value>& values() { return m_values; }; + HashMap, Value> const& values() const { return m_values; } + HashMap, Value>& values() { return m_values; } virtual void remove_dead_cells(Badge) override; diff --git a/Userland/Libraries/LibJS/Runtime/WeakRef.h b/Userland/Libraries/LibJS/Runtime/WeakRef.h index be72301d18..a4e3704104 100644 --- a/Userland/Libraries/LibJS/Runtime/WeakRef.h +++ b/Userland/Libraries/LibJS/Runtime/WeakRef.h @@ -23,9 +23,9 @@ public: virtual ~WeakRef() override = default; - auto const& value() const { return m_value; }; + auto const& value() const { return m_value; } - void update_execution_generation() { m_last_execution_generation = vm().execution_generation(); }; + void update_execution_generation() { m_last_execution_generation = vm().execution_generation(); } virtual void remove_dead_cells(Badge) override; diff --git a/Userland/Libraries/LibJS/Runtime/WeakSet.h b/Userland/Libraries/LibJS/Runtime/WeakSet.h index c012d58cfb..d58defbba0 100644 --- a/Userland/Libraries/LibJS/Runtime/WeakSet.h +++ b/Userland/Libraries/LibJS/Runtime/WeakSet.h @@ -23,8 +23,8 @@ public: virtual ~WeakSet() override = default; - HashTable> const& values() const { return m_values; }; - HashTable>& values() { return m_values; }; + HashTable> const& values() const { return m_values; } + HashTable>& values() { return m_values; } virtual void remove_dead_cells(Badge) override; diff --git a/Userland/Libraries/LibKeyboard/CharacterMap.h b/Userland/Libraries/LibKeyboard/CharacterMap.h index 48a971a836..fa4591014e 100644 --- a/Userland/Libraries/LibKeyboard/CharacterMap.h +++ b/Userland/Libraries/LibKeyboard/CharacterMap.h @@ -21,7 +21,7 @@ public: int set_system_map(); static ErrorOr fetch_system_map(); - CharacterMapData const& character_map_data() const { return m_character_map_data; }; + CharacterMapData const& character_map_data() const { return m_character_map_data; } DeprecatedString const& character_map_name() const; private: diff --git a/Userland/Libraries/LibLine/Editor.cpp b/Userland/Libraries/LibLine/Editor.cpp index 8b1b10cc7b..5acfa74a76 100644 --- a/Userland/Libraries/LibLine/Editor.cpp +++ b/Userland/Libraries/LibLine/Editor.cpp @@ -1335,7 +1335,7 @@ ErrorOr Editor::cleanup() m_extra_forward_lines = 0; TRY(reposition_cursor(*stderr_stream)); return {}; -}; +} ErrorOr Editor::refresh_display() { diff --git a/Userland/Libraries/LibManual/PageNode.h b/Userland/Libraries/LibManual/PageNode.h index 8f2db597c3..57ea6d0f5d 100644 --- a/Userland/Libraries/LibManual/PageNode.h +++ b/Userland/Libraries/LibManual/PageNode.h @@ -25,9 +25,9 @@ public: virtual ErrorOr>> children() const override; virtual Node const* parent() const override; - virtual ErrorOr name() const override { return m_page; }; + virtual ErrorOr name() const override { return m_page; } virtual bool is_page() const override { return true; } - virtual PageNode const* document() const override { return this; }; + virtual PageNode const* document() const override { return this; } virtual unsigned section_number() const override; virtual ErrorOr path() const override; diff --git a/Userland/Libraries/LibPCIDB/Database.h b/Userland/Libraries/LibPCIDB/Database.h index a2ad690366..9353578bcf 100644 --- a/Userland/Libraries/LibPCIDB/Database.h +++ b/Userland/Libraries/LibPCIDB/Database.h @@ -54,7 +54,7 @@ struct Class { class Database : public RefCounted { public: static RefPtr open(DeprecatedString const& filename); - static RefPtr open() { return open("/res/pci.ids"); }; + static RefPtr open() { return open("/res/pci.ids"); } const StringView get_vendor(u16 vendor_id) const; const StringView get_device(u16 vendor_id, u16 device_id) const; diff --git a/Userland/Libraries/LibPDF/ColorSpace.h b/Userland/Libraries/LibPDF/ColorSpace.h index bbffb3db57..1a24c37b23 100644 --- a/Userland/Libraries/LibPDF/ColorSpace.h +++ b/Userland/Libraries/LibPDF/ColorSpace.h @@ -34,8 +34,8 @@ public: { } - DeprecatedFlyString name() const { return m_name; }; - bool never_needs_parameters() const { return m_never_needs_parameters; }; + DeprecatedFlyString name() const { return m_name; } + bool never_needs_parameters() const { return m_never_needs_parameters; } static PDFErrorOr get(DeprecatedFlyString const&); #define ENUMERATE(name, ever_needs_parameters) static ColorSpaceFamily name; diff --git a/Userland/Libraries/LibPDF/DocumentParser.h b/Userland/Libraries/LibPDF/DocumentParser.h index 6f94603d36..34839cca34 100644 --- a/Userland/Libraries/LibPDF/DocumentParser.h +++ b/Userland/Libraries/LibPDF/DocumentParser.h @@ -25,7 +25,7 @@ public: // Parses the header and initializes the xref table and trailer PDFErrorOr initialize(); - bool can_resolve_references() { return m_xref_table; }; + bool can_resolve_references() { return m_xref_table; } PDFErrorOr parse_object_with_index(u32 index); diff --git a/Userland/Libraries/LibPDF/Filter.cpp b/Userland/Libraries/LibPDF/Filter.cpp index b14eb22d0a..fc1a782351 100644 --- a/Userland/Libraries/LibPDF/Filter.cpp +++ b/Userland/Libraries/LibPDF/Filter.cpp @@ -83,7 +83,7 @@ PDFErrorOr Filter::decode_ascii_hex(ReadonlyBytes bytes) TRY(output.try_append(high_nibble << 4)); return output; -}; +} PDFErrorOr Filter::decode_ascii85(ReadonlyBytes bytes) { @@ -138,7 +138,7 @@ PDFErrorOr Filter::decode_ascii85(ReadonlyBytes bytes) } return TRY(ByteBuffer::copy(buff.span())); -}; +} PDFErrorOr Filter::decode_png_prediction(Bytes bytes, int bytes_per_row) { @@ -208,7 +208,7 @@ PDFErrorOr Filter::decode_png_prediction(Bytes bytes, int bytes_per_ PDFErrorOr Filter::decode_lzw(ReadonlyBytes) { return Error::rendering_unsupported_error("LZW Filter is not supported"); -}; +} PDFErrorOr Filter::decode_flate(ReadonlyBytes bytes, int predictor, int columns, int colors, int bits_per_component) { @@ -228,7 +228,7 @@ PDFErrorOr Filter::decode_flate(ReadonlyBytes bytes, int predictor, return AK::Error::from_string_literal("Flate input data is not divisible into columns"); return decode_png_prediction(buff, bytes_per_row); -}; +} PDFErrorOr Filter::decode_run_length(ReadonlyBytes bytes) { @@ -256,17 +256,17 @@ PDFErrorOr Filter::decode_run_length(ReadonlyBytes bytes) } } return buffer; -}; +} PDFErrorOr Filter::decode_ccitt(ReadonlyBytes) { return Error::rendering_unsupported_error("CCITTFaxDecode Filter is unsupported"); -}; +} PDFErrorOr Filter::decode_jbig2(ReadonlyBytes) { return Error::rendering_unsupported_error("JBIG2 Filter is unsupported"); -}; +} PDFErrorOr Filter::decode_dct(ReadonlyBytes bytes) { @@ -277,16 +277,16 @@ PDFErrorOr Filter::decode_dct(ReadonlyBytes bytes) return TRY(frame.image->serialize_to_byte_buffer()); } return AK::Error::from_string_literal("Not a JPEG image!"); -}; +} PDFErrorOr Filter::decode_jpx(ReadonlyBytes) { return Error::rendering_unsupported_error("JPX Filter is not supported"); -}; +} PDFErrorOr Filter::decode_crypt(ReadonlyBytes) { return Error::rendering_unsupported_error("Crypt Filter is not supported"); -}; +} } diff --git a/Userland/Libraries/LibPDF/Fonts/PDFFont.h b/Userland/Libraries/LibPDF/Fonts/PDFFont.h index 8bd9d62737..9c5a0fb720 100644 --- a/Userland/Libraries/LibPDF/Fonts/PDFFont.h +++ b/Userland/Libraries/LibPDF/Fonts/PDFFont.h @@ -29,7 +29,7 @@ public: virtual PDFErrorOr draw_string(Gfx::Painter&, Gfx::FloatPoint, DeprecatedString const&, Color const&, float font_size, float character_spacing, float horizontal_scaling) = 0; virtual Type type() const = 0; - DeprecatedFlyString base_font_name() const { return m_base_font_name; }; + DeprecatedFlyString base_font_name() const { return m_base_font_name; } protected: virtual PDFErrorOr initialize(Document* document, NonnullRefPtr const& dict, float font_size); diff --git a/Userland/Libraries/LibPDF/Fonts/Type0Font.cpp b/Userland/Libraries/LibPDF/Fonts/Type0Font.cpp index e88ee96937..2263cdbdc0 100644 --- a/Userland/Libraries/LibPDF/Fonts/Type0Font.cpp +++ b/Userland/Libraries/LibPDF/Fonts/Type0Font.cpp @@ -90,6 +90,6 @@ float Type0Font::get_char_width(u16 char_code) const PDFErrorOr Type0Font::draw_string(Gfx::Painter&, Gfx::FloatPoint, DeprecatedString const&, Color const&, float, float, float) { return Error::rendering_unsupported_error("Type0 font not implemented yet"); -}; +} } diff --git a/Userland/Libraries/LibPDF/ObjectDerivatives.h b/Userland/Libraries/LibPDF/ObjectDerivatives.h index 2cc5263f41..ef2f78f7eb 100644 --- a/Userland/Libraries/LibPDF/ObjectDerivatives.h +++ b/Userland/Libraries/LibPDF/ObjectDerivatives.h @@ -83,7 +83,7 @@ public: ALWAYS_INLINE Value const& at(size_t index) const { return m_elements[index]; } PDFErrorOr> get_object_at(Document* document, size_t index) const; - NonnullRefPtr get_object_at(size_t index) const { return at(index).get>(); }; + NonnullRefPtr get_object_at(size_t index) const { return at(index).get>(); } #define DEFINE_INDEXER(class_name, snake_name) \ PDFErrorOr> get_##snake_name##_at(Document*, size_t index) const; \ @@ -162,8 +162,8 @@ public: virtual ~StreamObject() override = default; [[nodiscard]] ALWAYS_INLINE NonnullRefPtr dict() const { return m_dict; } - [[nodiscard]] ReadonlyBytes bytes() const { return m_buffer.bytes(); }; - [[nodiscard]] ByteBuffer& buffer() { return m_buffer; }; + [[nodiscard]] ReadonlyBytes bytes() const { return m_buffer.bytes(); } + [[nodiscard]] ByteBuffer& buffer() { return m_buffer; } char const* type_name() const override { return "stream"; } DeprecatedString to_deprecated_string(int indent) const override; diff --git a/Userland/Libraries/LibPartition/MBRPartitionTable.h b/Userland/Libraries/LibPartition/MBRPartitionTable.h index a12e307ff9..7241d7e5b6 100644 --- a/Userland/Libraries/LibPartition/MBRPartitionTable.h +++ b/Userland/Libraries/LibPartition/MBRPartitionTable.h @@ -45,11 +45,11 @@ public: bool is_protective_mbr() const; bool contains_ebr() const; - virtual bool is_valid() const override { return m_valid; }; + virtual bool is_valid() const override { return m_valid; } protected: Header const& header() const; - bool is_header_valid() const { return m_header_valid; }; + bool is_header_valid() const { return m_header_valid; } private: bool read_boot_record(); diff --git a/Userland/Libraries/LibRegex/RegexParser.h b/Userland/Libraries/LibRegex/RegexParser.h index 12d8b14b9e..938b688874 100644 --- a/Userland/Libraries/LibRegex/RegexParser.h +++ b/Userland/Libraries/LibRegex/RegexParser.h @@ -290,7 +290,7 @@ private: { for (auto& index : m_capture_groups_in_scope.last()) stack.insert_bytecode_clear_capture_group(index); - }; + } // ECMA-262's flavour of regex is a bit weird in that it allows backrefs to reference "future" captures, and such backrefs // always match the empty string. So we have to know how many capturing parenthesis there are, but we don't want to always diff --git a/Userland/Libraries/LibSQL/AST/AST.h b/Userland/Libraries/LibSQL/AST/AST.h index e4897538d7..047ff58b86 100644 --- a/Userland/Libraries/LibSQL/AST/AST.h +++ b/Userland/Libraries/LibSQL/AST/AST.h @@ -154,7 +154,7 @@ public: { } - bool return_all_columns() const { return m_columns.is_empty(); }; + bool return_all_columns() const { return m_columns.is_empty(); } Vector const& columns() const { return m_columns; } private: @@ -975,7 +975,7 @@ public: DeprecatedString const& alias() const { return m_alias; } Vector const& column_names() const { return m_column_names; } - bool default_values() const { return !has_expressions() && !has_selection(); }; + bool default_values() const { return !has_expressions() && !has_selection(); } bool has_expressions() const { return !m_chained_expressions.is_empty(); } Vector> const& chained_expressions() const { return m_chained_expressions; } diff --git a/Userland/Libraries/LibSyntax/Highlighter.h b/Userland/Libraries/LibSyntax/Highlighter.h index 8ba81ea77b..6479505dca 100644 --- a/Userland/Libraries/LibSyntax/Highlighter.h +++ b/Userland/Libraries/LibSyntax/Highlighter.h @@ -28,8 +28,8 @@ public: virtual void rehighlight(Palette const&) = 0; virtual void highlight_matching_token_pair(); - virtual bool is_identifier(u64) const { return false; }; - virtual bool is_navigatable(u64) const { return false; }; + virtual bool is_identifier(u64) const { return false; } + virtual bool is_navigatable(u64) const { return false; } void attach(HighlighterClient&); void detach(); diff --git a/Userland/Libraries/LibSyntax/HighlighterClient.h b/Userland/Libraries/LibSyntax/HighlighterClient.h index a535a60e85..e86bcb3769 100644 --- a/Userland/Libraries/LibSyntax/HighlighterClient.h +++ b/Userland/Libraries/LibSyntax/HighlighterClient.h @@ -19,7 +19,7 @@ public: virtual Vector const& spans() const = 0; virtual void set_span_at_index(size_t index, GUI::TextDocumentSpan span) = 0; - virtual void clear_spans() { do_set_spans({}); }; + virtual void clear_spans() { do_set_spans({}); } virtual Vector& folding_regions() = 0; virtual Vector const& folding_regions() const = 0; diff --git a/Userland/Libraries/LibTest/JavaScriptTestRunner.h b/Userland/Libraries/LibTest/JavaScriptTestRunner.h index 65f29c520d..7895957ed1 100644 --- a/Userland/Libraries/LibTest/JavaScriptTestRunner.h +++ b/Userland/Libraries/LibTest/JavaScriptTestRunner.h @@ -83,7 +83,7 @@ __TestJS_flag_hook_##flag() \ { \ ::Test::JS::g_extra_args.set(&(flag), { help_string, long_name, short_name }); \ - }; \ + } \ } __testjs_flag_hook_##flag; #define TEST_ROOT(path) \ diff --git a/Userland/Libraries/LibTest/TestRunner.h b/Userland/Libraries/LibTest/TestRunner.h index bacf7ff6d7..6dab664ab7 100644 --- a/Userland/Libraries/LibTest/TestRunner.h +++ b/Userland/Libraries/LibTest/TestRunner.h @@ -39,7 +39,7 @@ public: s_the = this; } - virtual ~TestRunner() { s_the = nullptr; }; + virtual ~TestRunner() { s_the = nullptr; } virtual void run(DeprecatedString test_glob); diff --git a/Userland/Libraries/LibUSBDB/Database.h b/Userland/Libraries/LibUSBDB/Database.h index fdb87f5ccd..5f0e297df0 100644 --- a/Userland/Libraries/LibUSBDB/Database.h +++ b/Userland/Libraries/LibUSBDB/Database.h @@ -53,7 +53,7 @@ struct Class { class Database : public RefCounted { public: static RefPtr open(DeprecatedString const& filename); - static RefPtr open() { return open("/res/usb.ids"); }; + static RefPtr open() { return open("/res/usb.ids"); } const StringView get_vendor(u16 vendor_id) const; const StringView get_device(u16 vendor_id, u16 device_id) const; diff --git a/Userland/Libraries/LibVT/Terminal.h b/Userland/Libraries/LibVT/Terminal.h index 25d53b4ed0..6e3b12dd19 100644 --- a/Userland/Libraries/LibVT/Terminal.h +++ b/Userland/Libraries/LibVT/Terminal.h @@ -180,7 +180,7 @@ public: bool needs_bracketed_paste() const { return m_needs_bracketed_paste; - }; + } bool is_within_scroll_region(u16 line) const { @@ -400,8 +400,8 @@ protected: m_history_start = (m_history_start + 1) % m_history.size(); } - Vector>& active_buffer() { return m_use_alternate_screen_buffer ? m_alternate_screen_buffer : m_normal_screen_buffer; }; - Vector> const& active_buffer() const { return m_use_alternate_screen_buffer ? m_alternate_screen_buffer : m_normal_screen_buffer; }; + Vector>& active_buffer() { return m_use_alternate_screen_buffer ? m_alternate_screen_buffer : m_normal_screen_buffer; } + Vector> const& active_buffer() const { return m_use_alternate_screen_buffer ? m_alternate_screen_buffer : m_normal_screen_buffer; } Vector> m_normal_screen_buffer; Vector> m_alternate_screen_buffer; #endif diff --git a/Userland/Libraries/LibVT/TerminalWidget.cpp b/Userland/Libraries/LibVT/TerminalWidget.cpp index 7a30e830b1..5af3d87d5c 100644 --- a/Userland/Libraries/LibVT/TerminalWidget.cpp +++ b/Userland/Libraries/LibVT/TerminalWidget.cpp @@ -1303,7 +1303,7 @@ constexpr Gfx::Color TerminalWidget::terminal_color_to_rgb(VT::Color color) cons default: VERIFY_NOT_REACHED(); } -}; +} void TerminalWidget::set_font_and_resize_to_fit(Gfx::Font const& font) { diff --git a/Userland/Libraries/LibVT/TerminalWidget.h b/Userland/Libraries/LibVT/TerminalWidget.h index 09b566a370..0b50c924b2 100644 --- a/Userland/Libraries/LibVT/TerminalWidget.h +++ b/Userland/Libraries/LibVT/TerminalWidget.h @@ -42,7 +42,7 @@ public: void apply_size_increments_to_window(GUI::Window&); void set_opacity(u8); - float opacity() { return m_opacity; }; + float opacity() { return m_opacity; } void set_show_scrollbar(bool); @@ -53,7 +53,7 @@ public: }; BellMode bell_mode() { return m_bell_mode; } - void set_bell_mode(BellMode bm) { m_bell_mode = bm; }; + void set_bell_mode(BellMode bm) { m_bell_mode = bm; } bool has_selection() const; bool selection_contains(const VT::Position&) const; diff --git a/Userland/Libraries/LibVideo/Color/CodingIndependentCodePoints.h b/Userland/Libraries/LibVideo/Color/CodingIndependentCodePoints.h index f40fb1bc31..0818196bb9 100644 --- a/Userland/Libraries/LibVideo/Color/CodingIndependentCodePoints.h +++ b/Userland/Libraries/LibVideo/Color/CodingIndependentCodePoints.h @@ -160,7 +160,7 @@ constexpr StringView color_primaries_to_string(ColorPrimaries color_primaries) return "EBU Tech 3213"sv; } return "Reserved"sv; -}; +} constexpr StringView transfer_characteristics_to_string(TransferCharacteristics transfer_characteristics) { @@ -203,7 +203,7 @@ constexpr StringView transfer_characteristics_to_string(TransferCharacteristics return "ARIB STD-B67 (HLG, BT.2100)"sv; } return "Reserved"sv; -}; +} constexpr StringView matrix_coefficients_to_string(MatrixCoefficients matrix_coefficients) { @@ -238,7 +238,7 @@ constexpr StringView matrix_coefficients_to_string(MatrixCoefficients matrix_coe return "BT.2100 ICtCp"sv; } return "Reserved"sv; -}; +} constexpr StringView video_full_range_flag_to_string(VideoFullRangeFlag video_full_range_flag) { @@ -251,6 +251,6 @@ constexpr StringView video_full_range_flag_to_string(VideoFullRangeFlag video_fu return "Unspecified"sv; } return "Unknown"sv; -}; +} } diff --git a/Userland/Libraries/LibVideo/PlaybackManager.cpp b/Userland/Libraries/LibVideo/PlaybackManager.cpp index 6189e21b41..45524d3308 100644 --- a/Userland/Libraries/LibVideo/PlaybackManager.cpp +++ b/Userland/Libraries/LibVideo/PlaybackManager.cpp @@ -416,7 +416,7 @@ private: StringView name() override { return "Playing"sv; } - bool is_playing() const override { return true; }; + bool is_playing() const override { return true; } PlaybackState get_state() const override { return PlaybackState::Playing; } ErrorOr pause() override { @@ -540,7 +540,7 @@ private: { return replace_handler_and_delete_this(); } - bool is_playing() const override { return false; }; + bool is_playing() const override { return false; } PlaybackState get_state() const override { return PlaybackState::Paused; } }; @@ -710,7 +710,7 @@ private: manager().m_decode_wait_condition.broadcast(); return replace_handler_and_delete_this(true, Duration::zero(), SeekMode::Fast); } - bool is_playing() const override { return false; }; + bool is_playing() const override { return false; } PlaybackState get_state() const override { return PlaybackState::Stopped; } }; diff --git a/Userland/Libraries/LibVideo/PlaybackManager.h b/Userland/Libraries/LibVideo/PlaybackManager.h index 4a2665e243..b35d770b6c 100644 --- a/Userland/Libraries/LibVideo/PlaybackManager.h +++ b/Userland/Libraries/LibVideo/PlaybackManager.h @@ -207,17 +207,17 @@ private: virtual ErrorOr on_enter() { return {}; } - virtual ErrorOr play() { return {}; }; + virtual ErrorOr play() { return {}; } virtual bool is_playing() const = 0; virtual PlaybackState get_state() const = 0; - virtual ErrorOr pause() { return {}; }; - virtual ErrorOr buffer() { return {}; }; + virtual ErrorOr pause() { return {}; } + virtual ErrorOr buffer() { return {}; } virtual ErrorOr seek(Duration target_timestamp, SeekMode); virtual ErrorOr stop(); virtual Duration current_time() const; - virtual ErrorOr do_timed_state_update() { return {}; }; + virtual ErrorOr do_timed_state_update() { return {}; } protected: template diff --git a/Userland/Libraries/LibVideo/VP9/ProbabilityTables.h b/Userland/Libraries/LibVideo/VP9/ProbabilityTables.h index 15096f8f67..2886f432b4 100644 --- a/Userland/Libraries/LibVideo/VP9/ProbabilityTables.h +++ b/Userland/Libraries/LibVideo/VP9/ProbabilityTables.h @@ -52,48 +52,48 @@ public: KfYModeProbs const& kf_y_mode_probs() const; KfUVModeProbs const& kf_uv_mode_prob() const; - PartitionProbs& partition_probs() { return m_current_probability_table.partition_probs; }; - PartitionProbs const& partition_probs() const { return m_current_probability_table.partition_probs; }; - YModeProbs& y_mode_probs() { return m_current_probability_table.y_mode_probs; }; - YModeProbs const& y_mode_probs() const { return m_current_probability_table.y_mode_probs; }; - UVModeProbs& uv_mode_probs() { return m_current_probability_table.uv_mode_probs; }; - UVModeProbs const& uv_mode_probs() const { return m_current_probability_table.uv_mode_probs; }; - SkipProb& skip_prob() { return m_current_probability_table.skip_prob; }; - SkipProb const& skip_prob() const { return m_current_probability_table.skip_prob; }; - IsInterProb& is_inter_prob() { return m_current_probability_table.is_inter_prob; }; - IsInterProb const& is_inter_prob() const { return m_current_probability_table.is_inter_prob; }; - CompModeProb& comp_mode_prob() { return m_current_probability_table.comp_mode_prob; }; - CompModeProb const& comp_mode_prob() const { return m_current_probability_table.comp_mode_prob; }; - CompRefProb& comp_ref_prob() { return m_current_probability_table.comp_ref_prob; }; - CompRefProb const& comp_ref_prob() const { return m_current_probability_table.comp_ref_prob; }; - SingleRefProb& single_ref_prob() { return m_current_probability_table.single_ref_prob; }; - SingleRefProb const& single_ref_prob() const { return m_current_probability_table.single_ref_prob; }; - MvSignProb& mv_sign_prob() { return m_current_probability_table.mv_sign_prob; }; - MvSignProb const& mv_sign_prob() const { return m_current_probability_table.mv_sign_prob; }; - MvBitsProb& mv_bits_prob() { return m_current_probability_table.mv_bits_prob; }; - MvBitsProb const& mv_bits_prob() const { return m_current_probability_table.mv_bits_prob; }; - MvClass0BitProb& mv_class0_bit_prob() { return m_current_probability_table.mv_class0_bit_prob; }; - MvClass0BitProb const& mv_class0_bit_prob() const { return m_current_probability_table.mv_class0_bit_prob; }; - TxProbs& tx_probs() { return m_current_probability_table.tx_probs; }; - TxProbs const& tx_probs() const { return m_current_probability_table.tx_probs; }; - InterModeProbs& inter_mode_probs() { return m_current_probability_table.inter_mode_probs; }; - InterModeProbs const& inter_mode_probs() const { return m_current_probability_table.inter_mode_probs; }; - InterpFilterProbs& interp_filter_probs() { return m_current_probability_table.interp_filter_probs; }; - InterpFilterProbs const& interp_filter_probs() const { return m_current_probability_table.interp_filter_probs; }; - MvJointProbs& mv_joint_probs() { return m_current_probability_table.mv_joint_probs; }; - MvJointProbs const& mv_joint_probs() const { return m_current_probability_table.mv_joint_probs; }; - MvClassProbs& mv_class_probs() { return m_current_probability_table.mv_class_probs; }; - MvClassProbs const& mv_class_probs() const { return m_current_probability_table.mv_class_probs; }; - MvClass0FrProbs& mv_class0_fr_probs() { return m_current_probability_table.mv_class0_fr_probs; }; - MvClass0FrProbs const& mv_class0_fr_probs() const { return m_current_probability_table.mv_class0_fr_probs; }; - MvClass0HpProbs& mv_class0_hp_prob() { return m_current_probability_table.mv_class0_hp_prob; }; - MvClass0HpProbs const& mv_class0_hp_prob() const { return m_current_probability_table.mv_class0_hp_prob; }; - MvFrProbs& mv_fr_probs() { return m_current_probability_table.mv_fr_probs; }; - MvFrProbs const& mv_fr_probs() const { return m_current_probability_table.mv_fr_probs; }; - MvHpProb& mv_hp_prob() { return m_current_probability_table.mv_hp_prob; }; - MvHpProb const& mv_hp_prob() const { return m_current_probability_table.mv_hp_prob; }; - CoefProbs& coef_probs() { return m_current_probability_table.coef_probs; }; - CoefProbs const& coef_probs() const { return m_current_probability_table.coef_probs; }; + PartitionProbs& partition_probs() { return m_current_probability_table.partition_probs; } + PartitionProbs const& partition_probs() const { return m_current_probability_table.partition_probs; } + YModeProbs& y_mode_probs() { return m_current_probability_table.y_mode_probs; } + YModeProbs const& y_mode_probs() const { return m_current_probability_table.y_mode_probs; } + UVModeProbs& uv_mode_probs() { return m_current_probability_table.uv_mode_probs; } + UVModeProbs const& uv_mode_probs() const { return m_current_probability_table.uv_mode_probs; } + SkipProb& skip_prob() { return m_current_probability_table.skip_prob; } + SkipProb const& skip_prob() const { return m_current_probability_table.skip_prob; } + IsInterProb& is_inter_prob() { return m_current_probability_table.is_inter_prob; } + IsInterProb const& is_inter_prob() const { return m_current_probability_table.is_inter_prob; } + CompModeProb& comp_mode_prob() { return m_current_probability_table.comp_mode_prob; } + CompModeProb const& comp_mode_prob() const { return m_current_probability_table.comp_mode_prob; } + CompRefProb& comp_ref_prob() { return m_current_probability_table.comp_ref_prob; } + CompRefProb const& comp_ref_prob() const { return m_current_probability_table.comp_ref_prob; } + SingleRefProb& single_ref_prob() { return m_current_probability_table.single_ref_prob; } + SingleRefProb const& single_ref_prob() const { return m_current_probability_table.single_ref_prob; } + MvSignProb& mv_sign_prob() { return m_current_probability_table.mv_sign_prob; } + MvSignProb const& mv_sign_prob() const { return m_current_probability_table.mv_sign_prob; } + MvBitsProb& mv_bits_prob() { return m_current_probability_table.mv_bits_prob; } + MvBitsProb const& mv_bits_prob() const { return m_current_probability_table.mv_bits_prob; } + MvClass0BitProb& mv_class0_bit_prob() { return m_current_probability_table.mv_class0_bit_prob; } + MvClass0BitProb const& mv_class0_bit_prob() const { return m_current_probability_table.mv_class0_bit_prob; } + TxProbs& tx_probs() { return m_current_probability_table.tx_probs; } + TxProbs const& tx_probs() const { return m_current_probability_table.tx_probs; } + InterModeProbs& inter_mode_probs() { return m_current_probability_table.inter_mode_probs; } + InterModeProbs const& inter_mode_probs() const { return m_current_probability_table.inter_mode_probs; } + InterpFilterProbs& interp_filter_probs() { return m_current_probability_table.interp_filter_probs; } + InterpFilterProbs const& interp_filter_probs() const { return m_current_probability_table.interp_filter_probs; } + MvJointProbs& mv_joint_probs() { return m_current_probability_table.mv_joint_probs; } + MvJointProbs const& mv_joint_probs() const { return m_current_probability_table.mv_joint_probs; } + MvClassProbs& mv_class_probs() { return m_current_probability_table.mv_class_probs; } + MvClassProbs const& mv_class_probs() const { return m_current_probability_table.mv_class_probs; } + MvClass0FrProbs& mv_class0_fr_probs() { return m_current_probability_table.mv_class0_fr_probs; } + MvClass0FrProbs const& mv_class0_fr_probs() const { return m_current_probability_table.mv_class0_fr_probs; } + MvClass0HpProbs& mv_class0_hp_prob() { return m_current_probability_table.mv_class0_hp_prob; } + MvClass0HpProbs const& mv_class0_hp_prob() const { return m_current_probability_table.mv_class0_hp_prob; } + MvFrProbs& mv_fr_probs() { return m_current_probability_table.mv_fr_probs; } + MvFrProbs const& mv_fr_probs() const { return m_current_probability_table.mv_fr_probs; } + MvHpProb& mv_hp_prob() { return m_current_probability_table.mv_hp_prob; } + MvHpProb const& mv_hp_prob() const { return m_current_probability_table.mv_hp_prob; } + CoefProbs& coef_probs() { return m_current_probability_table.coef_probs; } + CoefProbs const& coef_probs() const { return m_current_probability_table.coef_probs; } private: struct ProbabilityTable { diff --git a/Userland/Libraries/LibVirtGPU/CommandBufferBuilder.cpp b/Userland/Libraries/LibVirtGPU/CommandBufferBuilder.cpp index 7992d76bbf..a49da6e993 100644 --- a/Userland/Libraries/LibVirtGPU/CommandBufferBuilder.cpp +++ b/Userland/Libraries/LibVirtGPU/CommandBufferBuilder.cpp @@ -21,7 +21,7 @@ static u32 encode_command(u16 length, Protocol::ObjectType object_type, Protocol u8 command_value = to_underlying(command); u8 object_type_value = to_underlying(object_type); return (length << 16) | (object_type_value << 8) | command_value; -}; +} class CommandBuilder { public: diff --git a/Userland/Libraries/LibWasm/Types.h b/Userland/Libraries/LibWasm/Types.h index e653b71ea1..238b68b1c8 100644 --- a/Userland/Libraries/LibWasm/Types.h +++ b/Userland/Libraries/LibWasm/Types.h @@ -498,7 +498,7 @@ public: if (result.is_error()) return result.error(); return Import { module.release_value(), name.release_value(), result.release_value() }; - }; + } DeprecatedString m_module; DeprecatedString m_name; @@ -563,7 +563,7 @@ public: { } - auto& tables() const { return m_tables; }; + auto& tables() const { return m_tables; } static ParseResult parse(Stream& stream); diff --git a/Userland/Libraries/LibWeb/ARIA/ARIAMixin.h b/Userland/Libraries/LibWeb/ARIA/ARIAMixin.h index 9a4cd76598..8b9b06a9c1 100644 --- a/Userland/Libraries/LibWeb/ARIA/ARIAMixin.h +++ b/Userland/Libraries/LibWeb/ARIA/ARIAMixin.h @@ -167,7 +167,7 @@ public: virtual WebIDL::ExceptionOr set_aria_value_text(DeprecatedString const&) = 0; // https://www.w3.org/TR/html-aria/#docconformance - virtual Optional default_role() const { return {}; }; + virtual Optional default_role() const { return {}; } Optional role_or_default() const; diff --git a/Userland/Libraries/LibWeb/ARIA/RoleType.h b/Userland/Libraries/LibWeb/ARIA/RoleType.h index d8437aee46..a000ca6510 100644 --- a/Userland/Libraries/LibWeb/ARIA/RoleType.h +++ b/Userland/Libraries/LibWeb/ARIA/RoleType.h @@ -47,7 +47,7 @@ public: virtual bool children_are_presentational() const { return false; } // https://www.w3.org/TR/wai-aria-1.2/#implictValueForRole using DefaultValueType = Variant; - virtual DefaultValueType default_value_for_property_or_state(StateAndProperties) const { return {}; }; + virtual DefaultValueType default_value_for_property_or_state(StateAndProperties) const { return {}; } ErrorOr serialize_as_json(JsonObjectSerializer& object) const; protected: diff --git a/Userland/Libraries/LibWeb/CSS/CSSImportRule.h b/Userland/Libraries/LibWeb/CSS/CSSImportRule.h index 03df9a6e96..92d4941cc6 100644 --- a/Userland/Libraries/LibWeb/CSS/CSSImportRule.h +++ b/Userland/Libraries/LibWeb/CSS/CSSImportRule.h @@ -34,7 +34,7 @@ public: CSSStyleSheet* style_sheet_for_bindings() { return m_style_sheet; } void set_style_sheet(CSSStyleSheet* style_sheet) { m_style_sheet = style_sheet; } - virtual Type type() const override { return Type::Import; }; + virtual Type type() const override { return Type::Import; } private: CSSImportRule(AK::URL, DOM::Document&); diff --git a/Userland/Libraries/LibWeb/CSS/CSSKeyframeRule.h b/Userland/Libraries/LibWeb/CSS/CSSKeyframeRule.h index e812a161e6..1ef0194fed 100644 --- a/Userland/Libraries/LibWeb/CSS/CSSKeyframeRule.h +++ b/Userland/Libraries/LibWeb/CSS/CSSKeyframeRule.h @@ -27,7 +27,7 @@ public: virtual ~CSSKeyframeRule() = default; - virtual Type type() const override { return Type::Keyframe; }; + virtual Type type() const override { return Type::Keyframe; } CSS::Percentage key() const { return m_key; } JS::NonnullGCPtr style() const { return m_declarations; } diff --git a/Userland/Libraries/LibWeb/CSS/CSSKeyframesRule.h b/Userland/Libraries/LibWeb/CSS/CSSKeyframesRule.h index 5a17c5dc09..2a14401952 100644 --- a/Userland/Libraries/LibWeb/CSS/CSSKeyframesRule.h +++ b/Userland/Libraries/LibWeb/CSS/CSSKeyframesRule.h @@ -28,7 +28,7 @@ public: virtual ~CSSKeyframesRule() = default; - virtual Type type() const override { return Type::Keyframes; }; + virtual Type type() const override { return Type::Keyframes; } Vector> const& keyframes() const { return m_keyframes; } FlyString const& name() const { return m_name; } diff --git a/Userland/Libraries/LibWeb/CSS/CSSMediaRule.h b/Userland/Libraries/LibWeb/CSS/CSSMediaRule.h index df81977c1a..e6bf41631d 100644 --- a/Userland/Libraries/LibWeb/CSS/CSSMediaRule.h +++ b/Userland/Libraries/LibWeb/CSS/CSSMediaRule.h @@ -22,7 +22,7 @@ public: virtual ~CSSMediaRule() = default; - virtual Type type() const override { return Type::Media; }; + virtual Type type() const override { return Type::Media; } virtual DeprecatedString condition_text() const override; virtual void set_condition_text(DeprecatedString) override; diff --git a/Userland/Libraries/LibWeb/CSS/CSSStyleRule.h b/Userland/Libraries/LibWeb/CSS/CSSStyleRule.h index eab3a3bb9f..360883d015 100644 --- a/Userland/Libraries/LibWeb/CSS/CSSStyleRule.h +++ b/Userland/Libraries/LibWeb/CSS/CSSStyleRule.h @@ -25,7 +25,7 @@ public: Vector> const& selectors() const { return m_selectors; } CSSStyleDeclaration const& declaration() const { return m_declaration; } - virtual Type type() const override { return Type::Style; }; + virtual Type type() const override { return Type::Style; } DeprecatedString selector_text() const; void set_selector_text(StringView); diff --git a/Userland/Libraries/LibWeb/CSS/CSSSupportsRule.h b/Userland/Libraries/LibWeb/CSS/CSSSupportsRule.h index 081d416d48..ec3f8913b1 100644 --- a/Userland/Libraries/LibWeb/CSS/CSSSupportsRule.h +++ b/Userland/Libraries/LibWeb/CSS/CSSSupportsRule.h @@ -23,7 +23,7 @@ public: virtual ~CSSSupportsRule() = default; - virtual Type type() const override { return Type::Supports; }; + virtual Type type() const override { return Type::Supports; } DeprecatedString condition_text() const override; void set_condition_text(DeprecatedString) override; diff --git a/Userland/Libraries/LibWeb/CSS/GridTrackPlacement.h b/Userland/Libraries/LibWeb/CSS/GridTrackPlacement.h index 071b1c081f..3f8ccbdd50 100644 --- a/Userland/Libraries/LibWeb/CSS/GridTrackPlacement.h +++ b/Userland/Libraries/LibWeb/CSS/GridTrackPlacement.h @@ -23,7 +23,7 @@ public: GridTrackPlacement(String line_name, bool has_span = false); GridTrackPlacement(); - static GridTrackPlacement make_auto() { return GridTrackPlacement(); }; + static GridTrackPlacement make_auto() { return GridTrackPlacement(); } bool is_span() const { return m_type == Type::Span; } bool is_position() const { return m_type == Type::Position; } diff --git a/Userland/Libraries/LibWeb/CSS/GridTrackSize.h b/Userland/Libraries/LibWeb/CSS/GridTrackSize.h index 5183153efd..0b836ee238 100644 --- a/Userland/Libraries/LibWeb/CSS/GridTrackSize.h +++ b/Userland/Libraries/LibWeb/CSS/GridTrackSize.h @@ -37,7 +37,7 @@ public: bool is_max_content() const { return m_type == Type::MaxContent; } bool is_min_content() const { return m_type == Type::MinContent; } - LengthPercentage length_percentage() const { return m_length_percentage; }; + LengthPercentage length_percentage() const { return m_length_percentage; } double flex_factor() const { return m_flex_factor; } // https://www.w3.org/TR/css-grid-2/#layout-algorithm diff --git a/Userland/Libraries/LibWeb/CSS/LengthBox.h b/Userland/Libraries/LibWeb/CSS/LengthBox.h index 87f6d3cc05..59f2786af8 100644 --- a/Userland/Libraries/LibWeb/CSS/LengthBox.h +++ b/Userland/Libraries/LibWeb/CSS/LengthBox.h @@ -21,11 +21,11 @@ public: LengthPercentage& top() { return m_top; } LengthPercentage& right() { return m_right; } LengthPercentage& bottom() { return m_bottom; } - LengthPercentage& left() { return m_left; }; + LengthPercentage& left() { return m_left; } LengthPercentage const& top() const { return m_top; } LengthPercentage const& right() const { return m_right; } LengthPercentage const& bottom() const { return m_bottom; } - LengthPercentage const& left() const { return m_left; }; + LengthPercentage const& left() const { return m_left; } private: LengthPercentage m_top; diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp index 36518d89f5..509e216da0 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp @@ -2505,7 +2505,7 @@ static StringView consume_if_starts_with(StringView str, StringView start, auto return str.substring_view(start.length()); } return str; -}; +} ErrorOr> Parser::parse_linear_gradient_function(ComponentValue const& component_value) { @@ -5349,7 +5349,7 @@ static Optional identifier_to_edge(ValueID identifier) default: return {}; } -}; +} static Optional style_value_to_length_percentage(auto value) { @@ -5360,7 +5360,7 @@ static Optional style_value_to_length_percentage(auto value) if (value->is_calculated()) return LengthPercentage { value->as_calculated() }; return {}; -}; +} ErrorOr> Parser::parse_single_background_position_value(TokenStream& tokens) { @@ -7906,7 +7906,7 @@ bool block_contains_var_or_attr(Block const& block) return true; } return false; -}; +} Parser::ParseErrorOr> Parser::parse_css_value(PropertyID property_id, TokenStream& tokens) { diff --git a/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp b/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp index b130816090..4d02d52fd4 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp @@ -1600,7 +1600,7 @@ static NonnullRefPtr get_inherit_value(JS::Realm& initial_valu if (!parent_element || !parent_element->computed_css_values()) return property_initial_value(initial_value_context_realm, property_id).release_value_but_fixme_should_propagate_errors(); return parent_element->computed_css_values()->property(property_id); -}; +} void StyleComputer::compute_defaulted_property_value(StyleProperties& style, DOM::Element const* element, CSS::PropertyID property_id, Optional pseudo_element) const { diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.cpp b/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.cpp index e97129bf85..8ebfd289e9 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.cpp @@ -31,7 +31,7 @@ static double resolve_value_radians(CalculatedStyleValue::CalculationResult::Val [](Number const& number) { return number.value(); }, [](Angle const& angle) { return angle.to_radians(); }, [](auto const&) { VERIFY_NOT_REACHED(); return 0.0; }); -}; +} static double resolve_value(CalculatedStyleValue::CalculationResult::Value value, Optional context) { @@ -42,7 +42,7 @@ static double resolve_value(CalculatedStyleValue::CalculationResult::Value value [&context](Length const& length) { return length.to_px(*context).to_double(); }, [](Percentage const& percentage) { return percentage.value(); }, [](Time const& time) { return time.to_seconds(); }); -}; +} static Optional add_the_types(Vector> const& nodes, PropertyID property_id) { @@ -85,7 +85,7 @@ static CalculatedStyleValue::CalculationResult to_resolved_type(CalculatedStyleV } VERIFY_NOT_REACHED(); -}; +} CalculationNode::CalculationNode(Type type) : m_type(type) diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.h b/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.h index e56de48f8f..0f5a7c864b 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.h +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.h @@ -454,7 +454,7 @@ public: virtual ErrorOr to_string() const override; virtual Optional resolved_type() const override; virtual Optional determine_type(PropertyID) const override; - virtual bool contains_percentage() const override { return false; }; + virtual bool contains_percentage() const override { return false; } virtual CalculatedStyleValue::CalculationResult resolve(Optional context, CalculatedStyleValue::PercentageBasis const&) const override; virtual ErrorOr for_each_child_node(Function(NonnullOwnPtr&)> const&) override; @@ -607,7 +607,7 @@ public: virtual ErrorOr to_string() const override; virtual Optional resolved_type() const override; virtual Optional determine_type(PropertyID) const override; - virtual bool contains_percentage() const override { return false; }; + virtual bool contains_percentage() const override { return false; } virtual CalculatedStyleValue::CalculationResult resolve(Optional, CalculatedStyleValue::PercentageBasis const&) const override; virtual ErrorOr for_each_child_node(Function(NonnullOwnPtr&)> const&) override; @@ -627,7 +627,7 @@ public: virtual ErrorOr to_string() const override; virtual Optional resolved_type() const override; virtual Optional determine_type(PropertyID) const override; - virtual bool contains_percentage() const override { return false; }; + virtual bool contains_percentage() const override { return false; } virtual CalculatedStyleValue::CalculationResult resolve(Optional, CalculatedStyleValue::PercentageBasis const&) const override; virtual ErrorOr for_each_child_node(Function(NonnullOwnPtr&)> const&) override; @@ -665,7 +665,7 @@ public: virtual ErrorOr to_string() const override; virtual Optional resolved_type() const override; virtual Optional determine_type(PropertyID) const override; - virtual bool contains_percentage() const override { return false; }; + virtual bool contains_percentage() const override { return false; } virtual CalculatedStyleValue::CalculationResult resolve(Optional, CalculatedStyleValue::PercentageBasis const&) const override; virtual ErrorOr for_each_child_node(Function(NonnullOwnPtr&)> const&) override; @@ -685,7 +685,7 @@ public: virtual ErrorOr to_string() const override; virtual Optional resolved_type() const override; virtual Optional determine_type(PropertyID) const override; - virtual bool contains_percentage() const override { return false; }; + virtual bool contains_percentage() const override { return false; } virtual CalculatedStyleValue::CalculationResult resolve(Optional, CalculatedStyleValue::PercentageBasis const&) const override; virtual ErrorOr for_each_child_node(Function(NonnullOwnPtr&)> const&) override; diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/ColorStyleValue.h b/Userland/Libraries/LibWeb/CSS/StyleValues/ColorStyleValue.h index 50a623f059..0d1516820f 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/ColorStyleValue.h +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/ColorStyleValue.h @@ -24,7 +24,7 @@ public: virtual bool has_color() const override { return true; } virtual Color to_color(Optional) const override { return m_color; } - bool properties_equal(ColorStyleValue const& other) const { return m_color == other.m_color; }; + bool properties_equal(ColorStyleValue const& other) const { return m_color == other.m_color; } private: explicit ColorStyleValue(Color color) diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/ContentStyleValue.h b/Userland/Libraries/LibWeb/CSS/StyleValues/ContentStyleValue.h index 763fa96232..bfc5ce5f8b 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/ContentStyleValue.h +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/ContentStyleValue.h @@ -27,7 +27,7 @@ public: virtual ErrorOr to_string() const override; - bool properties_equal(ContentStyleValue const& other) const { return m_properties == other.m_properties; }; + bool properties_equal(ContentStyleValue const& other) const { return m_properties == other.m_properties; } private: ContentStyleValue(ValueComparingNonnullRefPtr content, ValueComparingRefPtr alt_text) diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/FilterValueListStyleValue.h b/Userland/Libraries/LibWeb/CSS/StyleValues/FilterValueListStyleValue.h index 601d774f28..7b3c5e9e60 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/FilterValueListStyleValue.h +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/FilterValueListStyleValue.h @@ -83,7 +83,7 @@ public: virtual ~FilterValueListStyleValue() override = default; - bool properties_equal(FilterValueListStyleValue const& other) const { return m_filter_value_list == other.m_filter_value_list; }; + bool properties_equal(FilterValueListStyleValue const& other) const { return m_filter_value_list == other.m_filter_value_list; } private: FilterValueListStyleValue(Vector filter_value_list) diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/FlexFlowStyleValue.h b/Userland/Libraries/LibWeb/CSS/StyleValues/FlexFlowStyleValue.h index 3f5e7dea6f..c6968a6bb9 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/FlexFlowStyleValue.h +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/FlexFlowStyleValue.h @@ -26,7 +26,7 @@ public: virtual ErrorOr to_string() const override; - bool properties_equal(FlexFlowStyleValue const& other) const { return m_properties == other.m_properties; }; + bool properties_equal(FlexFlowStyleValue const& other) const { return m_properties == other.m_properties; } private: FlexFlowStyleValue(ValueComparingNonnullRefPtr flex_direction, ValueComparingNonnullRefPtr flex_wrap) diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/FlexStyleValue.h b/Userland/Libraries/LibWeb/CSS/StyleValues/FlexStyleValue.h index 4059dfe3b2..ecd02846f0 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/FlexStyleValue.h +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/FlexStyleValue.h @@ -30,7 +30,7 @@ public: virtual ErrorOr to_string() const override; - bool properties_equal(FlexStyleValue const& other) const { return m_properties == other.m_properties; }; + bool properties_equal(FlexStyleValue const& other) const { return m_properties == other.m_properties; } private: FlexStyleValue( diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/FontStyleValue.h b/Userland/Libraries/LibWeb/CSS/StyleValues/FontStyleValue.h index 94f7470ccd..4563a22369 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/FontStyleValue.h +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/FontStyleValue.h @@ -36,7 +36,7 @@ public: virtual ErrorOr to_string() const override; - bool properties_equal(FontStyleValue const& other) const { return m_properties == other.m_properties; }; + bool properties_equal(FontStyleValue const& other) const { return m_properties == other.m_properties; } private: FontStyleValue(ValueComparingNonnullRefPtr font_stretch, ValueComparingNonnullRefPtr font_style, ValueComparingNonnullRefPtr font_weight, ValueComparingNonnullRefPtr font_size, ValueComparingNonnullRefPtr line_height, ValueComparingNonnullRefPtr font_families) diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/FrequencyStyleValue.h b/Userland/Libraries/LibWeb/CSS/StyleValues/FrequencyStyleValue.h index fb05ba069c..72b67b5820 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/FrequencyStyleValue.h +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/FrequencyStyleValue.h @@ -26,7 +26,7 @@ public: virtual ErrorOr to_string() const override { return m_frequency.to_string(); } - bool properties_equal(FrequencyStyleValue const& other) const { return m_frequency == other.m_frequency; }; + bool properties_equal(FrequencyStyleValue const& other) const { return m_frequency == other.m_frequency; } private: explicit FrequencyStyleValue(Frequency frequency) diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/GridTemplateAreaStyleValue.h b/Userland/Libraries/LibWeb/CSS/StyleValues/GridTemplateAreaStyleValue.h index 2b72dca462..dab6c96f5e 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/GridTemplateAreaStyleValue.h +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/GridTemplateAreaStyleValue.h @@ -21,7 +21,7 @@ public: Vector> const& grid_template_area() const { return m_grid_template_area; } virtual ErrorOr to_string() const override; - bool properties_equal(GridTemplateAreaStyleValue const& other) const { return m_grid_template_area == other.m_grid_template_area; }; + bool properties_equal(GridTemplateAreaStyleValue const& other) const { return m_grid_template_area == other.m_grid_template_area; } private: explicit GridTemplateAreaStyleValue(Vector> grid_template_area) diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/GridTrackPlacementShorthandStyleValue.h b/Userland/Libraries/LibWeb/CSS/StyleValues/GridTrackPlacementShorthandStyleValue.h index 2d327a5661..76a8f06ea6 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/GridTrackPlacementShorthandStyleValue.h +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/GridTrackPlacementShorthandStyleValue.h @@ -24,7 +24,7 @@ public: virtual ErrorOr to_string() const override; - bool properties_equal(GridTrackPlacementShorthandStyleValue const& other) const { return m_properties == other.m_properties; }; + bool properties_equal(GridTrackPlacementShorthandStyleValue const& other) const { return m_properties == other.m_properties; } private: GridTrackPlacementShorthandStyleValue(ValueComparingNonnullRefPtr start, ValueComparingNonnullRefPtr end) diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/GridTrackPlacementStyleValue.h b/Userland/Libraries/LibWeb/CSS/StyleValues/GridTrackPlacementStyleValue.h index c931a96332..47210e92a2 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/GridTrackPlacementStyleValue.h +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/GridTrackPlacementStyleValue.h @@ -22,7 +22,7 @@ public: GridTrackPlacement const& grid_track_placement() const { return m_grid_track_placement; } virtual ErrorOr to_string() const override; - bool properties_equal(GridTrackPlacementStyleValue const& other) const { return m_grid_track_placement == other.m_grid_track_placement; }; + bool properties_equal(GridTrackPlacementStyleValue const& other) const { return m_grid_track_placement == other.m_grid_track_placement; } private: explicit GridTrackPlacementStyleValue(GridTrackPlacement grid_track_placement) diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/GridTrackSizeListShorthandStyleValue.h b/Userland/Libraries/LibWeb/CSS/StyleValues/GridTrackSizeListShorthandStyleValue.h index fe315bc6a4..815fd58e09 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/GridTrackSizeListShorthandStyleValue.h +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/GridTrackSizeListShorthandStyleValue.h @@ -25,7 +25,7 @@ public: virtual ErrorOr to_string() const override; - bool properties_equal(GridTrackSizeListShorthandStyleValue const& other) const { return m_properties == other.m_properties; }; + bool properties_equal(GridTrackSizeListShorthandStyleValue const& other) const { return m_properties == other.m_properties; } private: GridTrackSizeListShorthandStyleValue( diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/PlaceContentStyleValue.h b/Userland/Libraries/LibWeb/CSS/StyleValues/PlaceContentStyleValue.h index 67fc27e636..39a0e67466 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/PlaceContentStyleValue.h +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/PlaceContentStyleValue.h @@ -23,7 +23,7 @@ public: virtual ErrorOr to_string() const override; - bool properties_equal(PlaceContentStyleValue const& other) const { return m_properties == other.m_properties; }; + bool properties_equal(PlaceContentStyleValue const& other) const { return m_properties == other.m_properties; } private: PlaceContentStyleValue(ValueComparingNonnullRefPtr align_content, ValueComparingNonnullRefPtr justify_content) diff --git a/Userland/Libraries/LibWeb/Crypto/Crypto.cpp b/Userland/Libraries/LibWeb/Crypto/Crypto.cpp index 935ea7b76e..2ac892f6bd 100644 --- a/Userland/Libraries/LibWeb/Crypto/Crypto.cpp +++ b/Userland/Libraries/LibWeb/Crypto/Crypto.cpp @@ -132,6 +132,6 @@ ErrorOr generate_random_uuid() TRY(builder.try_appendff("{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}", bytes[10], bytes[11], bytes[12], bytes[13], bytes[14], bytes[15])); return builder.to_string(); -}; +} } diff --git a/Userland/Libraries/LibWeb/DOM/Document.h b/Userland/Libraries/LibWeb/DOM/Document.h index 6005a0dede..724f1c2921 100644 --- a/Userland/Libraries/LibWeb/DOM/Document.h +++ b/Userland/Libraries/LibWeb/DOM/Document.h @@ -300,7 +300,7 @@ public: JS::NonnullGCPtr appropriate_template_contents_owner_document(); DeprecatedString ready_state() const; - HTML::DocumentReadyState readiness() const { return m_readiness; }; + HTML::DocumentReadyState readiness() const { return m_readiness; } void update_readiness(HTML::DocumentReadyState); HTML::Window& window() const { return const_cast(*m_window); } @@ -483,7 +483,7 @@ public: void make_active(); - void set_salvageable(bool value) { m_salvageable = value; }; + void set_salvageable(bool value) { m_salvageable = value; } HTML::ListOfAvailableImages& list_of_available_images(); HTML::ListOfAvailableImages const& list_of_available_images() const; diff --git a/Userland/Libraries/LibWeb/DOM/Event.h b/Userland/Libraries/LibWeb/DOM/Event.h index 1c06838423..aae9d1116c 100644 --- a/Userland/Libraries/LibWeb/DOM/Event.h +++ b/Userland/Libraries/LibWeb/DOM/Event.h @@ -110,7 +110,7 @@ public: void clear_path() { m_path.clear(); } void set_touch_target_list(TouchTargetList& touch_target_list) { m_touch_target_list = touch_target_list; } - TouchTargetList& touch_target_list() { return m_touch_target_list; }; + TouchTargetList& touch_target_list() { return m_touch_target_list; } void clear_touch_target_list() { m_touch_target_list.clear(); } bool bubbles() const { return m_bubbles; } diff --git a/Userland/Libraries/LibWeb/Encoding/TextDecoder.h b/Userland/Libraries/LibWeb/Encoding/TextDecoder.h index e5e7c72f9b..766d2ad793 100644 --- a/Userland/Libraries/LibWeb/Encoding/TextDecoder.h +++ b/Userland/Libraries/LibWeb/Encoding/TextDecoder.h @@ -29,7 +29,7 @@ public: DeprecatedFlyString const& encoding() const { return m_encoding; } bool fatal() const { return m_fatal; } - bool ignore_bom() const { return m_ignore_bom; }; + bool ignore_bom() const { return m_ignore_bom; } private: // https://encoding.spec.whatwg.org/#dom-textdecoder diff --git a/Userland/Libraries/LibWeb/HTML/BrowsingContext.h b/Userland/Libraries/LibWeb/HTML/BrowsingContext.h index 162179015d..81cbdc7976 100644 --- a/Userland/Libraries/LibWeb/HTML/BrowsingContext.h +++ b/Userland/Libraries/LibWeb/HTML/BrowsingContext.h @@ -212,7 +212,7 @@ public: void register_frame_nesting(AK::URL const&); bool is_frame_nesting_allowed(AK::URL const&) const; - void set_frame_nesting_levels(HashMap frame_nesting_levels) { m_frame_nesting_levels = move(frame_nesting_levels); }; + void set_frame_nesting_levels(HashMap frame_nesting_levels) { m_frame_nesting_levels = move(frame_nesting_levels); } HashMap const& frame_nesting_levels() const { return m_frame_nesting_levels; } DOM::Document* container_document(); diff --git a/Userland/Libraries/LibWeb/HTML/HTMLBodyElement.h b/Userland/Libraries/LibWeb/HTML/HTMLBodyElement.h index 1f515e4882..c9c4882614 100644 --- a/Userland/Libraries/LibWeb/HTML/HTMLBodyElement.h +++ b/Userland/Libraries/LibWeb/HTML/HTMLBodyElement.h @@ -24,7 +24,7 @@ public: virtual void apply_presentational_hints(CSS::StyleProperties&) const override; // https://www.w3.org/TR/html-aria/#el-body - virtual Optional default_role() const override { return ARIA::Role::generic; }; + virtual Optional default_role() const override { return ARIA::Role::generic; } private: HTMLBodyElement(DOM::Document&, DOM::QualifiedName); diff --git a/Userland/Libraries/LibWeb/HTML/HTMLDetailsElement.h b/Userland/Libraries/LibWeb/HTML/HTMLDetailsElement.h index 15c0159e9c..4ad879aad1 100644 --- a/Userland/Libraries/LibWeb/HTML/HTMLDetailsElement.h +++ b/Userland/Libraries/LibWeb/HTML/HTMLDetailsElement.h @@ -18,7 +18,7 @@ public: virtual ~HTMLDetailsElement() override; // https://www.w3.org/TR/html-aria/#el-details - virtual Optional default_role() const override { return ARIA::Role::group; }; + virtual Optional default_role() const override { return ARIA::Role::group; } // ^Element WebIDL::ExceptionOr set_attribute(DeprecatedFlyString const& name, DeprecatedString const& value) override; diff --git a/Userland/Libraries/LibWeb/HTML/HTMLInputElement.h b/Userland/Libraries/LibWeb/HTML/HTMLInputElement.h index 89bddb5979..de5b62e6c2 100644 --- a/Userland/Libraries/LibWeb/HTML/HTMLInputElement.h +++ b/Userland/Libraries/LibWeb/HTML/HTMLInputElement.h @@ -78,7 +78,7 @@ public: bool checked_binding() const { return checked(); } void set_checked_binding(bool); - bool indeterminate() const { return m_indeterminate; }; + bool indeterminate() const { return m_indeterminate; } void set_indeterminate(bool); void did_edit_text_node(Badge); diff --git a/Userland/Libraries/LibWeb/HTML/HTMLLIElement.h b/Userland/Libraries/LibWeb/HTML/HTMLLIElement.h index 445833b557..212d06bd94 100644 --- a/Userland/Libraries/LibWeb/HTML/HTMLLIElement.h +++ b/Userland/Libraries/LibWeb/HTML/HTMLLIElement.h @@ -18,7 +18,7 @@ public: virtual ~HTMLLIElement() override; // https://www.w3.org/TR/html-aria/#el-li - virtual Optional default_role() const override { return ARIA::Role::listitem; }; + virtual Optional default_role() const override { return ARIA::Role::listitem; } private: HTMLLIElement(DOM::Document&, DOM::QualifiedName); diff --git a/Userland/Libraries/LibWeb/HTML/HTMLSummaryElement.h b/Userland/Libraries/LibWeb/HTML/HTMLSummaryElement.h index c69748ef92..36e0abe3b3 100644 --- a/Userland/Libraries/LibWeb/HTML/HTMLSummaryElement.h +++ b/Userland/Libraries/LibWeb/HTML/HTMLSummaryElement.h @@ -18,7 +18,7 @@ public: virtual ~HTMLSummaryElement() override; // https://www.w3.org/TR/html-aria/#el-details - virtual Optional default_role() const override { return ARIA::Role::button; }; + virtual Optional default_role() const override { return ARIA::Role::button; } bool is_summary_for_its_parent_details(); diff --git a/Userland/Libraries/LibWeb/HTML/Navigable.h b/Userland/Libraries/LibWeb/HTML/Navigable.h index e40ff78494..76a9d5b255 100644 --- a/Userland/Libraries/LibWeb/HTML/Navigable.h +++ b/Userland/Libraries/LibWeb/HTML/Navigable.h @@ -33,18 +33,18 @@ public: Vector> child_navigables() const; - String const& id() const { return m_id; }; - JS::GCPtr parent() const { return m_parent; }; + String const& id() const { return m_id; } + JS::GCPtr parent() const { return m_parent; } - bool is_closing() const { return m_closing; }; - void set_closing(bool value) { m_closing = value; }; + bool is_closing() const { return m_closing; } + void set_closing(bool value) { m_closing = value; } - bool is_delaying_load_events() const { return m_delaying_load_events; }; - void set_delaying_load_events(bool value) { m_delaying_load_events = value; }; + bool is_delaying_load_events() const { return m_delaying_load_events; } + void set_delaying_load_events(bool value) { m_delaying_load_events = value; } - JS::GCPtr active_session_history_entry() const { return m_active_session_history_entry; }; - JS::GCPtr current_session_history_entry() const { return m_current_session_history_entry; }; - void set_current_session_history_entry(JS::GCPtr entry) { m_current_session_history_entry = entry; }; + JS::GCPtr active_session_history_entry() const { return m_active_session_history_entry; } + JS::GCPtr current_session_history_entry() const { return m_current_session_history_entry; } + void set_current_session_history_entry(JS::GCPtr entry) { m_current_session_history_entry = entry; } Vector>& get_session_history_entries() const; diff --git a/Userland/Libraries/LibWeb/HTML/RemoteBrowsingContext.cpp b/Userland/Libraries/LibWeb/HTML/RemoteBrowsingContext.cpp index 59f0599574..44956a1912 100644 --- a/Userland/Libraries/LibWeb/HTML/RemoteBrowsingContext.cpp +++ b/Userland/Libraries/LibWeb/HTML/RemoteBrowsingContext.cpp @@ -12,7 +12,7 @@ JS::NonnullGCPtr RemoteBrowsingContext::create_a_new_remo { auto browsing_context = Bindings::main_thread_vm().heap().allocate_without_realm(handle); return browsing_context; -}; +} HTML::WindowProxy* RemoteBrowsingContext::window_proxy() { diff --git a/Userland/Libraries/LibWeb/HTML/RemoteBrowsingContext.h b/Userland/Libraries/LibWeb/HTML/RemoteBrowsingContext.h index f91a4c5134..7f3150d1a5 100644 --- a/Userland/Libraries/LibWeb/HTML/RemoteBrowsingContext.h +++ b/Userland/Libraries/LibWeb/HTML/RemoteBrowsingContext.h @@ -33,10 +33,10 @@ public: Function)>) override { return {}; - }; + } virtual String const& window_handle() const override { return m_window_handle; } - virtual void set_window_handle(String handle) override { m_window_handle = handle; }; + virtual void set_window_handle(String handle) override { m_window_handle = handle; } private: explicit RemoteBrowsingContext(String); diff --git a/Userland/Libraries/LibWeb/HTML/Scripting/Fetching.h b/Userland/Libraries/LibWeb/HTML/Scripting/Fetching.h index e3f17bab66..5fe2b4668a 100644 --- a/Userland/Libraries/LibWeb/HTML/Scripting/Fetching.h +++ b/Userland/Libraries/LibWeb/HTML/Scripting/Fetching.h @@ -47,14 +47,14 @@ public: ~DescendantFetchingContext() = default; - size_t pending_count() const { return m_pending_count; }; + size_t pending_count() const { return m_pending_count; } void set_pending_count(size_t count) { m_pending_count = count; } void decrement_pending_count() { --m_pending_count; } bool failed() const { return m_failed; } void set_failed(bool failed) { m_failed = failed; } - void on_complete(JavaScriptModuleScript* module_script) { m_on_complete(module_script); }; + void on_complete(JavaScriptModuleScript* module_script) { m_on_complete(module_script); } void set_on_complete(OnFetchScriptComplete on_complete) { m_on_complete = move(on_complete); } private: diff --git a/Userland/Libraries/LibWeb/HTML/Scripting/ModuleMap.h b/Userland/Libraries/LibWeb/HTML/Scripting/ModuleMap.h index fef5b2a429..70c09d5437 100644 --- a/Userland/Libraries/LibWeb/HTML/Scripting/ModuleMap.h +++ b/Userland/Libraries/LibWeb/HTML/Scripting/ModuleMap.h @@ -20,13 +20,13 @@ public: { } - AK::URL const& url() const { return m_url; }; + AK::URL const& url() const { return m_url; } DeprecatedString const& type() const { return m_type; } bool operator==(ModuleLocationTuple const& other) const { return other.url() == m_url && other.type() == m_type; - }; + } private: AK::URL m_url; diff --git a/Userland/Libraries/LibWeb/HTML/Scripting/ModuleScript.h b/Userland/Libraries/LibWeb/HTML/Scripting/ModuleScript.h index 4835ec6fd4..543a232b51 100644 --- a/Userland/Libraries/LibWeb/HTML/Scripting/ModuleScript.h +++ b/Userland/Libraries/LibWeb/HTML/Scripting/ModuleScript.h @@ -37,8 +37,8 @@ public: JS::Promise* run(PreventErrorReporting = PreventErrorReporting::No); - JS::SourceTextModule const* record() const { return m_record.ptr(); }; - JS::SourceTextModule* record() { return m_record.ptr(); }; + JS::SourceTextModule const* record() const { return m_record.ptr(); } + JS::SourceTextModule* record() { return m_record.ptr(); } protected: JavaScriptModuleScript(AK::URL base_url, DeprecatedString filename, EnvironmentSettingsObject& environment_settings_object); diff --git a/Userland/Libraries/LibWeb/HTML/TraversableNavigable.h b/Userland/Libraries/LibWeb/HTML/TraversableNavigable.h index 2902fbcc4f..4e45987906 100644 --- a/Userland/Libraries/LibWeb/HTML/TraversableNavigable.h +++ b/Userland/Libraries/LibWeb/HTML/TraversableNavigable.h @@ -24,11 +24,11 @@ public: bool is_top_level_traversable() const; - int current_session_history_step() const { return m_current_session_history_step; }; - Vector>& session_history_entries() { return m_session_history_entries; }; - Vector> const& session_history_entries() const { return m_session_history_entries; }; - bool running_nested_apply_history_step() const { return m_running_nested_apply_history_step; }; - VisibilityState system_visibility_state() const { return m_system_visibility_state; }; + int current_session_history_step() const { return m_current_session_history_step; } + Vector>& session_history_entries() { return m_session_history_entries; } + Vector> const& session_history_entries() const { return m_session_history_entries; } + bool running_nested_apply_history_step() const { return m_running_nested_apply_history_step; } + VisibilityState system_visibility_state() const { return m_system_visibility_state; } struct HistoryObjectLengthAndIndex { size_t script_history_length; diff --git a/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp index 017ccb1ba4..5d24c34e05 100644 --- a/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp +++ b/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp @@ -279,7 +279,7 @@ void FlexFormattingContext::populate_specified_margins(FlexItem& item, CSS::Flex item.margins.cross_before_is_auto = item.box->computed_values().margin().left().is_auto(); item.margins.cross_after_is_auto = item.box->computed_values().margin().right().is_auto(); } -}; +} // https://www.w3.org/TR/css-flexbox-1/#flex-items void FlexFormattingContext::generate_anonymous_flex_items() diff --git a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.h b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.h index cd60c5203c..5427e30b4a 100644 --- a/Userland/Libraries/LibWeb/Layout/GridFormattingContext.h +++ b/Userland/Libraries/LibWeb/Layout/GridFormattingContext.h @@ -58,7 +58,7 @@ public: { m_max_column_index = max(0, columns_count - 1); m_max_row_index = max(0, rows_count - 1); - }; + } OccupationGrid() {}; void set_occupied(int column_start, int column_end, int row_start, int row_end); @@ -74,9 +74,9 @@ public: } int min_column_index() const { return m_min_column_index; } - int max_column_index() const { return m_max_column_index; }; - int min_row_index() const { return m_min_row_index; }; - int max_row_index() const { return m_max_row_index; }; + int max_column_index() const { return m_max_column_index; } + int min_row_index() const { return m_min_row_index; } + int max_row_index() const { return m_max_row_index; } bool is_occupied(int column_index, int row_index) const; diff --git a/Userland/Libraries/LibWeb/Layout/LayoutState.h b/Userland/Libraries/LibWeb/Layout/LayoutState.h index 374877c9ed..6cc887cd5b 100644 --- a/Userland/Libraries/LibWeb/Layout/LayoutState.h +++ b/Userland/Libraries/LibWeb/Layout/LayoutState.h @@ -119,7 +119,7 @@ struct LayoutState { void add_floating_descendant(Box const& box) { m_floating_descendants.set(&box); } auto const& floating_descendants() const { return m_floating_descendants; } - void set_override_borders_data(Painting::BordersData const& override_borders_data) { m_override_borders_data = override_borders_data; }; + void set_override_borders_data(Painting::BordersData const& override_borders_data) { m_override_borders_data = override_borders_data; } auto const& override_borders_data() const { return m_override_borders_data; } void set_table_cell_coordinates(Painting::PaintableBox::TableCellCoordinates const& table_cell_coordinates) { m_table_cell_coordinates = table_cell_coordinates; } diff --git a/Userland/Libraries/LibWeb/Loader/LoadRequest.h b/Userland/Libraries/LibWeb/Loader/LoadRequest.h index 44593836ae..dc49d6502b 100644 --- a/Userland/Libraries/LibWeb/Loader/LoadRequest.h +++ b/Userland/Libraries/LibWeb/Loader/LoadRequest.h @@ -40,10 +40,10 @@ public: ByteBuffer const& body() const { return m_body; } void set_body(ByteBuffer body) { m_body = move(body); } - void start_timer() { m_load_timer.start(); }; + void start_timer() { m_load_timer.start(); } Duration load_time() const { return m_load_timer.elapsed_time(); } - Optional& page() { return m_page; }; + Optional& page() { return m_page; } void set_page(Page& page) { m_page = page; } unsigned hash() const diff --git a/Userland/Libraries/LibWeb/Painting/BorderPainting.h b/Userland/Libraries/LibWeb/Painting/BorderPainting.h index 5488405ab8..e17f5e6625 100644 --- a/Userland/Libraries/LibWeb/Painting/BorderPainting.h +++ b/Userland/Libraries/LibWeb/Painting/BorderPainting.h @@ -23,7 +23,7 @@ struct BorderRadiusData { context.floored_device_pixels(horizontal_radius).value(), context.floored_device_pixels(vertical_radius).value() }; - }; + } inline operator bool() const { diff --git a/Userland/Libraries/LibWeb/Painting/PaintableBox.h b/Userland/Libraries/LibWeb/Painting/PaintableBox.h index b815eb65d8..9813000f5e 100644 --- a/Userland/Libraries/LibWeb/Painting/PaintableBox.h +++ b/Userland/Libraries/LibWeb/Painting/PaintableBox.h @@ -123,7 +123,7 @@ public: bool is_out_of_view(PaintContext&) const; - void set_override_borders_data(BordersData const& override_borders_data) { m_override_borders_data = override_borders_data; }; + void set_override_borders_data(BordersData const& override_borders_data) { m_override_borders_data = override_borders_data; } auto const& override_borders_data() const { return m_override_borders_data; } struct TableCellCoordinates { diff --git a/Userland/Libraries/LibWeb/WebAudio/AudioContext.h b/Userland/Libraries/LibWeb/WebAudio/AudioContext.h index 3ccb5697fb..c35d2788e7 100644 --- a/Userland/Libraries/LibWeb/WebAudio/AudioContext.h +++ b/Userland/Libraries/LibWeb/WebAudio/AudioContext.h @@ -31,8 +31,8 @@ public: virtual ~AudioContext() override; - double base_latency() const { return m_base_latency; }; - double output_latency() const { return m_output_latency; }; + double base_latency() const { return m_base_latency; } + double output_latency() const { return m_output_latency; } AudioTimestamp get_output_timestamp(); WebIDL::ExceptionOr> resume(); WebIDL::ExceptionOr> suspend(); diff --git a/Userland/Libraries/LibWeb/WebAudio/BaseAudioContext.h b/Userland/Libraries/LibWeb/WebAudio/BaseAudioContext.h index c587f64be5..68783993bb 100644 --- a/Userland/Libraries/LibWeb/WebAudio/BaseAudioContext.h +++ b/Userland/Libraries/LibWeb/WebAudio/BaseAudioContext.h @@ -18,16 +18,16 @@ class BaseAudioContext : public DOM::EventTarget { public: virtual ~BaseAudioContext() override; - float sample_rate() const { return m_sample_rate; }; - double current_time() const { return m_current_time; }; - Bindings::AudioContextState state() const { return m_control_thread_state; }; + float sample_rate() const { return m_sample_rate; } + double current_time() const { return m_current_time; } + Bindings::AudioContextState state() const { return m_control_thread_state; } void set_onstatechange(WebIDL::CallbackType*); WebIDL::CallbackType* onstatechange(); - void set_sample_rate(float sample_rate) { m_sample_rate = sample_rate; }; - void set_control_state(Bindings::AudioContextState state) { m_control_thread_state = state; }; - void set_rendering_state(Bindings::AudioContextState state) { m_rendering_thread_state = state; }; + void set_sample_rate(float sample_rate) { m_sample_rate = sample_rate; } + void set_control_state(Bindings::AudioContextState state) { m_control_thread_state = state; } + void set_rendering_state(Bindings::AudioContextState state) { m_rendering_thread_state = state; } protected: explicit BaseAudioContext(JS::Realm&); diff --git a/Userland/Libraries/LibWeb/WebSockets/WebSocket.h b/Userland/Libraries/LibWeb/WebSockets/WebSocket.h index 4ce04a8630..273f6433dd 100644 --- a/Userland/Libraries/LibWeb/WebSockets/WebSocket.h +++ b/Userland/Libraries/LibWeb/WebSockets/WebSocket.h @@ -56,8 +56,8 @@ public: String extensions() const; WebIDL::ExceptionOr protocol() const; - String const& binary_type() { return m_binary_type; }; - void set_binary_type(String const& type) { m_binary_type = type; }; + String const& binary_type() { return m_binary_type; } + void set_binary_type(String const& type) { m_binary_type = type; } WebIDL::ExceptionOr close(Optional code, Optional reason); WebIDL::ExceptionOr send(Variant, JS::Handle, String> const& data); diff --git a/Userland/Libraries/LibWeb/XHR/XMLHttpRequest.h b/Userland/Libraries/LibWeb/XHR/XMLHttpRequest.h index e8ab6cf56b..d2be52073e 100644 --- a/Userland/Libraries/LibWeb/XHR/XMLHttpRequest.h +++ b/Userland/Libraries/LibWeb/XHR/XMLHttpRequest.h @@ -44,7 +44,7 @@ public: virtual ~XMLHttpRequest() override; - State ready_state() const { return m_state; }; + State ready_state() const { return m_state; } Fetch::Infrastructure::Status status() const; WebIDL::ExceptionOr status_text() const; WebIDL::ExceptionOr response_text() const; diff --git a/Userland/Services/NotificationServer/NotificationWindow.h b/Userland/Services/NotificationServer/NotificationWindow.h index 889891a864..a1e12a31f7 100644 --- a/Userland/Services/NotificationServer/NotificationWindow.h +++ b/Userland/Services/NotificationServer/NotificationWindow.h @@ -16,7 +16,7 @@ class NotificationWindow final : public GUI::Window { public: virtual ~NotificationWindow() override = default; - void set_original_rect(Gfx::IntRect original_rect) { m_original_rect = original_rect; }; + void set_original_rect(Gfx::IntRect original_rect) { m_original_rect = original_rect; } void set_text(DeprecatedString const&); void set_title(DeprecatedString const&); diff --git a/Userland/Services/SpiceAgent/MessageHeader.h b/Userland/Services/SpiceAgent/MessageHeader.h index baa08ba019..41edec8f1a 100644 --- a/Userland/Services/SpiceAgent/MessageHeader.h +++ b/Userland/Services/SpiceAgent/MessageHeader.h @@ -25,10 +25,10 @@ public: { } - Message::Type type() const { return m_type; }; - u32 data_size() const { return m_data_size; }; - u32 protocol_version() const { return m_protocol_version; }; - u64 opaque() const { return m_opaque; }; + Message::Type type() const { return m_type; } + u32 data_size() const { return m_data_size; } + u32 protocol_version() const { return m_protocol_version; } + u64 opaque() const { return m_opaque; } private: // The protocol version being used. diff --git a/Userland/Services/TelnetServer/Command.h b/Userland/Services/TelnetServer/Command.h index f7e806252e..ce31d33b78 100644 --- a/Userland/Services/TelnetServer/Command.h +++ b/Userland/Services/TelnetServer/Command.h @@ -58,5 +58,5 @@ struct Command { } return builder.to_deprecated_string(); - }; + } }; diff --git a/Userland/Services/WindowServer/Menu.h b/Userland/Services/WindowServer/Menu.h index 1e653c55d5..1e96529d48 100644 --- a/Userland/Services/WindowServer/Menu.h +++ b/Userland/Services/WindowServer/Menu.h @@ -109,7 +109,7 @@ public: void redraw(MenuItem const&); MenuItem* hovered_item() const; - int hovered_item_index() const { return m_hovered_item_index; }; + int hovered_item_index() const { return m_hovered_item_index; } void set_hovered_index(int index, bool make_input = false); diff --git a/Userland/Services/WindowServer/WindowManager.h b/Userland/Services/WindowServer/WindowManager.h index 101001ba18..8e0c6997f4 100644 --- a/Userland/Services/WindowServer/WindowManager.h +++ b/Userland/Services/WindowServer/WindowManager.h @@ -193,7 +193,7 @@ public: if (active_window() && active_window()->is_fullscreen()) return active_window(); return nullptr; - }; + } Window* active_fullscreen_window() { diff --git a/Userland/Shell/AST.h b/Userland/Shell/AST.h index 407afe02ad..953d917e8a 100644 --- a/Userland/Shell/AST.h +++ b/Userland/Shell/AST.h @@ -1364,7 +1364,7 @@ private: virtual ErrorOr> run(RefPtr) override; virtual ErrorOr highlight_in_editor(Line::Editor&, Shell&, HighlightMetadata = {}) override; virtual HitTestResult hit_test_position(size_t) const override; - virtual RefPtr leftmost_trivial_literal() const override { return this; }; + virtual RefPtr leftmost_trivial_literal() const override { return this; } String m_end; bool m_allows_interpolation { false }; @@ -1393,7 +1393,7 @@ private: virtual ErrorOr dump(int level) const override; virtual ErrorOr> run(RefPtr) override; virtual ErrorOr highlight_in_editor(Line::Editor&, Shell&, HighlightMetadata = {}) override; - virtual RefPtr leftmost_trivial_literal() const override { return this; }; + virtual RefPtr leftmost_trivial_literal() const override { return this; } String m_text; EnclosureType m_enclosure_type; diff --git a/Userland/Utilities/lscpu.cpp b/Userland/Utilities/lscpu.cpp index ec12a4c3b2..15f1afd3b8 100644 --- a/Userland/Utilities/lscpu.cpp +++ b/Userland/Utilities/lscpu.cpp @@ -18,7 +18,7 @@ static void print_cache_info(StringView description, JsonObject const& cache_obj outln("\t{}:", description); outln("\t\tSize: {}", human_readable_size(cache_object.get_u32("size"sv).value())); outln("\t\tLine size: {}", human_readable_size(cache_object.get_u32("line_size"sv).value())); -}; +} static void print_cpu_info(JsonObject const& value) { diff --git a/Userland/Utilities/nc.cpp b/Userland/Utilities/nc.cpp index 76fb63b29c..fd26bcfb93 100644 --- a/Userland/Utilities/nc.cpp +++ b/Userland/Utilities/nc.cpp @@ -42,7 +42,7 @@ static size_t get_maximum_tcp_buffer_size(size_t input_buf_size) if (input_buf_size > maximum_tcp_receive_buffer_size_upper_bound) return maximum_tcp_receive_buffer_size_upper_bound; return input_buf_size; -}; +} ErrorOr serenity_main(Main::Arguments arguments) { diff --git a/Userland/Utilities/ping.cpp b/Userland/Utilities/ping.cpp index 89cb19e905..e42b29dee1 100644 --- a/Userland/Utilities/ping.cpp +++ b/Userland/Utilities/ping.cpp @@ -58,7 +58,7 @@ static void print_closing_statistics() if (successful_pings) average_ms = total_ms / successful_pings; outln("rtt min/avg/max = {}/{}/{} ms", min_ms, average_ms, max_ms); -}; +} ErrorOr serenity_main(Main::Arguments arguments) { diff --git a/Userland/Utilities/sed.cpp b/Userland/Utilities/sed.cpp index 9a7ac61c51..50a90c3b39 100644 --- a/Userland/Utilities/sed.cpp +++ b/Userland/Utilities/sed.cpp @@ -611,7 +611,7 @@ private: auto element = TRY(String::from_utf8(element_sv)); TRY(container.try_append(move(element))); return {}; - }; + } }; enum class CycleDecision { diff --git a/Userland/Utilities/shot.cpp b/Userland/Utilities/shot.cpp index 2d7a3b1836..e3c0a1cd6e 100644 --- a/Userland/Utilities/shot.cpp +++ b/Userland/Utilities/shot.cpp @@ -46,7 +46,7 @@ private: { if (event.button() == GUI::MouseButton::Primary) m_anchor_point = event.position(); - }; + } virtual void mousemove_event(GUI::MouseEvent& event) override { @@ -54,13 +54,13 @@ private: m_region = Gfx::IntRect::from_two_points(*m_anchor_point, event.position()); update(); } - }; + } virtual void mouseup_event(GUI::MouseEvent& event) override { if (event.button() == GUI::MouseButton::Primary) m_window->close(); - }; + } virtual void paint_event(GUI::PaintEvent&) override { diff --git a/Userland/Utilities/sql.cpp b/Userland/Utilities/sql.cpp index 514d21e522..92253129f5 100644 --- a/Userland/Utilities/sql.cpp +++ b/Userland/Utilities/sql.cpp @@ -286,7 +286,7 @@ private: m_loop.quit(0); return; } - }; + } static DeprecatedString prompt_for_level(int level) {