From 550e2462ade4e665805abcc829bde131878c3d0b Mon Sep 17 00:00:00 2001
From: Max Schettler <schettle@mail.upb.de>
Date: Tue, 5 Jun 2018 13:04:23 +0200
Subject: [PATCH] Rename TimerManager enumerators

Use lower case enumerators as per
https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Renum-caps.
This fixes #68.
---
 src/veins/modules/utility/TimerManager.cc | 36 +++++++++++------------
 src/veins/modules/utility/TimerManager.h  | 10 +++----
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/veins/modules/utility/TimerManager.cc b/src/veins/modules/utility/TimerManager.cc
index f6897d766d..af28552100 100644
--- a/src/veins/modules/utility/TimerManager.cc
+++ b/src/veins/modules/utility/TimerManager.cc
@@ -30,7 +30,7 @@ struct Veins::TimerMessage : public omnetpp::cMessage {
 };
 
 TimerSpecification::TimerSpecification(std::function<void()> callback)
-    : start_mode_(StartMode::IMMEDIATE), end_mode_(EndMode::OPEN), period_(-1), callback_(callback) {}
+    : start_mode_(StartMode::immediate), end_mode_(EndMode::open), period_(-1), callback_(callback) {}
 
 TimerSpecification &TimerSpecification::interval(simtime_t interval) {
   ASSERT(interval > 0);
@@ -39,37 +39,37 @@ TimerSpecification &TimerSpecification::interval(simtime_t interval) {
 }
 
 TimerSpecification &TimerSpecification::relativeStart(simtime_t start) {
-  start_mode_ = StartMode::RELATIVE;
+  start_mode_ = StartMode::relative;
   start_ = start;
   return *this;
 }
 
 TimerSpecification &TimerSpecification::absoluteStart(simtime_t start) {
-  start_mode_ = StartMode::ABSOLUTE;
+  start_mode_ = StartMode::absolute;
   start_ = start;
   return *this;
 }
 
 TimerSpecification &TimerSpecification::relativeEnd(simtime_t end) {
-  end_mode_ = EndMode::RELATIVE;
+  end_mode_ = EndMode::relative;
   end_time_ = end;
   return *this;
 }
 
 TimerSpecification &TimerSpecification::absoluteEnd(simtime_t end) {
-  end_mode_ = EndMode::ABSOLUTE;
+  end_mode_ = EndMode::absolute;
   end_time_ = end;
   return *this;
 }
 
 TimerSpecification &TimerSpecification::repititions(size_t n) {
-  end_mode_ = EndMode::REPITITION;
+  end_mode_ = EndMode::repetition;
   end_count_ = n;
   return *this;
 }
 
 TimerSpecification &TimerSpecification::openEnd() {
-  end_mode_ = EndMode::OPEN;
+  end_mode_ = EndMode::open;
   return *this;
 }
 
@@ -83,28 +83,28 @@ TimerSpecification &TimerSpecification::oneshotAt(omnetpp::simtime_t at) {
 
 void TimerSpecification::finalize() {
   switch (start_mode_) {
-  case StartMode::RELATIVE:
+  case StartMode::relative:
     start_ += simTime();
-    start_mode_ = StartMode::ABSOLUTE;
+    start_mode_ = StartMode::absolute;
     break;
-  case StartMode::ABSOLUTE:
+  case StartMode::absolute:
     break;
-  case StartMode::IMMEDIATE:
+  case StartMode::immediate:
     start_ = simTime() + period_;
     break;
   }
 
   switch (end_mode_) {
-  case EndMode::RELATIVE:
+  case EndMode::relative:
     end_time_ += simTime();
-    end_mode_ = EndMode::ABSOLUTE;
+    end_mode_ = EndMode::absolute;
     break;
-  case EndMode::ABSOLUTE:
+  case EndMode::absolute:
     break;
-  case EndMode::REPITITION:
+  case EndMode::repetition:
     end_time_ = start_ + ((end_count_ - 1) * period_);
-    end_mode_ = EndMode::ABSOLUTE;
-  case EndMode::OPEN:
+    end_mode_ = EndMode::absolute;
+  case EndMode::open:
     break;
   }
 }
@@ -113,7 +113,7 @@ bool TimerSpecification::validOccurence(simtime_t time) const {
   const bool afterStart = time >= start_;
   const bool beforeEnd = time <= end_time_;
   const bool atPeriod = omnetpp::fmod(time - start_, period_) == 0;
-  return afterStart && (beforeEnd || end_mode_ == EndMode::OPEN) && atPeriod;
+  return afterStart && (beforeEnd || end_mode_ == EndMode::open) && atPeriod;
 }
 
 TimerManager::TimerManager(omnetpp::cSimpleModule *parent) : parent_(parent) { ASSERT(parent_); }
diff --git a/src/veins/modules/utility/TimerManager.h b/src/veins/modules/utility/TimerManager.h
index 0f0b5ebf35..4d5f02cfeb 100644
--- a/src/veins/modules/utility/TimerManager.h
+++ b/src/veins/modules/utility/TimerManager.h
@@ -134,13 +134,13 @@ struct TimerSpecification {
 private:
   friend TimerManager;
 
-  enum class StartMode { RELATIVE, ABSOLUTE, IMMEDIATE };
-  enum class EndMode { RELATIVE, ABSOLUTE, REPITITION, OPEN };
+  enum class StartMode { relative, absolute, immediate };
+  enum class EndMode { relative, absolute, repetition, open };
 
   /**
    * Finalizes this instance such that its values are independent of current simulation time.
    *
-   * After calling this function, start_mode_ is guaranteed to be StartMode::ABSOLUTE and end_mode_ to be EndMode::ABSOLUTE or EndMode::OPEN.
+   * After calling this function, start_mode_ is guaranteed to be StartMode::absolute and end_mode_ to be EndMode::absolute or EndMode::open.
    * Cannot be called on TimerSpecifications
    */
   void finalize();
@@ -158,8 +158,8 @@ struct TimerSpecification {
   StartMode start_mode_;           ///< Interpretation of start time._
   omnetpp::simtime_t start_;       ///< Time of the Timer's first occurence. Interpretation depends on start_mode_.
   EndMode end_mode_;               ///< Interpretation of end time._
-  unsigned end_count_;             ///< Number of repititions of the timer. Only valid when end_mode_ == REPITITION.
-  omnetpp::simtime_t end_time_;    ///< Last possible occurence of the timer. Only valid when end_mode_ != REPITITION.
+  unsigned end_count_;             ///< Number of repititions of the timer. Only valid when end_mode_ == repetition.
+  omnetpp::simtime_t end_time_;    ///< Last possible occurence of the timer. Only valid when end_mode_ != repetition.
   omnetpp::simtime_t period_;      ///< Time between events.
   std::function<void()> callback_; ///< The function to be called when the Timer is triggered.
 };