diff options
author | Andreas Kling <awesomekling@gmail.com> | 2019-04-10 16:56:55 +0200 |
---|---|---|
committer | Andreas Kling <awesomekling@gmail.com> | 2019-04-10 16:56:55 +0200 |
commit | b8062f69d86e0dee9990cbffe627091faf7cc0ba (patch) | |
tree | 558d8ebbc5a2fdb6b6eea955b272c24b675cad06 /Applications | |
parent | 696ada2810948ff6df7ef286ba5346c1d82c1d8c (diff) | |
download | serenity-b8062f69d86e0dee9990cbffe627091faf7cc0ba.zip |
LibCore: Add CEvent and make LibGUI/GEvent inherit from it.
Diffstat (limited to 'Applications')
-rw-r--r-- | Applications/ProcessManager/MemoryStatsWidget.cpp | 2 | ||||
-rw-r--r-- | Applications/ProcessManager/MemoryStatsWidget.h | 2 | ||||
-rw-r--r-- | Applications/ProcessManager/ProcessTableView.cpp | 2 | ||||
-rw-r--r-- | Applications/ProcessManager/ProcessTableView.h | 2 | ||||
-rw-r--r-- | Applications/Terminal/Terminal.cpp | 2 | ||||
-rw-r--r-- | Applications/Terminal/Terminal.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/Applications/ProcessManager/MemoryStatsWidget.cpp b/Applications/ProcessManager/MemoryStatsWidget.cpp index 6ab55d3712..4a1c7ff859 100644 --- a/Applications/ProcessManager/MemoryStatsWidget.cpp +++ b/Applications/ProcessManager/MemoryStatsWidget.cpp @@ -97,7 +97,7 @@ void MemoryStatsWidget::refresh() fclose(fp); } -void MemoryStatsWidget::timer_event(GTimerEvent&) +void MemoryStatsWidget::timer_event(CTimerEvent&) { refresh(); } diff --git a/Applications/ProcessManager/MemoryStatsWidget.h b/Applications/ProcessManager/MemoryStatsWidget.h index 497930cb05..0c01c5acc8 100644 --- a/Applications/ProcessManager/MemoryStatsWidget.h +++ b/Applications/ProcessManager/MemoryStatsWidget.h @@ -12,7 +12,7 @@ public: void refresh(); private: - virtual void timer_event(GTimerEvent&) override; + virtual void timer_event(CTimerEvent&) override; virtual void paint_event(GPaintEvent&) override; GLabel* m_user_physical_pages_label { nullptr }; diff --git a/Applications/ProcessManager/ProcessTableView.cpp b/Applications/ProcessManager/ProcessTableView.cpp index cbdca7a104..ded044c485 100644 --- a/Applications/ProcessManager/ProcessTableView.cpp +++ b/Applications/ProcessManager/ProcessTableView.cpp @@ -16,7 +16,7 @@ ProcessTableView::~ProcessTableView() { } -void ProcessTableView::timer_event(GTimerEvent&) +void ProcessTableView::timer_event(CTimerEvent&) { model()->update(); } diff --git a/Applications/ProcessManager/ProcessTableView.h b/Applications/ProcessManager/ProcessTableView.h index 5b8ee61d30..ec57c2df73 100644 --- a/Applications/ProcessManager/ProcessTableView.h +++ b/Applications/ProcessManager/ProcessTableView.h @@ -17,6 +17,6 @@ protected: virtual void model_notification(const GModelNotification&) override; private: - virtual void timer_event(GTimerEvent&) override; + virtual void timer_event(CTimerEvent&) override; }; diff --git a/Applications/Terminal/Terminal.cpp b/Applications/Terminal/Terminal.cpp index fe0b79a487..4fe66c6039 100644 --- a/Applications/Terminal/Terminal.cpp +++ b/Applications/Terminal/Terminal.cpp @@ -726,7 +726,7 @@ bool Terminal::Line::has_only_one_background_color() const return true; } -void Terminal::event(GEvent& event) +void Terminal::event(CEvent& event) { if (event.type() == GEvent::WindowBecameActive || event.type() == GEvent::WindowBecameInactive) { m_in_active_window = event.type() == GEvent::WindowBecameActive; diff --git a/Applications/Terminal/Terminal.h b/Applications/Terminal/Terminal.h index 4f1bbd439f..f13eab22e6 100644 --- a/Applications/Terminal/Terminal.h +++ b/Applications/Terminal/Terminal.h @@ -25,7 +25,7 @@ public: void apply_size_increments_to_window(GWindow&); private: - virtual void event(GEvent&) override; + virtual void event(CEvent&) override; virtual void paint_event(GPaintEvent&) override; virtual void resize_event(GResizeEvent&) override; virtual void keydown_event(GKeyEvent&) override; |