diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Userland/Applications/SoundPlayer/Common.h | 4 | ||||
| -rw-r--r-- | Userland/Libraries/LibGUI/IconView.cpp | 4 | ||||
| -rw-r--r-- | Userland/Libraries/LibGUI/IconView.h | 2 | ||||
| -rw-r--r-- | Userland/Libraries/LibGfx/Filters/GenericConvolutionFilter.h | 4 |
5 files changed, 7 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 751ef11105..69d9bd7559 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -195,7 +195,6 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") add_compile_options(-Wcast-align) add_compile_options(-Wdouble-promotion) elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang$") - add_compile_options(-Wno-overloaded-virtual) add_compile_options(-Wno-user-defined-literals) add_compile_options(-Wno-atomic-alignment) add_compile_options(-Wno-c99-designator) diff --git a/Userland/Applications/SoundPlayer/Common.h b/Userland/Applications/SoundPlayer/Common.h index 25f03efa07..353fd29bd1 100644 --- a/Userland/Applications/SoundPlayer/Common.h +++ b/Userland/Applications/SoundPlayer/Common.h @@ -13,10 +13,10 @@ class AutoSlider final : public GUI::Slider { public: ~AutoSlider() override = default; Function<void(int)> on_knob_released; - void set_value(int value) + virtual void set_value(int value, GUI::AllowCallback allow_callback = GUI::AllowCallback::Yes) override { if (!knob_dragging() && !mouse_is_down()) - GUI::Slider::set_value(value); + GUI::Slider::set_value(value, allow_callback); } bool mouse_is_down() const { return m_mouse_is_down; } diff --git a/Userland/Libraries/LibGUI/IconView.cpp b/Userland/Libraries/LibGUI/IconView.cpp index 40ded124bb..f2274d459f 100644 --- a/Userland/Libraries/LibGUI/IconView.cpp +++ b/Userland/Libraries/LibGUI/IconView.cpp @@ -682,7 +682,7 @@ void IconView::toggle_selection(ItemData& item_data) if (!item_data.selected) add_selection(item_data); else - remove_selection(item_data); + remove_item_selection(item_data); } void IconView::toggle_selection(const ModelIndex& new_index) @@ -692,7 +692,7 @@ void IconView::toggle_selection(const ModelIndex& new_index) toggle_selection(get_item_data(item_index)); } -void IconView::remove_selection(ItemData& item_data) +void IconView::remove_item_selection(ItemData& item_data) { if (!item_data.selected) return; diff --git a/Userland/Libraries/LibGUI/IconView.h b/Userland/Libraries/LibGUI/IconView.h index 53da8f638b..258f1c1904 100644 --- a/Userland/Libraries/LibGUI/IconView.h +++ b/Userland/Libraries/LibGUI/IconView.h @@ -143,7 +143,7 @@ private: void do_clear_selection(); bool do_add_selection(ItemData&); void add_selection(ItemData&); - void remove_selection(ItemData&); + void remove_item_selection(ItemData&); void toggle_selection(ItemData&); int m_horizontal_padding { 5 }; diff --git a/Userland/Libraries/LibGfx/Filters/GenericConvolutionFilter.h b/Userland/Libraries/LibGfx/Filters/GenericConvolutionFilter.h index cf0138999d..c32a25c1ba 100644 --- a/Userland/Libraries/LibGfx/Filters/GenericConvolutionFilter.h +++ b/Userland/Libraries/LibGfx/Filters/GenericConvolutionFilter.h @@ -69,10 +69,10 @@ public: auto& gcf_params = static_cast<const GenericConvolutionFilter::Parameters&>(parameters); ApplyCache apply_cache; - apply(target_bitmap, target_rect, source_bitmap, source_rect, gcf_params, apply_cache); + apply_with_cache(target_bitmap, target_rect, source_bitmap, source_rect, gcf_params, apply_cache); } - void apply(Bitmap& target, IntRect target_rect, const Bitmap& source, const IntRect& source_rect, const GenericConvolutionFilter::Parameters& parameters, ApplyCache& apply_cache) + void apply_with_cache(Bitmap& target, IntRect target_rect, const Bitmap& source, const IntRect& source_rect, const GenericConvolutionFilter::Parameters& parameters, ApplyCache& apply_cache) { // The target area (where the filter is applied) must be entirely // contained by the source area. source_rect should be describing |