diff --git a/Applications/Browser/BrowserConsoleClient.cpp b/Applications/Browser/BrowserConsoleClient.cpp index 4edaef346c..d7b54c06ce 100644 --- a/Applications/Browser/BrowserConsoleClient.cpp +++ b/Applications/Browser/BrowserConsoleClient.cpp @@ -33,9 +33,9 @@ #include #include #include -#include #include #include +#include namespace Browser { diff --git a/Applications/Browser/ConsoleWidget.cpp b/Applications/Browser/ConsoleWidget.cpp index fb1d37989d..e19a68ea38 100644 --- a/Applications/Browser/ConsoleWidget.cpp +++ b/Applications/Browser/ConsoleWidget.cpp @@ -36,9 +36,9 @@ #include #include #include -#include #include #include +#include namespace Browser { @@ -94,7 +94,7 @@ ConsoleWidget::ConsoleWidget() output_html.append(String::format("
%s
", escape_html_entities(hint).characters())); m_interpreter->throw_exception(error.to_string()); } else { - m_interpreter->run(m_interpreter->global_object(),*program); + m_interpreter->run(m_interpreter->global_object(), *program); } if (m_interpreter->exception()) { diff --git a/Applications/Browser/DownloadWidget.cpp b/Applications/Browser/DownloadWidget.cpp index 76d051bcb6..4323c65065 100644 --- a/Applications/Browser/DownloadWidget.cpp +++ b/Applications/Browser/DownloadWidget.cpp @@ -78,7 +78,6 @@ DownloadWidget::DownloadWidget(const URL& url) browser_image.load_from_file("/res/graphics/download-animation.gif"); animation_layout.add_spacer(); - auto& source_label = add(String::format("From: %s", url.to_string().characters())); source_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); source_label.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); diff --git a/Applications/DisplaySettings/DisplaySettings.cpp b/Applications/DisplaySettings/DisplaySettings.cpp index 0dd3c8248a..1e7b88d9b0 100644 --- a/Applications/DisplaySettings/DisplaySettings.cpp +++ b/Applications/DisplaySettings/DisplaySettings.cpp @@ -25,7 +25,6 @@ */ #include "DisplaySettings.h" -#include #include #include #include @@ -35,6 +34,7 @@ #include #include #include +#include #include #include #include diff --git a/Applications/Help/ManualNode.h b/Applications/Help/ManualNode.h index 453e7c6413..b5901f9787 100644 --- a/Applications/Help/ManualNode.h +++ b/Applications/Help/ManualNode.h @@ -31,7 +31,7 @@ class ManualNode { public: - virtual ~ManualNode() {} + virtual ~ManualNode() { } virtual NonnullOwnPtrVector& children() const = 0; virtual const ManualNode* parent() const = 0; diff --git a/Applications/Help/ManualPageNode.h b/Applications/Help/ManualPageNode.h index 7fdedd405d..6de744e0e4 100644 --- a/Applications/Help/ManualPageNode.h +++ b/Applications/Help/ManualPageNode.h @@ -32,7 +32,7 @@ class ManualSectionNode; class ManualPageNode : public ManualNode { public: - virtual ~ManualPageNode() override {} + virtual ~ManualPageNode() override { } ManualPageNode(const ManualSectionNode& section, const StringView& page) : m_section(section) diff --git a/Applications/Help/ManualSectionNode.h b/Applications/Help/ManualSectionNode.h index cbfb2bd9b0..b0114201c3 100644 --- a/Applications/Help/ManualSectionNode.h +++ b/Applications/Help/ManualSectionNode.h @@ -30,7 +30,7 @@ class ManualSectionNode : public ManualNode { public: - virtual ~ManualSectionNode() override {} + virtual ~ManualSectionNode() override { } ManualSectionNode(String section, String name) : m_section(section) diff --git a/Applications/Help/main.cpp b/Applications/Help/main.cpp index d48ce1bf55..ea06761b91 100644 --- a/Applications/Help/main.cpp +++ b/Applications/Help/main.cpp @@ -47,8 +47,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/Applications/KeyboardMapper/KeyPositions.h b/Applications/KeyboardMapper/KeyPositions.h index 9ec3dd35e6..3cd9dbaaf7 100644 --- a/Applications/KeyboardMapper/KeyPositions.h +++ b/Applications/KeyboardMapper/KeyPositions.h @@ -42,6 +42,7 @@ struct KeyPosition { #define KEY_COUNT 63 struct KeyPosition keys[KEY_COUNT] = { + // clang-format off [ 0] = { 0, 0, 0, 0, 0, false, 0, ""}, [ 1] = { 0x29, 0, 0, 50, 50, true, 41, "`"}, @@ -59,7 +60,6 @@ struct KeyPosition keys[KEY_COUNT] = { [13] = { 0x0D, 612, 0, 50, 50, true, 13, "="}, [14] = { 0x0E, 663, 0, 100, 50, false, 0, "back space"}, - [15] = { 0x0F, 0, 52, 76, 50, false, 0, "tab"}, [16] = { 0x10, 77, 52, 50, 50, true, 16, "q"}, [17] = { 0x11, 128, 52, 50, 50, true, 17, "w"}, @@ -75,7 +75,6 @@ struct KeyPosition keys[KEY_COUNT] = { [27] = { 0x1B, 638, 52, 50, 50, true, 27, "]"}, [28] = { 0x1C, 689, 52, 74, 50, false, 0, "enter"}, - [29] = { 0x3A, 0, 104, 101, 50, false, 0, "caps lock"}, [30] = { 0x1E, 103, 104, 50, 50, true, 30, "a"}, [31] = { 0x1F, 154, 104, 50, 50, true, 31, "s"}, @@ -90,8 +89,6 @@ struct KeyPosition keys[KEY_COUNT] = { [40] = { 0x28, 614, 104, 50, 50, true, 40, "\""}, [41] = { 0x2B, 665, 104, 50, 50, true, 43, "\\"}, - - [42] = { 0x2A, 0, 156, 76, 50, false, 0, "left shift"}, [43] = { 0x56, 77, 156, 50, 50, true, 86, "\\"}, [44] = { 0x2C, 128, 156, 50, 50, true, 44, "z"}, @@ -114,4 +111,5 @@ struct KeyPosition keys[KEY_COUNT] = { [60] = {0xE05C, 587, 208, 50, 50, false, 0, "right\nsuper"}, [61] = {0xE05D, 638, 208, 50, 50, false, 0, "menu"}, [62] = {0xE01D, 689, 208, 74, 50, false, 0, "right ctrl"} + // clang-format on }; diff --git a/Applications/KeyboardSettings/CharacterMapFileListModel.h b/Applications/KeyboardSettings/CharacterMapFileListModel.h index 2091d46674..4fcd1d8123 100644 --- a/Applications/KeyboardSettings/CharacterMapFileListModel.h +++ b/Applications/KeyboardSettings/CharacterMapFileListModel.h @@ -36,7 +36,7 @@ public: return adopt(*new CharacterMapFileListModel(file_names)); } - virtual ~CharacterMapFileListModel() override {} + virtual ~CharacterMapFileListModel() override { } virtual int row_count(const GUI::ModelIndex&) const override { diff --git a/Applications/KeyboardSettings/main.cpp b/Applications/KeyboardSettings/main.cpp index dd0eb5ca02..cb0bb59fd8 100644 --- a/Applications/KeyboardSettings/main.cpp +++ b/Applications/KeyboardSettings/main.cpp @@ -25,8 +25,8 @@ */ #include "CharacterMapFileListModel.h" -#include #include +#include #include #include #include @@ -59,12 +59,12 @@ int main(int argc, char** argv) return 1; } - if (unveil("/res", "r") < 0 ) { + if (unveil("/res", "r") < 0) { perror("unveil"); return 1; } - if (unveil("/bin/keymap", "x") < 0 ) { + if (unveil("/bin/keymap", "x") < 0) { perror("unveil"); return 1; } diff --git a/Applications/PixelPaint/CreateNewLayerDialog.h b/Applications/PixelPaint/CreateNewLayerDialog.h index 2f9334a7c1..bb07ff9943 100644 --- a/Applications/PixelPaint/CreateNewLayerDialog.h +++ b/Applications/PixelPaint/CreateNewLayerDialog.h @@ -32,6 +32,7 @@ namespace PixelPaint { class CreateNewLayerDialog final : public GUI::Dialog { C_OBJECT(CreateNewLayerDialog); + public: const Gfx::IntSize& layer_size() const { return m_layer_size; } const String& layer_name() const { return m_layer_name; } diff --git a/Applications/PixelPaint/EllipseTool.h b/Applications/PixelPaint/EllipseTool.h index 8462f38d6f..fb4a82b74a 100644 --- a/Applications/PixelPaint/EllipseTool.h +++ b/Applications/PixelPaint/EllipseTool.h @@ -27,8 +27,8 @@ #pragma once #include "Tool.h" -#include #include +#include namespace PixelPaint { diff --git a/Applications/PixelPaint/EraseTool.h b/Applications/PixelPaint/EraseTool.h index 70968452dd..772479fb3f 100644 --- a/Applications/PixelPaint/EraseTool.h +++ b/Applications/PixelPaint/EraseTool.h @@ -28,8 +28,8 @@ #include "Tool.h" #include -#include #include +#include namespace PixelPaint { diff --git a/Applications/PixelPaint/Image.h b/Applications/PixelPaint/Image.h index 0ab8fac301..e723c646a1 100644 --- a/Applications/PixelPaint/Image.h +++ b/Applications/PixelPaint/Image.h @@ -45,7 +45,7 @@ public: virtual void image_did_add_layer(size_t) { } virtual void image_did_remove_layer(size_t) { } virtual void image_did_modify_layer(size_t) { } - virtual void image_did_modify_layer_stack() {} + virtual void image_did_modify_layer_stack() { } virtual void image_did_change() { } }; diff --git a/Applications/PixelPaint/ImageEditor.cpp b/Applications/PixelPaint/ImageEditor.cpp index e0679f5199..e1a295a11c 100644 --- a/Applications/PixelPaint/ImageEditor.cpp +++ b/Applications/PixelPaint/ImageEditor.cpp @@ -29,8 +29,8 @@ #include "Layer.h" #include "Tool.h" #include -#include #include +#include namespace PixelPaint { diff --git a/Applications/PixelPaint/MoveTool.cpp b/Applications/PixelPaint/MoveTool.cpp index 52abbb2a41..cf6cea9975 100644 --- a/Applications/PixelPaint/MoveTool.cpp +++ b/Applications/PixelPaint/MoveTool.cpp @@ -108,22 +108,28 @@ void MoveTool::on_context_menu(Layer& layer, GUI::ContextMenuEvent& event) { if (!m_context_menu) { m_context_menu = GUI::Menu::construct(); - m_context_menu->add_action(GUI::CommonActions::make_move_to_front_action([this](auto&) { - m_editor->image()->move_layer_to_front(*m_context_menu_layer); - m_editor->layers_did_change(); - }, m_editor)); - m_context_menu->add_action(GUI::CommonActions::make_move_to_back_action([this](auto&) { - m_editor->image()->move_layer_to_back(*m_context_menu_layer); - m_editor->layers_did_change(); - }, m_editor)); + m_context_menu->add_action(GUI::CommonActions::make_move_to_front_action( + [this](auto&) { + m_editor->image()->move_layer_to_front(*m_context_menu_layer); + m_editor->layers_did_change(); + }, + m_editor)); + m_context_menu->add_action(GUI::CommonActions::make_move_to_back_action( + [this](auto&) { + m_editor->image()->move_layer_to_back(*m_context_menu_layer); + m_editor->layers_did_change(); + }, + m_editor)); m_context_menu->add_separator(); - m_context_menu->add_action(GUI::Action::create("Delete layer", Gfx::Bitmap::load_from_file("/res/icons/16x16/delete.png"), [this](auto&) { - m_editor->image()->remove_layer(*m_context_menu_layer); - // FIXME: This should not be done imperatively here. Perhaps a Image::Client interface that ImageEditor can implement? - if (m_editor->active_layer() == m_context_menu_layer) - m_editor->set_active_layer(nullptr); - m_editor->layers_did_change(); - }, m_editor)); + m_context_menu->add_action(GUI::Action::create( + "Delete layer", Gfx::Bitmap::load_from_file("/res/icons/16x16/delete.png"), [this](auto&) { + m_editor->image()->remove_layer(*m_context_menu_layer); + // FIXME: This should not be done imperatively here. Perhaps a Image::Client interface that ImageEditor can implement? + if (m_editor->active_layer() == m_context_menu_layer) + m_editor->set_active_layer(nullptr); + m_editor->layers_did_change(); + }, + m_editor)); } m_context_menu_layer = layer; m_context_menu->popup(event.screen_position()); diff --git a/Applications/PixelPaint/PenTool.h b/Applications/PixelPaint/PenTool.h index 18d0cdae98..ff7d4555f6 100644 --- a/Applications/PixelPaint/PenTool.h +++ b/Applications/PixelPaint/PenTool.h @@ -27,8 +27,8 @@ #pragma once #include "Tool.h" -#include #include +#include namespace PixelPaint { diff --git a/Applications/PixelPaint/PickerTool.h b/Applications/PixelPaint/PickerTool.h index 862810c79f..327dfffcb2 100644 --- a/Applications/PixelPaint/PickerTool.h +++ b/Applications/PixelPaint/PickerTool.h @@ -39,7 +39,6 @@ public: private: virtual const char* class_name() const override { return "PickerTool"; } - }; } diff --git a/Applications/PixelPaint/RectangleTool.h b/Applications/PixelPaint/RectangleTool.h index dd6c41c846..4288c86235 100644 --- a/Applications/PixelPaint/RectangleTool.h +++ b/Applications/PixelPaint/RectangleTool.h @@ -27,8 +27,8 @@ #pragma once #include "Tool.h" -#include #include +#include namespace PixelPaint { diff --git a/Applications/PixelPaint/Tool.h b/Applications/PixelPaint/Tool.h index b223ab7042..9c70f218f9 100644 --- a/Applications/PixelPaint/Tool.h +++ b/Applications/PixelPaint/Tool.h @@ -40,14 +40,14 @@ public: virtual const char* class_name() const = 0; - virtual void on_mousedown(Layer&, GUI::MouseEvent&, GUI::MouseEvent&) {} - virtual void on_mousemove(Layer&, GUI::MouseEvent&, GUI::MouseEvent&) {} - virtual void on_mouseup(Layer&, GUI::MouseEvent&, GUI::MouseEvent&) {} - virtual void on_context_menu(Layer&, GUI::ContextMenuEvent&) {} - virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) {} - virtual void on_second_paint(const Layer&, GUI::PaintEvent&) {} - virtual void on_keydown(GUI::KeyEvent&) {} - virtual void on_keyup(GUI::KeyEvent&) {} + virtual void on_mousedown(Layer&, GUI::MouseEvent&, GUI::MouseEvent&) { } + virtual void on_mousemove(Layer&, GUI::MouseEvent&, GUI::MouseEvent&) { } + virtual void on_mouseup(Layer&, GUI::MouseEvent&, GUI::MouseEvent&) { } + virtual void on_context_menu(Layer&, GUI::ContextMenuEvent&) { } + virtual void on_tool_button_contextmenu(GUI::ContextMenuEvent&) { } + virtual void on_second_paint(const Layer&, GUI::PaintEvent&) { } + virtual void on_keydown(GUI::KeyEvent&) { } + virtual void on_keyup(GUI::KeyEvent&) { } virtual bool is_move_tool() const { return false; } diff --git a/Applications/SoundPlayer/SampleWidget.h b/Applications/SoundPlayer/SampleWidget.h index 04aeb34ba1..7da9c20b38 100644 --- a/Applications/SoundPlayer/SampleWidget.h +++ b/Applications/SoundPlayer/SampleWidget.h @@ -38,6 +38,7 @@ public: virtual ~SampleWidget() override; void set_buffer(Audio::Buffer*); + private: SampleWidget(); virtual void paint_event(GUI::PaintEvent&) override; diff --git a/Applications/SoundPlayer/main.cpp b/Applications/SoundPlayer/main.cpp index 66fab01b71..63b71f81cb 100644 --- a/Applications/SoundPlayer/main.cpp +++ b/Applications/SoundPlayer/main.cpp @@ -26,7 +26,6 @@ #include "SoundPlayerWidget.h" #include -#include #include #include #include @@ -34,6 +33,7 @@ #include #include #include +#include #include int main(int argc, char** argv) diff --git a/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.h b/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.h index 97e68b6bd1..2c45577525 100644 --- a/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.h +++ b/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.h @@ -30,6 +30,7 @@ class ProcessFileDescriptorMapWidget final : public GUI::Widget { C_OBJECT(ProcessFileDescriptorMapWidget); + public: virtual ~ProcessFileDescriptorMapWidget() override; diff --git a/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp b/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp index 7eef9185d3..978005422b 100644 --- a/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp +++ b/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp @@ -35,7 +35,7 @@ class PagemapPaintingDelegate final : public GUI::TableCellPaintingDelegate { public: - virtual ~PagemapPaintingDelegate() override {} + virtual ~PagemapPaintingDelegate() override { } virtual void paint(GUI::Painter& painter, const Gfx::IntRect& a_rect, const Gfx::Palette&, const GUI::ModelIndex& index) override { diff --git a/Applications/SystemMonitor/ProcessUnveiledPathsWidget.h b/Applications/SystemMonitor/ProcessUnveiledPathsWidget.h index d930c90bf7..d1eac898b2 100644 --- a/Applications/SystemMonitor/ProcessUnveiledPathsWidget.h +++ b/Applications/SystemMonitor/ProcessUnveiledPathsWidget.h @@ -30,6 +30,7 @@ class ProcessUnveiledPathsWidget final : public GUI::Widget { C_OBJECT(ProcessUnveiledPathsWidget); + public: virtual ~ProcessUnveiledPathsWidget() override; diff --git a/Applications/ThemeEditor/PreviewWidget.cpp b/Applications/ThemeEditor/PreviewWidget.cpp index e2ac55a2b4..a3d90b17ee 100644 --- a/Applications/ThemeEditor/PreviewWidget.cpp +++ b/Applications/ThemeEditor/PreviewWidget.cpp @@ -94,8 +94,8 @@ PreviewWidget::PreviewWidget(const Gfx::Palette& preview_palette) m_inactive_window_icon = Gfx::Bitmap::load_from_file("/res/icons/16x16/window.png"); m_close_bitmap = Gfx::Bitmap::load_from_file("/res/icons/16x16/window-close.png"); - m_maximize_bitmap = Gfx::Bitmap::load_from_file("/res/icons/16x16/window-maximize.png");; - m_minimize_bitmap = Gfx::Bitmap::load_from_file("/res/icons/16x16/window-minimize.png");; + m_maximize_bitmap = Gfx::Bitmap::load_from_file("/res/icons/16x16/window-maximize.png"); + m_minimize_bitmap = Gfx::Bitmap::load_from_file("/res/icons/16x16/window-minimize.png"); m_gallery = add(); set_greedy_for_hits(true);