diff options
Diffstat (limited to 'src/Keys.hh')
-rw-r--r-- | src/Keys.hh | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/Keys.hh b/src/Keys.hh index 6b393e7..8e919b3 100644 --- a/src/Keys.hh +++ b/src/Keys.hh | |||
@@ -116,18 +116,13 @@ private: | |||
116 | keylist_t keylist; | 116 | keylist_t keylist; |
117 | }; | 117 | }; |
118 | 118 | ||
119 | /** | 119 | void setKeyMode(t_key *keyMode); |
120 | merge two linked list | ||
121 | @return true on success, else false | ||
122 | */ | ||
123 | bool mergeTree(t_key *newtree, t_key *basetree=0); | ||
124 | 120 | ||
125 | typedef std::map<std::string, keylist_t *> keyspace_t; | 121 | typedef std::map<std::string, t_key *> keyspace_t; |
126 | keylist_t *m_keylist; | 122 | t_key *m_keylist; |
127 | keyspace_t m_map; | 123 | keyspace_t m_map; |
128 | 124 | ||
129 | Display *m_display; ///< display connection | 125 | Display *m_display; ///< display connection |
130 | unsigned int m_current_line; | ||
131 | }; | 126 | }; |
132 | 127 | ||
133 | #endif // KEYS_HH | 128 | #endif // KEYS_HH |