From 6454969d6bf855aa8a37d6b2b1a5320951196eac Mon Sep 17 00:00:00 2001 From: Ben Wiederhake Date: Wed, 26 Aug 2020 22:05:52 +0200 Subject: [PATCH] LibCore: Remove data pointer from CustomEvent It wasn't used anywhere. Also, if it were used, then it should have been marked AK_NONCOPYABLE(). Or even more cleanly, it should use a RefPtr<> or OwnPtr<> instead of a 'naked' pointer. And because I didn't want to impose any such decision on a possible future use case that we don't even know, I just removed that unused feature. --- Libraries/LibCore/Event.h | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Libraries/LibCore/Event.h b/Libraries/LibCore/Event.h index 8c9bd06e33..dfa0f4fe3e 100644 --- a/Libraries/LibCore/Event.h +++ b/Libraries/LibCore/Event.h @@ -48,12 +48,12 @@ public: Custom, }; - Event() {} + Event() { } explicit Event(unsigned type) : m_type(type) { } - virtual ~Event() {} + virtual ~Event() { } unsigned type() const { return m_type; } @@ -87,7 +87,7 @@ public: , m_timer_id(timer_id) { } - ~TimerEvent() {} + ~TimerEvent() { } int timer_id() const { return m_timer_id; } @@ -102,7 +102,7 @@ public: , m_fd(fd) { } - ~NotifierReadEvent() {} + ~NotifierReadEvent() { } int fd() const { return m_fd; } @@ -117,7 +117,7 @@ public: , m_fd(fd) { } - ~NotifierWriteEvent() {} + ~NotifierWriteEvent() { } int fd() const { return m_fd; } @@ -143,21 +143,17 @@ private: class CustomEvent : public Event { public: - CustomEvent(int custom_type, void* data = nullptr) + CustomEvent(int custom_type) : Event(Event::Type::Custom) , m_custom_type(custom_type) - , m_data(data) { } - ~CustomEvent() {} + ~CustomEvent() { } int custom_type() const { return m_custom_type; } - void* data() { return m_data; } - const void* data() const { return m_data; } private: int m_custom_type { 0 }; - void* m_data { nullptr }; }; }