Merge pull request #252 from vizzuhq/remove_const_pointer_cast

Remove const_pointer_casts

Author: simzer

src/base/util/eventdispatcher.cpp

@@ -6,7 +6,7 @@ EventDispatcher::handler_id EventDispatcher::Event::nextId = 1;
 
 std::string EventTarget::toJson() const
 {
-	return parent ? "\"parent\":{" + parent->toJson() + "}":"";
+	return parent ? "\"parent\":{" + parent->toJson() + "}" : "";
 }
 
 EventDispatcher::Params::Params(const EventTarget *s) : target(s)
@@ -55,7 +55,7 @@ void EventDispatcher::Event::deactivate() { active = false; }
 
 bool EventDispatcher::Event::invoke(Params &&params)
 {
-	params.event = std::const_pointer_cast<Event>(shared_from_this());
+	params.event = shared_from_this();
 	for (auto &handler : handlers) {
 		params.handler = handler.first;
 		currentlyInvoked = params.handler;
@@ -102,10 +102,7 @@ bool EventDispatcher::Event::operator()(Params &&params)
 
 EventDispatcher::~EventDispatcher()
 {
-	for (auto &event : eventRegistry) {
-		auto tmp = std::const_pointer_cast<Event>(event.second);
-		tmp->deactivate();
-	}
+	for (auto &event : eventRegistry) { event.second->deactivate(); }
 }
 
 const EventDispatcher::event_ptr EventDispatcher::getEvent(
@@ -137,8 +134,7 @@ bool EventDispatcher::destroyEvent(const char *name)
 {
 	auto iter = eventRegistry.find(name);
 	if (iter == eventRegistry.end()) return false;
-	auto tmp = std::const_pointer_cast<Event>(iter->second);
-	tmp->deactivate();
+	iter->second->deactivate();
 	eventRegistry.erase(iter);
 	return true;
 }
@@ -162,10 +158,9 @@ void EventDispatcher::registerHandler(uint64_t owner, handler_id id)
 void EventDispatcher::unregisterHandler(const event_ptr &event,
     uint64_t owner)
 {
-	auto tmp = std::const_pointer_cast<Event>(event);
 	auto iter = handlerRegistry.find(owner);
 	if (iter != handlerRegistry.end()) {
-		for (auto &item : iter->second) tmp->detach(item);
+		for (auto &item : iter->second) event->detach(item);
 		handlerRegistry.erase(iter);
 	}
 }