diff --git a/Applications/Browser/BookmarksBarWidget.cpp b/Applications/Browser/BookmarksBarWidget.cpp index d7a5fc6060..0c90e892cc 100644 --- a/Applications/Browser/BookmarksBarWidget.cpp +++ b/Applications/Browser/BookmarksBarWidget.cpp @@ -108,7 +108,7 @@ void BookmarksBarWidget::resize_event(GUI::ResizeEvent& event) update_content_size(); } -void BookmarksBarWidget::on_model_update(unsigned) +void BookmarksBarWidget::model_did_update(unsigned) { for (auto* child : child_widgets()) { child->remove_from_parent(); diff --git a/Applications/Browser/BookmarksBarWidget.h b/Applications/Browser/BookmarksBarWidget.h index 0880e6bfa6..ba9772fa73 100644 --- a/Applications/Browser/BookmarksBarWidget.h +++ b/Applications/Browser/BookmarksBarWidget.h @@ -32,9 +32,11 @@ namespace Browser { -class BookmarksBarWidget final : public GUI::Widget +class BookmarksBarWidget final + : public GUI::Widget , private GUI::ModelClient { - C_OBJECT(BookmarksBarWidget) + C_OBJECT(BookmarksBarWidget); + public: static BookmarksBarWidget& the(); @@ -54,7 +56,10 @@ public: private: BookmarksBarWidget(const String&, bool enabled); - virtual void on_model_update(unsigned) override; + // ^GUI::ModelClient + virtual void model_did_update(unsigned) override; + + // ^GUI::Widget virtual void resize_event(GUI::ResizeEvent&) override; void update_content_size(); diff --git a/Applications/FileManager/DirectoryView.cpp b/Applications/FileManager/DirectoryView.cpp index a48a9ff8a1..391c16b2c3 100644 --- a/Applications/FileManager/DirectoryView.cpp +++ b/Applications/FileManager/DirectoryView.cpp @@ -219,7 +219,7 @@ DirectoryView::~DirectoryView() m_model->unregister_client(*this); } -void DirectoryView::on_model_update(unsigned flags) +void DirectoryView::model_did_update(unsigned flags) { if (flags & GUI::Model::UpdateFlag::InvalidateAllIndexes) { for_each_view_implementation([](auto& view) { diff --git a/Applications/FileManager/DirectoryView.h b/Applications/FileManager/DirectoryView.h index 389f5630bc..ac12878080 100644 --- a/Applications/FileManager/DirectoryView.h +++ b/Applications/FileManager/DirectoryView.h @@ -37,7 +37,7 @@ #include #include -class LauncherHandler: public RefCounted { +class LauncherHandler : public RefCounted { public: LauncherHandler(const NonnullRefPtr& details) : m_details(details) @@ -51,9 +51,11 @@ private: NonnullRefPtr m_details; }; -class DirectoryView final : public GUI::StackWidget +class DirectoryView final + : public GUI::StackWidget , private GUI::ModelClient { - C_OBJECT(DirectoryView) + C_OBJECT(DirectoryView); + public: virtual ~DirectoryView() override; @@ -118,7 +120,8 @@ private: DirectoryView(); const GUI::FileSystemModel& model() const { return *m_model; } - virtual void on_model_update(unsigned) override; + // ^GUI::ModelClient + virtual void model_did_update(unsigned) override; void handle_activation(const GUI::ModelIndex&); GUI::ModelIndex map_table_view_index(const GUI::ModelIndex&) const; diff --git a/Libraries/LibGUI/FilePicker.cpp b/Libraries/LibGUI/FilePicker.cpp index 8756ed3088..74238a8603 100644 --- a/Libraries/LibGUI/FilePicker.cpp +++ b/Libraries/LibGUI/FilePicker.cpp @@ -287,7 +287,7 @@ FilePicker::~FilePicker() m_model->unregister_client(*this); } -void FilePicker::on_model_update(unsigned) +void FilePicker::model_did_update(unsigned) { m_location_textbox->set_text(m_model->root_path()); if (have_preview()) diff --git a/Libraries/LibGUI/FilePicker.h b/Libraries/LibGUI/FilePicker.h index 52bff3d664..526f527325 100644 --- a/Libraries/LibGUI/FilePicker.h +++ b/Libraries/LibGUI/FilePicker.h @@ -35,8 +35,11 @@ namespace GUI { -class FilePicker final : public Dialog, private ModelClient { - C_OBJECT(FilePicker) +class FilePicker final + : public Dialog + , private ModelClient { + C_OBJECT(FilePicker); + public: enum class Mode { Open, @@ -69,7 +72,8 @@ private: void set_path(const String&); - virtual void on_model_update(unsigned) override; + // ^GUI::ModelClient + virtual void model_did_update(unsigned) override; FilePicker(Window* parent_window, Mode type = Mode::Open, Options = Options::None, const StringView& file_name = "Untitled", const StringView& path = Core::StandardPaths::home_directory()); diff --git a/Libraries/LibGUI/Model.cpp b/Libraries/LibGUI/Model.cpp index a47e462521..838d347eb6 100644 --- a/Libraries/LibGUI/Model.cpp +++ b/Libraries/LibGUI/Model.cpp @@ -56,7 +56,7 @@ void Model::for_each_view(Function callback) void Model::did_update(unsigned flags) { for (auto* client : m_clients) - client->on_model_update(flags); + client->model_did_update(flags); for_each_view([&](auto& view) { view.did_update_model(flags); diff --git a/Libraries/LibGUI/Model.h b/Libraries/LibGUI/Model.h index 0d647e32e7..e322402a74 100644 --- a/Libraries/LibGUI/Model.h +++ b/Libraries/LibGUI/Model.h @@ -48,7 +48,7 @@ class ModelClient { public: virtual ~ModelClient() { } - virtual void on_model_update(unsigned flags) = 0; + virtual void model_did_update(unsigned flags) = 0; }; class Model : public RefCounted { diff --git a/Libraries/LibGUI/SortingProxyModel.cpp b/Libraries/LibGUI/SortingProxyModel.cpp index 18366e3d28..26a24b3753 100644 --- a/Libraries/LibGUI/SortingProxyModel.cpp +++ b/Libraries/LibGUI/SortingProxyModel.cpp @@ -50,7 +50,7 @@ SortingProxyModel::~SortingProxyModel() m_source->unregister_client(*this); } -void SortingProxyModel::on_model_update(unsigned flags) +void SortingProxyModel::model_did_update(unsigned flags) { resort(flags); } diff --git a/Libraries/LibGUI/SortingProxyModel.h b/Libraries/LibGUI/SortingProxyModel.h index 3ee4e0c2ed..19231ccf09 100644 --- a/Libraries/LibGUI/SortingProxyModel.h +++ b/Libraries/LibGUI/SortingProxyModel.h @@ -57,7 +57,8 @@ public: private: explicit SortingProxyModel(NonnullRefPtr source); - virtual void on_model_update(unsigned) override; + // ^ModelClient + virtual void model_did_update(unsigned) override; Model& source() { return *m_source; } const Model& source() const { return *m_source; }