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>
diff --git a/control/zone.cpp b/control/zone.cpp
index 11246db..5f0c15d 100644
--- a/control/zone.cpp
+++ b/control/zone.cpp
@@ -332,8 +332,8 @@
_signalEvents.emplace_back(std::move(eventData), std::move(match));
}
// Attach a timer to run the action of an event
- auto eventTimer = std::get<timerPos>(event);
- if (std::get<intervalPos>(eventTimer) != seconds(0))
+ auto timerConf = std::get<timerConfPos>(event);
+ if (std::get<intervalPos>(timerConf) != seconds(0))
{
// Associate event data with timer
std::unique_ptr<EventData> eventData =
@@ -354,8 +354,8 @@
});
if (!timer->running())
{
- timer->start(std::get<intervalPos>(eventTimer),
- std::get<typePos>(eventTimer));
+ timer->start(std::get<intervalPos>(timerConf),
+ std::get<typePos>(timerConf));
}
addTimer(std::move(eventData), std::move(timer));
}