...

[FrontAlgorithms.git] / lib / fpa / Base / Events.h

diff --git a/lib/fpa/Base/Events.h b/lib/fpa/Base/Events.h
index 09f0637da4731445aff3c2304363aa18963529f4..17c55649cece70841cfaa2558b4be6528e604956 100644 (file)
--- a/lib/fpa/Base/Events.h
+++ b/lib/fpa/Base/Events.h
@@ -1,8 +1,5 @@
-#ifndef __FPA__BASE__EVENTS__H__
-#define __FPA__BASE__EVENTS__H__
-
-#include <vector>
-#include <itkProcessObject.h>
+#ifndef __fpa__Base__Events__h__
+#define __fpa__Base__Events__h__
 
 // -------------------------------------------------------------------------
 #define fpa_Base_NewEvent( name )                               \
@@ -63,7 +60,7 @@ namespace fpa
 
     /**
      */
-    template< class V >
+    template< class _TVertex >
     class BaseEventWithVertex
       : public BaseEvent
     {
@@ -71,7 +68,7 @@ namespace fpa
       BaseEventWithVertex( )
         : BaseEvent( )
         { }
-      BaseEventWithVertex( const V& v, long fid )
+      BaseEventWithVertex( const _TVertex& v, long fid )
         : BaseEvent( ),
           Vertex( v ),
           FrontId( fid )
@@ -83,21 +80,21 @@ namespace fpa
       bool CheckEvent( const itk::EventObject* e ) const
         {
           return(
-            dynamic_cast< const BaseEventWithVertex< V >* >( e ) != NULL
+            dynamic_cast< const BaseEventWithVertex< _TVertex >* >( e ) != NULL
             );
         }
       itk::EventObject* MakeObject( ) const
-        { return( new BaseEventWithVertex< V >( ) ); }
+        { return( new BaseEventWithVertex< _TVertex >( ) ); }
 
     public:
-      V Vertex;
-      long FrontId;
+      _TVertex Vertex;
+      long     FrontId;
     };
 
   } // ecapseman
 
 } // ecapseman
 
-#endif // __FPA__BASE__EVENTS__H__
+#endif // __fpa__Base__Events__h__
 
 // eof - $RCSfile$