From 8e14f1f85397de0b58e94996d067df2f9ba3af66 Mon Sep 17 00:00:00 2001 From: June Tate-Gans Date: Sun, 25 Apr 2021 14:38:08 -0500 Subject: [PATCH] g13d: Clean up initialization order --- g13d/g13.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/g13d/g13.h b/g13d/g13.h index ba7a741..7e3bfa7 100644 --- a/g13d/g13.h +++ b/g13d/g13.h @@ -150,7 +150,7 @@ typedef boost::shared_ptr G13_ActionPtr; template class G13_Actionable { public: G13_Actionable(PARENT_T &parent_arg, const std::string &name) - : _parent_ptr(&parent_arg), _name(name) {} + : _name(name), _parent_ptr(&parent_arg) {} virtual ~G13_Actionable() { _parent_ptr = 0; } G13_ActionPtr action() const { return _action; } @@ -234,8 +234,8 @@ public: protected: G13_Device &_keypad; - std::vector _keys; std::string _name; + std::vector _keys; void _init_keys(); }; @@ -335,7 +335,6 @@ public: protected: bool _active; - G13_ZoneBounds _bounds; };