control: Rename Timer -> TimerConf

It is confusing to read some of the type definitions that deal with
timers when Timer could mean a timer instantiation or a set of timer
configuration parameters. This change disambiguates the two types.

Tested:
    Built and run through unit tests.

Change-Id: I9dd6b47886747d56a86b6a50eb9a74a331d0a1fe
Signed-off-by: William A. Kennington III <wak@google.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/control/types.hpp b/control/types.hpp
index f565333..967b0b4 100644
--- a/control/types.hpp
+++ b/control/types.hpp
@@ -65,8 +65,8 @@ using Service = std::tuple<std::string, bool>;
 constexpr auto intervalPos = 0;
 constexpr auto typePos = 1;
 using TimerType = phosphor::fan::util::Timer::TimerType;
-using Timer = std::tuple<std::chrono::seconds,
-                         TimerType>;
+using TimerConf = std::tuple<std::chrono::seconds,
+                             TimerType>;
 
 constexpr auto sigMatchPos = 0;
 constexpr auto sigHandlerPos = 1;
@@ -74,11 +74,11 @@ using Signal = std::tuple<std::string, Handler>;
 
 constexpr auto groupPos = 0;
 constexpr auto actionsPos = 1;
-constexpr auto timerPos = 2;
+constexpr auto timerConfPos = 2;
 constexpr auto signalsPos = 3;
 using SetSpeedEvent = std::tuple<Group,
                                  std::vector<Action>,
-                                 Timer,
+                                 TimerConf,
                                  std::vector<Signal>>;
 
 constexpr auto eventGroupPos = 0;