From: g0dil Date: Mon, 6 Oct 2008 08:15:58 +0000 (+0000) Subject: Scheduler: Remove obsolete duplicate 'enabled()' implementations X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=a634d4df375e12f0a9dcd0014f1ee14b70de16b8;p=senf.git Scheduler: Remove obsolete duplicate 'enabled()' implementations Scheduler: Documentation git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@930 270642c3-0616-0410-b53a-bc976706d245 --- diff --git a/Scheduler/EventManager.hh b/Scheduler/EventManager.hh index eff1fab..f08f019 100644 --- a/Scheduler/EventManager.hh +++ b/Scheduler/EventManager.hh @@ -65,11 +65,11 @@ namespace detail { ///@} /////////////////////////////////////////////////////////////////////////// - std::string const & name() const; - bool enabled() const; - unsigned runCount() const; - char const * type() const; - std::string info() const; + std::string const & name() const; ///< Get event name + bool enabled() const; ///< \c true, if event is enabled, \c false otherwise + unsigned runCount() const; ///< Number of times, event was fired + char const * type() const; ///< Event type code + std::string info() const; ///< Additional event information protected: void countRun(); diff --git a/Scheduler/FdEvent.cci b/Scheduler/FdEvent.cci index 93dded7..9404a5c 100644 --- a/Scheduler/FdEvent.cci +++ b/Scheduler/FdEvent.cci @@ -45,11 +45,6 @@ prefix_ senf::scheduler::FdEvent::~FdEvent() disable(); } -prefix_ bool senf::scheduler::FdEvent::enabled() -{ - return detail::FdSetBase::linked(); -} - prefix_ senf::scheduler::FdEvent & senf::scheduler::FdEvent::action(Callback const & cb) { cb_ = cb; diff --git a/Scheduler/FdEvent.hh b/Scheduler/FdEvent.hh index ff3642d..78409f4 100644 --- a/Scheduler/FdEvent.hh +++ b/Scheduler/FdEvent.hh @@ -138,7 +138,6 @@ namespace scheduler { void disable(); ///< Disable event void enable(); ///< Enable event - bool enabled(); ///< \c true if event enabled, \c false otherwise FdEvent & action(Callback const & cb); ///< Change event callback diff --git a/Scheduler/SignalEvent.cci b/Scheduler/SignalEvent.cci index b11e5f1..a19bc4d 100644 --- a/Scheduler/SignalEvent.cci +++ b/Scheduler/SignalEvent.cci @@ -82,12 +82,6 @@ prefix_ void senf::scheduler::SignalEvent::enable() senf::scheduler::detail::SignalDispatcher::instance().add(*this); } -prefix_ bool senf::scheduler::SignalEvent::enabled() - const -{ - return detail::SignalSetBase::linked(); -} - prefix_ void senf::scheduler::SignalEvent::action(Callback const & cb) { cb_ = cb; diff --git a/Scheduler/SignalEvent.hh b/Scheduler/SignalEvent.hh index cb78b15..a5330f2 100644 --- a/Scheduler/SignalEvent.hh +++ b/Scheduler/SignalEvent.hh @@ -91,7 +91,7 @@ namespace scheduler { void disable(); ///< Enable signal event registration void enable(); ///< Disable the signal event registration - bool enabled() const; ///< \c true, if event enabled, \c false otherwise + void action(Callback const & cb); ///< Change signal event callback private: diff --git a/Scheduler/TimerEvent.cci b/Scheduler/TimerEvent.cci index 372565d..8527380 100644 --- a/Scheduler/TimerEvent.cci +++ b/Scheduler/TimerEvent.cci @@ -65,11 +65,6 @@ prefix_ void senf::scheduler::TimerEvent::disable() senf::scheduler::detail::TimerDispatcher::instance().remove(*this); } -prefix_ bool senf::scheduler::TimerEvent::enabled() -{ - return detail::TimerSetBase::linked(); -} - prefix_ void senf::scheduler::TimerEvent::action(Callback const & cb) { cb_ = cb; diff --git a/Scheduler/TimerEvent.hh b/Scheduler/TimerEvent.hh index 4c06dfc..acf7f98 100644 --- a/Scheduler/TimerEvent.hh +++ b/Scheduler/TimerEvent.hh @@ -106,7 +106,6 @@ namespace scheduler { void disable(); ///< Disable timer void enable(); ///< Enable timer - bool enabled(); ///< \c true, if timer enabled, \c false otherwise void action(Callback const & cb); ///< Change timer event callback void timeout(ClockService::clock_type timeout, bool initiallyEnabled=true);