adam/g13gui
1
0
Fork 0
mirror of https://github.com/jtgans/g13gui.git synced 2025-06-20 08:23:50 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

g13d: Clean up initialization order

Browse Source
This commit is contained in:
June Tate-Gans 2021-04-25 14:38:08 -05:00
parent f289bdf850
commit 8e14f1f853
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g13d/g13.h
View File

@ -150,7 +150,7 @@ typedef boost::shared_ptr<G13_Action> G13_ActionPtr;
template <class PARENT_T> class G13_Actionable { template <class PARENT_T> class G13_Actionable {
public: public:
G13_Actionable(PARENT_T &parent_arg, const std::string &name) 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; } virtual ~G13_Actionable() { _parent_ptr = 0; }
G13_ActionPtr action() const { return _action; } G13_ActionPtr action() const { return _action; }
@ -234,8 +234,8 @@ public:
protected: protected:
G13_Device &_keypad; G13_Device &_keypad;
std::vector<G13_Key> _keys;
std::string _name; std::string _name;
std::vector<G13_Key> _keys;
void _init_keys(); void _init_keys();
}; };
@ -335,7 +335,6 @@ public:
protected: protected:
bool _active; bool _active;
G13_ZoneBounds _bounds; G13_ZoneBounds _bounds;
}; };