From 05b3e8cdc7f6cf7056c96d9cd150a0e2a8fb85a4 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Fri, 28 Oct 2016 17:55:06 +0200
Subject: Rewrite event handler to use shared_ptr Events instead of raw
 pointers.

---
 plugingui/eventhandler.cc | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

(limited to 'plugingui/eventhandler.cc')

diff --git a/plugingui/eventhandler.cc b/plugingui/eventhandler.cc
index 62ffb2b..083efae 100644
--- a/plugingui/eventhandler.cc
+++ b/plugingui/eventhandler.cc
@@ -43,12 +43,12 @@ bool EventHandler::hasEvent()
 	return nativeWindow.hasEvent();
 }
 
-Event *EventHandler::getNextEvent()
+std::shared_ptr<Event> EventHandler::getNextEvent()
 {
 	return nativeWindow.getNextEvent();
 }
 
-Event *EventHandler::peekNextEvent()
+std::shared_ptr<Event> EventHandler::peekNextEvent()
 {
 	return nativeWindow.peekNextEvent();
 }
@@ -87,16 +87,13 @@ void EventHandler::processEvents()
 					}
 					if(peekEvent->type() != EventType::resize)
 					{
-						//delete peekEvent;
 						break;
 					}
-					//delete peekEvent;
 
-					//delete event;
 					event = getNextEvent();
 				}
 
-				auto resizeEvent = static_cast<ResizeEvent*>(event);
+				auto resizeEvent = static_cast<ResizeEvent*>(event.get());
 				if((resizeEvent->width != window.width()) ||
 				   (resizeEvent->height != window.height()))
 				{
@@ -121,16 +118,13 @@ void EventHandler::processEvents()
 					}
 					if(peekEvent->type() != EventType::mouseMove)
 					{
-						//delete peekEvent;
 						break;
 					}
-					//delete peekEvent;
 
-					//delete event;
 					event = getNextEvent();
 				}
 
-				auto moveEvent = static_cast<MouseMoveEvent*>(event);
+				auto moveEvent = static_cast<MouseMoveEvent*>(event.get());
 
 				auto widget = window.find(moveEvent->x, moveEvent->y);
 				auto oldwidget = window.mouseFocus();
@@ -178,7 +172,7 @@ void EventHandler::processEvents()
 					continue;
 				}
 
-				auto buttonEvent = static_cast<ButtonEvent*>(event);
+				auto buttonEvent = static_cast<ButtonEvent*>(event.get());
 
 				lastWasDoubleClick = buttonEvent->doubleClick;
 
@@ -236,19 +230,16 @@ void EventHandler::processEvents()
 					}
 					if(peekEvent->type() != EventType::scroll)
 					{
-						//delete peekEvent;
 						break;
 					}
-					//delete peekEvent;
 
-					auto scrollEvent = static_cast<ScrollEvent*>(event);
+					auto scrollEvent = static_cast<ScrollEvent*>(event.get());
 					delta += scrollEvent->delta;
 
-					//delete event;
 					event = getNextEvent();
 				}
 
-				auto scrollEvent = static_cast<ScrollEvent*>(event);
+				auto scrollEvent = static_cast<ScrollEvent*>(event.get());
 				scrollEvent->delta += delta;
 
 				auto widget = window.find(scrollEvent->x, scrollEvent->y);
@@ -267,7 +258,7 @@ void EventHandler::processEvents()
 
 				// TODO: Filter out multiple arrow events.
 
-				auto keyEvent = static_cast<KeyEvent*>(event);
+				auto keyEvent = static_cast<KeyEvent*>(event.get());
 				if(window.keyboardFocus())
 				{
 					window.keyboardFocus()->keyEvent(keyEvent);
@@ -279,8 +270,6 @@ void EventHandler::processEvents()
 			closeNotifier();
 			break;
 		}
-
-		delete event;
 	}
 }
 
-- 
cgit v1.2.3