[Bf-blender-cvs] [2618c497c51] functions: rename old Event to EventFilter

[Jacques Lucke]

Commit: 2618c497c51840f37ae79525baea179ad5ca2302
Author: Jacques Lucke
Date:   Sun Jun 30 13:49:18 2019 +0200
Branches: functions
https://developer.blender.org/rB2618c497c51840f37ae79525baea179ad5ca2302

rename old Event to EventFilter

===================================================================

M	source/blender/simulations/bparticles/c_wrapper.cpp
M	source/blender/simulations/bparticles/core.cpp
M	source/blender/simulations/bparticles/core.hpp
M	source/blender/simulations/bparticles/events.cpp
M	source/blender/simulations/bparticles/events.hpp

===================================================================

diff --git a/source/blender/simulations/bparticles/c_wrapper.cpp b/source/blender/simulations/bparticles/c_wrapper.cpp
index 828107fd18e..efd0dc440c5 100644
--- a/source/blender/simulations/bparticles/c_wrapper.cpp
+++ b/source/blender/simulations/bparticles/c_wrapper.cpp
@@ -124,10 +124,10 @@ class EulerIntegrator : public Integrator {
 
 class EventActionTest : public EventAction {
  public:
-  Event *m_event;
+  EventFilter *m_event;
   Action *m_action;
 
-  EventActionTest(Event *event, Action *action) : m_event(event), m_action(action)
+  EventActionTest(EventFilter *event, Action *action) : m_event(event), m_action(action)
   {
   }
 
diff --git a/source/blender/simulations/bparticles/core.cpp b/source/blender/simulations/bparticles/core.cpp
index c79ad5cd9f1..eff256e65d6 100644
--- a/source/blender/simulations/bparticles/core.cpp
+++ b/source/blender/simulations/bparticles/core.cpp
@@ -18,7 +18,7 @@ Action::~Action()
 {
 }
 
-Event::~Event()
+EventFilter::~EventFilter()
 {
 }
 
diff --git a/source/blender/simulations/bparticles/core.hpp b/source/blender/simulations/bparticles/core.hpp
index ca35241af0e..a88bcfb48bd 100644
--- a/source/blender/simulations/bparticles/core.hpp
+++ b/source/blender/simulations/bparticles/core.hpp
@@ -354,9 +354,9 @@ class EventInterface {
   }
 };
 
-class Event {
+class EventFilter {
  public:
-  virtual ~Event();
+  virtual ~EventFilter();
 
   virtual void filter(EventInterface &interface) = 0;
 };
diff --git a/source/blender/simulations/bparticles/events.cpp b/source/blender/simulations/bparticles/events.cpp
index 9b4c9567890..0008c36944a 100644
--- a/source/blender/simulations/bparticles/events.cpp
+++ b/source/blender/simulations/bparticles/events.cpp
@@ -6,7 +6,7 @@
 
 namespace BParticles {
 
-class AgeReachedEvent : public Event {
+class AgeReachedEvent : public EventFilter {
  private:
   float m_age;
 
@@ -34,7 +34,7 @@ class AgeReachedEvent : public Event {
   }
 };
 
-class MeshCollisionEvent : public Event {
+class MeshCollisionEvent : public EventFilter {
  private:
   BVHTreeFromMesh *m_treedata;
   float4x4 m_ray_transform;
@@ -77,12 +77,12 @@ class MeshCollisionEvent : public Event {
   }
 };
 
-Event *EVENT_age_reached(float age)
+EventFilter *EVENT_age_reached(float age)
 {
   return new AgeReachedEvent(age);
 }
 
-Event *EVENT_mesh_collection(BVHTreeFromMesh *treedata, const float4x4 &transform)
+EventFilter *EVENT_mesh_collection(BVHTreeFromMesh *treedata, const float4x4 &transform)
 {
   return new MeshCollisionEvent(treedata, transform);
 }
diff --git a/source/blender/simulations/bparticles/events.hpp b/source/blender/simulations/bparticles/events.hpp
index 1ba30a8f153..4beea879ee8 100644
--- a/source/blender/simulations/bparticles/events.hpp
+++ b/source/blender/simulations/bparticles/events.hpp
@@ -6,7 +6,7 @@ struct BVHTreeFromMesh;
 
 namespace BParticles {
 
-Event *EVENT_age_reached(float age);
-Event *EVENT_mesh_collection(struct BVHTreeFromMesh *treedata, const float4x4 &transform);
+EventFilter *EVENT_age_reached(float age);
+EventFilter *EVENT_mesh_collection(struct BVHTreeFromMesh *treedata, const float4x4 &transform);
 
 }  // namespace BParticles