1 files changed, 36 insertions, 37 deletions

diff --git a/dnn/Event.h b/dnn/Event.h
index b2c7341..3b9ac6b 100644
--- a/dnn/Event.h
+++ b/dnn/Event.h
@@ -10,95 +10,94 @@
  *
  *	$Id$
  *	$CurLog$
- *	Split DnnEvent into DnnEvent and DnnBasicEvent
  */
 
-#ifndef DnnEvent_H_
-#define DnnEvent_H_
+#ifndef IvlEvent_H_
+#define IvlEvent_H_
 
 #include "cplus_bugs.h"
-#include "ccu/String.h"
-#include "ccu/List.h"
-#include "ccu/bool.h"
+#include "ivl/String.h"
+#include "ivl/List.h"
+#include "ivl/bool.h"
 
 #if 0
 
-class DnnEventFeature {
+class IvlEventFeature {
 protected:
-	CcuString	Name;
-	DnnEventFeatureType&	Type;
+	IvlString	Name;
+	IvlEventFeatureType&	Type;
 
 public:
-inline		DnnEventFeature (const char* n, DnnEventFeatureType& t) : Name (n), Type (t)	{}
-inline		~DnnEventFeature ()	{}
+inline		IvlEventFeature (const char* n, IvlEventFeatureType& t) : Name (n), Type (t)	{}
+inline		~IvlEventFeature ()	{}
 };
 
 #else
 
-struct DnnEventFeature {
+struct IvlEventFeature {
 	const char*	Name;
 	int	Size;
 };
 
 #endif
 
-class DnnEventFeatureList : public CcuListOf <DnnEventFeature> {
+class IvlEventFeatureList : public IvlListOf <IvlEventFeature> {
 private:
-	void	Load (int, DnnEventFeature*);
+	void	Load (int, IvlEventFeature*);
 
 public:
-		DnnEventFeatureList (int, DnnEventFeature*);
-		DnnEventFeatureList (const DnnEventFeatureList&, int, DnnEventFeature*);
-		~DnnEventFeatureList ();
+		IvlEventFeatureList (int, IvlEventFeature*);
+		IvlEventFeatureList (const IvlEventFeatureList&, int, IvlEventFeature*);
+		~IvlEventFeatureList ();
 };
 
-class DnnEventType {
+class IvlEventType {
 private:
 static	void	ClassInit ();
 
 protected:
-static	CcuListOf <DnnEventType>*	AllTypes;
-	CcuString	Name;
+static	IvlListOf <IvlEventType>*	AllTypes;
+	IvlString	Name;
 #if 0
-	CcuListOf <DnnEventFeature>	Features;
+	IvlListOf <IvlEventFeature>	Features;
 #endif
 	int	NbFeatures;
 	int*	FeaturesOffsets;
 
 public:
-		DnnEventType (const char*, int, DnnEventFeature []);
-		DnnEventType (const char*, const DnnEventFeatureList&);
-		~DnnEventType ();
-inline	int	operator == (const DnnEventType& evt) const	{ return (this == &evt); }
+		IvlEventType (const char*, int, IvlEventFeature []);
+		IvlEventType (const char*, const IvlEventFeatureList&);
+		~IvlEventType ();
+inline	int	operator == (const IvlEventType& evt) const	{ return (this == &evt); }
 inline	const char*	GetName () const	{ return Name; }
 inline	int	GetTotalSize () const	{ return (NbFeatures) > 0 ? FeaturesOffsets [NbFeatures - 1] : 0; }
 inline	int	GetOffset (int i) const	{ return i ? FeaturesOffsets [i-1] : 0; }
 inline	int	GetSize (int i) const	{ return FeaturesOffsets [i] - (i ? FeaturesOffsets [i-1] : 0); }
 #if 0
-inline	void	AddFeature (const char* fn, DnnEventFeatureType& t)	{ Features->Append (new DnnEventFeature (fn, t); }
+inline	void	AddFeature (const char* fn, IvlEventFeatureType& t)	{ Features->Append (new IvlEventFeature (fn, t); }
 inline	void	RemoveFeature ()	{ }
 #endif
 };
 
-class DnnEvent {
+class IvlEvent {
 public:
-		DnnEvent ();
-		DnnEvent (const DnnEventType*);	// useless, for compatibility only
-virtual		~DnnEvent ();
+		IvlEvent ();
+		IvlEvent (const IvlEventType*);	// useless, for compatibility only
+virtual		~IvlEvent ();
 };
 
-class DnnBasicEvent : public DnnEvent {
+class IvlBasicEvent : public IvlEvent {
 protected:
-	const DnnEventType&	Type;
+	const IvlEventType&	Type;
 	char*	Data;
 
-		DnnBasicEvent (const DnnEventType*, bool);
+		IvlBasicEvent (const IvlEventType*, bool);
 public:
-		DnnBasicEvent (const DnnEventType*);
-		~DnnBasicEvent ();
+		IvlBasicEvent (const IvlEventType*);
+		~IvlBasicEvent ();
 	void	SetFeature (int, const void*);
 	void	GetFeature (int, void*);
-inline	const DnnEventType*	GetType () const	{ return &Type; }
+inline	const IvlEventType*	GetType () const	{ return &Type; }
 };
 
-#endif	/* DnnEvent_H_ */
+#endif	/* IvlEvent_H_ */