Skip to content

Commit cda43ef

Browse files
committed
rebase against v5 and replace callback use
1 parent 77db85f commit cda43ef

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

loader/include/Geode/utils/AndroidEvent.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ namespace geode {
115115
public:
116116
using Callback = void(AndroidRichInputEvent*);
117117

118-
ListenerResult handle(std::function<Callback> fn, AndroidRichInputEvent* event);
118+
ListenerResult handle(geode::Function<Callback>& fn, AndroidRichInputEvent* event);
119119
};
120120

121121
class GEODE_DLL AndroidInputDeviceEvent final : public Event {
@@ -139,7 +139,7 @@ namespace geode {
139139
public:
140140
using Callback = void(AndroidInputDeviceEvent*);
141141

142-
ListenerResult handle(std::function<Callback> fn, AndroidInputDeviceEvent* event);
142+
ListenerResult handle(geode::Function<Callback>& fn, AndroidInputDeviceEvent* event);
143143
};
144144
}
145145

loader/src/platform/android/input.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ AndroidRichInput AndroidRichInputEvent::data() const {
341341
return m_data;
342342
}
343343

344-
ListenerResult AndroidRichInputFilter::handle(std::function<Callback> fn, AndroidRichInputEvent* event) {
344+
ListenerResult AndroidRichInputFilter::handle(geode::Function<Callback>& fn, AndroidRichInputEvent* event) {
345345
fn(event);
346346
return ListenerResult::Propagate;
347347
}
@@ -400,7 +400,7 @@ AndroidInputDeviceEvent::AndroidInputDeviceEvent(int deviceId, Status status) :
400400
int AndroidInputDeviceEvent::deviceId() const { return m_deviceId; }
401401
AndroidInputDeviceEvent::Status AndroidInputDeviceEvent::status() const { return m_status; }
402402

403-
ListenerResult AndroidInputDeviceFilter::handle(std::function<Callback> fn, AndroidInputDeviceEvent* event) {
403+
ListenerResult AndroidInputDeviceFilter::handle(geode::Function<Callback>& fn, AndroidInputDeviceEvent* event) {
404404
fn(event);
405405
return ListenerResult::Propagate;
406406
}

0 commit comments

Comments
 (0)