xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Client: never call substr(CharCount, String::npos);

Browse Source
This commit is contained in:
Maxime Coste 2012-10-11 14:22:08 +02:00
parent c92077762c
commit 4210a17753
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client.cc
View File

@ -224,7 +224,7 @@ public:
if (m_cursor_pos != 0) if (m_cursor_pos != 0)
{ {
m_result = m_result.substr(0, m_cursor_pos - 1) m_result = m_result.substr(0, m_cursor_pos - 1)
+ m_result.substr(m_cursor_pos, String::npos); + m_result.substr(m_cursor_pos);
--m_cursor_pos; --m_cursor_pos;
} }
@ -239,7 +239,7 @@ public:
context.ui().menu_hide(); context.ui().menu_hide();
m_current_completion = -1; m_current_completion = -1;
m_result = m_result.substr(0, m_cursor_pos) + reg m_result = m_result.substr(0, m_cursor_pos) + reg
+ m_result.substr(m_cursor_pos, String::npos); + m_result.substr(m_cursor_pos);
m_cursor_pos += reg.char_length(); m_cursor_pos += reg.char_length();
} }
else if (key == Key(Key::Modifiers::Control, 'i') or // tab completion else if (key == Key(Key::Modifiers::Control, 'i') or // tab completion
@ -283,7 +283,7 @@ public:
std::string keystr; std::string keystr;
auto inserter = back_inserter(keystr); auto inserter = back_inserter(keystr);
utf8::dump(inserter, key.key); utf8::dump(inserter, key.key);
m_result = m_result.substr(0, m_cursor_pos) + keystr + m_result.substr(m_cursor_pos, String::npos); m_result = m_result.substr(0, m_cursor_pos) + keystr + m_result.substr(m_cursor_pos);
++m_cursor_pos; ++m_cursor_pos;
} }
context.ui().print_status(m_prompt + m_result, m_prompt.char_length() + m_cursor_pos); context.ui().print_status(m_prompt + m_result, m_prompt.char_length() + m_cursor_pos);