From 393641b5b697520297b0dfee86c900956268dfa0 Mon Sep 17 00:00:00 2001
From: Pavel Kirienko <pavel.kirienko@gmail.com>
Date: Mon, 10 Mar 2014 14:00:51 +0400
Subject: [PATCH] Conforming style for TimerEventForwarder<>

---
 libuavcan/include/uavcan/timer.hpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/libuavcan/include/uavcan/timer.hpp b/libuavcan/include/uavcan/timer.hpp
index df9a78deeb..34f6d747b8 100644
--- a/libuavcan/include/uavcan/timer.hpp
+++ b/libuavcan/include/uavcan/timer.hpp
@@ -58,31 +58,31 @@ public:
 };
 
 
-template <typename Functor>
+template <typename Callback>
 class TimerEventForwarder : public Timer
 {
-    Functor functor_;
+    Callback callback_;
 
 public:
     TimerEventForwarder(Scheduler& node)
     : Timer(node)
-    , functor_()
+    , callback_()
     { }
 
-    TimerEventForwarder(Scheduler& node, Functor functor)
+    TimerEventForwarder(Scheduler& node, Callback callback)
     : Timer(node)
-    , functor_(functor)
+    , callback_(callback)
     { }
 
-    const Functor& getFunctor() const { return functor_; }
-    void setFunctor(const Functor& functor) { functor_ = functor; }
+    const Callback& getCallback() const { return callback_; }
+    void setCallback(const Callback& callback) { callback_ = callback; }
 
     void onTimerEvent(const TimerEvent& event)
     {
-        if (try_implicit_cast<bool>(functor_, true))
-            functor_(event);
+        if (try_implicit_cast<bool>(callback_, true))
+            callback_(event);
         else
-            handleFatalError("Invalid timer functor");
+            handleFatalError("Invalid timer callback");
     }
 };