diff options
author | fluxgen <fluxgen> | 2002-01-08 12:13:25 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-01-08 12:13:25 (GMT) |
commit | 4787059491bc2f1c6eb58149a8a5809aa3a201d1 (patch) | |
tree | 39a452ab90a8734b03855580aac836bfb292730a /src | |
parent | 66ea6cf7828d437a66e9795c6b02fb238ad467dd (diff) | |
download | fluxbox-4787059491bc2f1c6eb58149a8a5809aa3a201d1.zip fluxbox-4787059491bc2f1c6eb58149a8a5809aa3a201d1.tar.bz2 |
Fixed some casting
Diffstat (limited to 'src')
-rw-r--r-- | src/Keys.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Keys.cc b/src/Keys.cc index 8b15f69..fd39ecd 100644 --- a/src/Keys.cc +++ b/src/Keys.cc | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | //$Id: Keys.cc,v 1.4 2002/01/07 23:44:09 fluxgen Exp $ | 22 | //$Id: Keys.cc,v 1.5 2002/01/08 12:13:25 fluxgen Exp $ |
23 | 23 | ||
24 | #ifdef HAVE_CONFIG_H | 24 | #ifdef HAVE_CONFIG_H |
25 | # include "config.h" | 25 | # include "config.h" |
@@ -71,6 +71,7 @@ | |||
71 | #include <fstream> | 71 | #include <fstream> |
72 | #include <vector> | 72 | #include <vector> |
73 | #include <cassert> | 73 | #include <cassert> |
74 | #include <memory> | ||
74 | 75 | ||
75 | using namespace std; | 76 | using namespace std; |
76 | 77 | ||
@@ -266,7 +267,7 @@ bool Keys::load(char *filename) { | |||
266 | last_key->action = m_actionlist[i].action; | 267 | last_key->action = m_actionlist[i].action; |
267 | if (last_key->action == Keys::EXECUTE) | 268 | if (last_key->action == Keys::EXECUTE) |
268 | last_key->execcommand = | 269 | last_key->execcommand = |
269 | static_cast<char *>(strcasestr(linebuffer.get(), getActionStr(Keys::EXECUTE))+ | 270 | const_cast<char *>(StringUtil::strcasestr(linebuffer.get(), getActionStr(Keys::EXECUTE))+ |
270 | strlen(getActionStr(Keys::EXECUTE))); | 271 | strlen(getActionStr(Keys::EXECUTE))); |
271 | 272 | ||
272 | //add the keychain to list | 273 | //add the keychain to list |
@@ -277,8 +278,8 @@ bool Keys::load(char *filename) { | |||
277 | if (m_actionlist[i].action == Keys::EXECUTE) { | 278 | if (m_actionlist[i].action == Keys::EXECUTE) { |
278 | 279 | ||
279 | cerr<<"line:"<<line<<endl; | 280 | cerr<<"line:"<<line<<endl; |
280 | cerr<<"buffer:"<<static_cast<char *>(strcasestr(linebuffer.get(), getActionStr(Keys::EXECUTE))+ | 281 | cerr<<"buffer:"<<const_cast<char *>(StringUtil::strcasestr(linebuffer.get(), |
281 | strlen(getActionStr(Keys::EXECUTE)))<<endl; | 282 | getActionStr(Keys::EXECUTE)) + strlen(getActionStr(Keys::EXECUTE)))<<endl; |
282 | cerr<<"command:"<<last_key->execcommand<<endl; | 283 | cerr<<"command:"<<last_key->execcommand<<endl; |
283 | 284 | ||
284 | } | 285 | } |
@@ -305,7 +306,7 @@ bool Keys::load(char *filename) { | |||
305 | } | 306 | } |
306 | 307 | ||
307 | #ifdef DEBUG | 308 | #ifdef DEBUG |
308 | showTree(); | 309 | showTree(); //who keybinding tree |
309 | #endif | 310 | #endif |
310 | return true; | 311 | return true; |
311 | } | 312 | } |