Selaa lähdekoodia

LibCore+Ladybird: Don't store timer_id in Core::TimerEvent

Dan Klishch 1 vuosi sitten
vanhempi
commit
21097d1c9e

+ 1 - 1
Ladybird/AppKit/Application/EventLoopImplementation.mm

@@ -72,7 +72,7 @@ int CFEventLoopManager::register_timer(Core::EventReceiver& receiver, int interv
                 }
             }
 
-            Core::TimerEvent event(timer_id);
+            Core::TimerEvent event;
             receiver->dispatch_event(event);
         });
 

+ 4 - 4
Ladybird/Qt/EventLoopImplementationQt.cpp

@@ -80,13 +80,13 @@ void EventLoopImplementationQt::post_event(Core::EventReceiver& receiver, Nonnul
         wake();
 }
 
-static void qt_timer_fired(int timer_id, Core::TimerShouldFireWhenNotVisible should_fire_when_not_visible, Core::EventReceiver& object)
+static void qt_timer_fired(Core::TimerShouldFireWhenNotVisible should_fire_when_not_visible, Core::EventReceiver& object)
 {
     if (should_fire_when_not_visible == Core::TimerShouldFireWhenNotVisible::No) {
         if (!object.is_visible_for_timer_purposes())
             return;
     }
-    Core::TimerEvent event(timer_id);
+    Core::TimerEvent event;
     object.dispatch_event(event);
 }
 
@@ -98,11 +98,11 @@ int EventLoopManagerQt::register_timer(Core::EventReceiver& object, int millisec
     timer->setSingleShot(!should_reload);
     auto timer_id = thread_data.timer_id_allocator.allocate();
     auto weak_object = object.make_weak_ptr();
-    QObject::connect(timer, &QTimer::timeout, [timer_id, should_fire_when_not_visible, weak_object = move(weak_object)] {
+    QObject::connect(timer, &QTimer::timeout, [should_fire_when_not_visible, weak_object = move(weak_object)] {
         auto object = weak_object.strong_ref();
         if (!object)
             return;
-        qt_timer_fired(timer_id, should_fire_when_not_visible, *object);
+        qt_timer_fired(should_fire_when_not_visible, *object);
     });
     timer->start();
     thread_data.timers.set(timer_id, move(timer));

+ 2 - 7
Userland/Libraries/LibCore/Event.h

@@ -66,17 +66,12 @@ private:
 
 class TimerEvent final : public Event {
 public:
-    explicit TimerEvent(int timer_id)
+    explicit TimerEvent()
         : Event(Event::Timer)
-        , m_timer_id(timer_id)
     {
     }
-    ~TimerEvent() = default;
-
-    int timer_id() const { return m_timer_id; }
 
-private:
-    int m_timer_id;
+    ~TimerEvent() = default;
 };
 
 enum class NotificationType {

+ 1 - 1
Userland/Libraries/LibCore/EventLoopImplementationUnix.cpp

@@ -244,7 +244,7 @@ try_select_again:
             }
 
             if (owner)
-                ThreadEventQueue::current().post_event(*owner, make<TimerEvent>(timer.timer_id));
+                ThreadEventQueue::current().post_event(*owner, make<TimerEvent>());
             if (timer.should_reload) {
                 timer.reload(now);
             } else {