Set destructor as virtual

Changed argument of SetAlarm

1 files changed, 12 insertions, 5 deletions

diff --git a/utils/Timer.h b/utils/Timer.h
index 77c1b70..55a4c17 100644
--- a/utils/Timer.h
+++ b/utils/Timer.h
@@ -59,14 +59,13 @@ static	int	IsInactive (CcuCoreTimer*);
 	int		PulsesLeft;
 	timer_status StatusFlag;
 
-		CcuCoreTimer (Millisecond, int, CcuTimerSet*);
-		~CcuCoreTimer ();
 	void	Activate ();
 	void	Schedule (Millisecond);
 	void	Reschedule ();
-virtual	void	SetAlarm (Millisecond) = 0;
-virtual	void	StopAlarm () = 0;
-virtual	void	Handle (Millisecond);
+
+/*?public?*/
+		CcuCoreTimer (Millisecond, int, CcuTimerSet*);
+virtual		~CcuCoreTimer ();
 
 public:
 	void	ChangePeriod (Millisecond first);
@@ -76,6 +75,14 @@ public:
 inline	Millisecond	GetPeriod () const		{ return Period; }
 inline	int		GetNbPulses () const		{ return PulsesLeft; }
 inline	timer_status	GetStatus () const		{ return StatusFlag; }
+
+protected:
+/*?public?*/
+virtual	void	Handle (Millisecond);
+virtual	void	SetAlarm (Millisecond) = 0;
+virtual	void	StopAlarm () = 0;
+
+public:
 static	void		Fire (CcuTimerSet*);
 };