Change class member naming convention to member_

bblanchon · Aug 7, 2023 · 853a82f · 853a82f
1 parent 6376e5a
commit 853a82f
Show file tree

Hide file tree

Showing 16 changed files with 178 additions and 178 deletions.
diff --git a/extras/tests/TestFixtures/Clock.hpp b/extras/tests/TestFixtures/Clock.hpp
@@ -11,27 +11,27 @@ class ClockWatcher {
 class Clock {
 public:
   void set(unsigned long time) {
-    _time = time;
-    std::vector<ClockWatcher *> watchers(_watchers.begin(), _watchers.end());
+    time_ = time;
+    std::vector<ClockWatcher *> watchers(watchers_.begin(), watchers_.end());
     for (auto watcher : watchers)
-      watcher->timeChanged(_time);
+      watcher->timeChanged(time_);
   }
 
   unsigned long get() const {
-    return _time;
+    return time_;
   }
 
   void addWatcher(ClockWatcher *watcher) {
-    _watchers.insert(watcher);
+    watchers_.insert(watcher);
   }
 
   void removeWatcher(ClockWatcher *watcher) {
-    _watchers.erase(watcher);
+    watchers_.erase(watcher);
   }
 
 private:
-  unsigned long _time = 0;
-  std::set<ClockWatcher *> _watchers;
+  unsigned long time_ = 0;
+  std::set<ClockWatcher *> watchers_;
 };
 
 extern Clock theClock;
diff --git a/extras/tests/TestFixtures/EventLog.cpp b/extras/tests/TestFixtures/EventLog.cpp
@@ -22,7 +22,7 @@ std::ostream &operator<<(std::ostream &os, const EventLog::event_t &value) {
 }
 
 std::string EventLog::diff(const EventLog &expected) const {
-  dtl::Diff<event_t> diff(expected._events, _events);
+  dtl::Diff<event_t> diff(expected.events_, events_);
   diff.compose();
   std::ostringstream message;
   diff.printSES(message);

diff --git a/extras/tests/TestFixtures/EventLog.hpp b/extras/tests/TestFixtures/EventLog.hpp
@@ -10,24 +10,24 @@ class EventLog {
   using event_t = std::pair<timestamp_t, std::string>;
 
   EventLog() {}
-  EventLog(std::initializer_list<event_t> events) : _events(events) {}
+  EventLog(std::initializer_list<event_t> events) : events_(events) {}
 
   void add(timestamp_t t, std::string event) {
-    _events.emplace_back(t, std::move(event));
+    events_.emplace_back(t, std::move(event));
   }
 
   void clear() {
-    _events.clear();
+    events_.clear();
   }
 
   std::string diff(const EventLog &) const;
 
   bool operator!=(const EventLog &other) const {
-    return _events != other._events;
+    return events_ != other.events_;
   }
 
 private:
-  std::vector<event_t> _events;
+  std::vector<event_t> events_;
 };
 
 extern EventLog theEventLog;

diff --git a/extras/tests/TestFixtures/TeensyTimerTool.h b/extras/tests/TestFixtures/TeensyTimerTool.h
@@ -13,20 +13,20 @@ class PeriodicTimer : ClockWatcher {
 
   void begin(callback_t callback, unsigned long period, bool start = true) {
     logEvent("PeriodicTimer::begin(%lu, %s)", period, start ? "true" : "false");
-    _callback = callback;
-    _period = period;
+    callback_ = callback;
+    period_ = period;
     if (start)
       theClock.addWatcher(this);
   }
 
   void attachInterrupt(callback_t cb) {
     logEvent("PeriodicTimer::attachInterrupt()");
-    _callback = cb;
+    callback_ = cb;
   }
 
   void setPeriod(unsigned long period) {
     logEvent("PeriodicTimer::setPeriod(%lu)", period);
-    _period = period;
+    period_ = period;
   }
 
   void start() {
@@ -41,16 +41,16 @@ class PeriodicTimer : ClockWatcher {
 
 private:
   void timeChanged(unsigned long time) override {
-    if (time - _lastTime >= _period) {
-      _lastTime = time;
-      if (_callback)
-        _callback();
+    if (time - lastTime_ >= period_) {
+      lastTime_ = time;
+      if (callback_)
+        callback_();
     }
   }
 
-  unsigned long _period = 0;
-  unsigned long _lastTime = 0;
-  callback_t _callback = nullptr;
+  unsigned long period_ = 0;
+  unsigned long lastTime_ = 0;
+  callback_t callback_ = nullptr;
 };
 
 } // namespace TeensyTimerTool
diff --git a/extras/tests/TestFixtures/TimerOne.h b/extras/tests/TestFixtures/TimerOne.h
@@ -13,12 +13,12 @@ class TimerOne : ClockWatcher {
 
   void attachInterrupt(callback_t cb) {
     logEvent("TimerOne::attachInterrupt()");
-    _callback = cb;
+    callback_ = cb;
   }
 
   void setPeriod(unsigned long period) {
     logEvent("TimerOne::setPeriod(%lu)", period);
-    _period = period;
+    period_ = period;
   }
 
   void start() {
@@ -33,14 +33,14 @@ class TimerOne : ClockWatcher {
 
 private:
   void timeChanged(unsigned long time) override {
-    if (time - _lastTime >= _period) {
-      _lastTime = time;
-      if (_callback)
-        _callback();
+    if (time - lastTime_ >= period_) {
+      lastTime_ = time;
+      if (callback_)
+        callback_();
     }
   }
 
-  unsigned long _period = 0;
-  unsigned long _lastTime = 0;
-  callback_t _callback = nullptr;
+  unsigned long period_ = 0;
+  unsigned long lastTime_ = 0;
+  callback_t callback_ = nullptr;
 };
diff --git a/extras/tests/TestFixtures/TimerThree.h b/extras/tests/TestFixtures/TimerThree.h
@@ -13,12 +13,12 @@ class TimerThree : ClockWatcher {
 
   void attachInterrupt(callback_t cb) {
     logEvent("TimerThree::attachInterrupt()");
-    _callback = cb;
+    callback_ = cb;
   }
 
   void setPeriod(unsigned long period) {
     logEvent("TimerThree::setPeriod(%lu)", period);
-    _period = period;
+    period_ = period;
   }
 
   void start() {
@@ -33,14 +33,14 @@ class TimerThree : ClockWatcher {
 
 private:
   void timeChanged(unsigned long time) override {
-    if (time - _lastTime >= _period) {
-      _lastTime = time;
-      if (_callback)
-        _callback();
+    if (time - lastTime_ >= period_) {
+      lastTime_ = time;
+      if (callback_)
+        callback_();
     }
   }
 
-  unsigned long _period = 0;
-  unsigned long _lastTime = 0;
-  callback_t _callback = nullptr;
+  unsigned long period_ = 0;
+  unsigned long lastTime_ = 0;
+  callback_t callback_ = nullptr;
 };
diff --git a/src/ContinuousStepper.hpp b/src/ContinuousStepper.hpp
@@ -7,28 +7,28 @@ namespace ArduinoContinuousStepper {
 
 class StepperTicker {
 protected:
-  StepperTicker(TickListener *listener) : _listener(listener) {}
+  StepperTicker(TickListener *listener) : listener_(listener) {}
 
   void tick() {
-    _listener->tick();
+    listener_->tick();
   }
 
 private:
-  TickListener *_listener;
+  TickListener *listener_;
 };
 
 class LoopTicker : StepperTicker {
 public:
   void loop() {
-    if (!_tickPeriod)
+    if (!tickPeriod_)
       return;
 
     time_t now = micros();
-    time_t elapsed = now - _lastTick;
+    time_t elapsed = now - lastTick_;
 
-    if (elapsed >= _tickPeriod) {
+    if (elapsed >= tickPeriod_) {
       tick();
-      _lastTick = now;
+      lastTick_ = now;
     }
   }
 
@@ -40,15 +40,15 @@ class LoopTicker : StepperTicker {
   void init() {}
 
   void setPeriod(unsigned long period) {
-    _tickPeriod = period;
+    tickPeriod_ = period;
   }
 
 private:
   static time_t now() {
     return micros();
   }
 
-  time_t _tickPeriod, _lastTick = 0;
+  time_t tickPeriod_, lastTick_ = 0;
 };
 
 template <class TStepper, class TTicker = LoopTicker>