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 /LibGUI/GEventLoop.cpp | |
| parent | 696ada2810948ff6df7ef286ba5346c1d82c1d8c (diff) | |
| download | serenity-b8062f69d86e0dee9990cbffe627091faf7cc0ba.zip | |
LibCore: Add CEvent and make LibGUI/GEvent inherit from it.
Diffstat (limited to 'LibGUI/GEventLoop.cpp')
| -rw-r--r-- | LibGUI/GEventLoop.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/LibGUI/GEventLoop.cpp b/LibGUI/GEventLoop.cpp index e60ac985d8..da031ceb18 100644 --- a/LibGUI/GEventLoop.cpp +++ b/LibGUI/GEventLoop.cpp @@ -153,15 +153,15 @@ int GEventLoop::exec() #endif if (!receiver) { switch (event.type()) { - case GEvent::Quit: + case CEvent::Quit: ASSERT_NOT_REACHED(); return 0; default: dbgprintf("Event type %u with no receiver :(\n", event.type()); } - } else if (event.type() == GEvent::Type::DeferredInvoke) { + } else if (event.type() == CEvent::Type::DeferredInvoke) { printf("DeferredInvoke: receiver=%s{%p}\n", receiver->class_name(), receiver); - static_cast<GDeferredInvocationEvent&>(event).m_invokee(*receiver); + static_cast<CDeferredInvocationEvent&>(event).m_invokee(*receiver); } else { receiver->event(event); } @@ -177,7 +177,7 @@ int GEventLoop::exec() ASSERT_NOT_REACHED(); } -void GEventLoop::post_event(GObject& receiver, OwnPtr<GEvent>&& event) +void GEventLoop::post_event(GObject& receiver, OwnPtr<CEvent>&& event) { #ifdef GEVENTLOOP_DEBUG dbgprintf("GEventLoop::post_event: {%u} << receiver=%p, event=%p\n", m_queued_events.size(), &receiver, event.ptr()); @@ -322,9 +322,9 @@ void GEventLoop::wait_for_event() if (!timer.has_expired()) continue; #ifdef GEVENTLOOP_DEBUG - dbgprintf("GEventLoop: Timer %d has expired, sending GTimerEvent to %p\n", timer.timer_id, timer.owner); + dbgprintf("GEventLoop: Timer %d has expired, sending CTimerEvent to %p\n", timer.timer_id, timer.owner); #endif - post_event(*timer.owner, make<GTimerEvent>(timer.timer_id)); + post_event(*timer.owner, make<CTimerEvent>(timer.timer_id)); if (timer.should_reload) { timer.reload(); } else { |