Fixed some casting
This commit is contained in:
parent
66ea6cf782
commit
4787059491
1 changed files with 6 additions and 5 deletions
11
src/Keys.cc
11
src/Keys.cc
|
@ -19,7 +19,7 @@
|
||||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
// DEALINGS IN THE SOFTWARE.
|
// DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
//$Id: Keys.cc,v 1.4 2002/01/07 23:44:09 fluxgen Exp $
|
//$Id: Keys.cc,v 1.5 2002/01/08 12:13:25 fluxgen Exp $
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
# include "config.h"
|
# include "config.h"
|
||||||
|
@ -71,6 +71,7 @@
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
|
@ -266,7 +267,7 @@ bool Keys::load(char *filename) {
|
||||||
last_key->action = m_actionlist[i].action;
|
last_key->action = m_actionlist[i].action;
|
||||||
if (last_key->action == Keys::EXECUTE)
|
if (last_key->action == Keys::EXECUTE)
|
||||||
last_key->execcommand =
|
last_key->execcommand =
|
||||||
static_cast<char *>(strcasestr(linebuffer.get(), getActionStr(Keys::EXECUTE))+
|
const_cast<char *>(StringUtil::strcasestr(linebuffer.get(), getActionStr(Keys::EXECUTE))+
|
||||||
strlen(getActionStr(Keys::EXECUTE)));
|
strlen(getActionStr(Keys::EXECUTE)));
|
||||||
|
|
||||||
//add the keychain to list
|
//add the keychain to list
|
||||||
|
@ -277,8 +278,8 @@ bool Keys::load(char *filename) {
|
||||||
if (m_actionlist[i].action == Keys::EXECUTE) {
|
if (m_actionlist[i].action == Keys::EXECUTE) {
|
||||||
|
|
||||||
cerr<<"line:"<<line<<endl;
|
cerr<<"line:"<<line<<endl;
|
||||||
cerr<<"buffer:"<<static_cast<char *>(strcasestr(linebuffer.get(), getActionStr(Keys::EXECUTE))+
|
cerr<<"buffer:"<<const_cast<char *>(StringUtil::strcasestr(linebuffer.get(),
|
||||||
strlen(getActionStr(Keys::EXECUTE)))<<endl;
|
getActionStr(Keys::EXECUTE)) + strlen(getActionStr(Keys::EXECUTE)))<<endl;
|
||||||
cerr<<"command:"<<last_key->execcommand<<endl;
|
cerr<<"command:"<<last_key->execcommand<<endl;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -305,7 +306,7 @@ bool Keys::load(char *filename) {
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
showTree();
|
showTree(); //who keybinding tree
|
||||||
#endif
|
#endif
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue