summaryrefslogtreecommitdiff
path: root/Libraries
diff options
context:
space:
mode:
authorBen Wiederhake <BenWiederhake.GitHub@gmx.de>2020-08-26 22:05:52 +0200
committerAndreas Kling <kling@serenityos.org>2020-08-27 10:12:04 +0200
commit6454969d6bf855aa8a37d6b2b1a5320951196eac (patch)
treeb79584dc608508a98201c450d6844cb06a82b753 /Libraries
parente5807d17b2a18dc4c4732d516e2c31672d21f324 (diff)
downloadserenity-6454969d6bf855aa8a37d6b2b1a5320951196eac.zip
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.
Diffstat (limited to 'Libraries')
-rw-r--r--Libraries/LibCore/Event.h18
1 files 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 };
};
}