diff options
author | fluxgen <fluxgen> | 2006-04-02 21:37:44 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2006-04-02 21:37:44 (GMT) |
commit | 894a7148be8ac88f7f1e98917f33088ab301bf60 (patch) | |
tree | b9c3bd9fa04a64babc749a319a5610caabea9479 /src/Keys.cc | |
parent | 0ca3754d683b862762695d1be891c98410f439ac (diff) | |
download | fluxbox-894a7148be8ac88f7f1e98917f33088ab301bf60.zip fluxbox-894a7148be8ac88f7f1e98917f33088ab301bf60.tar.bz2 |
size_t fixes, thanks Semushin Slava aka php-coder
Diffstat (limited to 'src/Keys.cc')
-rw-r--r-- | src/Keys.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Keys.cc b/src/Keys.cc index ed134e5..4ef08e9 100644 --- a/src/Keys.cc +++ b/src/Keys.cc | |||
@@ -189,7 +189,7 @@ bool Keys::addBinding(const std::string &linebuffer) { | |||
189 | 189 | ||
190 | _FB_USES_NLS; | 190 | _FB_USES_NLS; |
191 | // for each argument | 191 | // for each argument |
192 | for (unsigned int argc=0; argc<val.size(); argc++) { | 192 | for (size_t argc = 0; argc < val.size(); argc++) { |
193 | 193 | ||
194 | if (val[argc][0] != ':') { // parse key(s) | 194 | if (val[argc][0] != ':') { // parse key(s) |
195 | keyarg++; | 195 | keyarg++; |
@@ -289,7 +289,7 @@ void Keys::doAction(XKeyEvent &ke) { | |||
289 | 289 | ||
290 | if (!next_key) { | 290 | if (!next_key) { |
291 | 291 | ||
292 | for (unsigned int i=0; i<m_keylist.size(); i++) { | 292 | for (size_t i = 0; i < m_keylist.size(); i++) { |
293 | if (*m_keylist[i] == ke) { | 293 | if (*m_keylist[i] == ke) { |
294 | if (m_keylist[i]->keylist.size()) { | 294 | if (m_keylist[i]->keylist.size()) { |
295 | next_key = m_keylist[i]; | 295 | next_key = m_keylist[i]; |
@@ -335,8 +335,8 @@ bool Keys::reconfigure(const char *filename) { | |||
335 | @return true on success else false. | 335 | @return true on success else false. |
336 | */ | 336 | */ |
337 | bool Keys::mergeTree(t_key *newtree, t_key *basetree) { | 337 | bool Keys::mergeTree(t_key *newtree, t_key *basetree) { |
338 | size_t baselit_i = 0; | ||
338 | if (basetree==0) { | 339 | if (basetree==0) { |
339 | unsigned int baselist_i=0; | ||
340 | for (; baselist_i<m_keylist.size(); baselist_i++) { | 340 | for (; baselist_i<m_keylist.size(); baselist_i++) { |
341 | if (m_keylist[baselist_i]->mod == newtree->mod && | 341 | if (m_keylist[baselist_i]->mod == newtree->mod && |
342 | m_keylist[baselist_i]->key == newtree->key) { | 342 | m_keylist[baselist_i]->key == newtree->key) { |
@@ -357,7 +357,6 @@ bool Keys::mergeTree(t_key *newtree, t_key *basetree) { | |||
357 | } | 357 | } |
358 | 358 | ||
359 | } else { | 359 | } else { |
360 | unsigned int baselist_i = 0; | ||
361 | for (; baselist_i<basetree->keylist.size(); baselist_i++) { | 360 | for (; baselist_i<basetree->keylist.size(); baselist_i++) { |
362 | if (basetree->keylist[baselist_i]->mod == newtree->mod && | 361 | if (basetree->keylist[baselist_i]->mod == newtree->mod && |
363 | basetree->keylist[baselist_i]->key == newtree->key) { | 362 | basetree->keylist[baselist_i]->key == newtree->key) { |