diff options
Diffstat (limited to 'src/AutoComplete.cxx')
| -rw-r--r-- | src/AutoComplete.cxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/AutoComplete.cxx b/src/AutoComplete.cxx index c33d0c3a8..d154a913a 100644 --- a/src/AutoComplete.cxx +++ b/src/AutoComplete.cxx @@ -16,9 +16,9 @@ #include "Platform.h" +#include "Scintilla.h" #include "CharacterSet.h" #include "AutoComplete.h" -#include "Scintilla.h" #ifdef SCI_NAMESPACE using namespace Scintilla; @@ -41,8 +41,6 @@ AutoComplete::AutoComplete() : heightLBDefault(100), autoSort(SC_ORDER_PRESORTED) { lb = ListBox::Allocate(); - stopChars[0] = '\0'; - fillUpChars[0] = '\0'; } AutoComplete::~AutoComplete() { @@ -71,21 +69,19 @@ void AutoComplete::Start(Window &parent, int ctrlID, } void AutoComplete::SetStopChars(const char *stopChars_) { - strncpy(stopChars, stopChars_, sizeof(stopChars)); - stopChars[sizeof(stopChars) - 1] = '\0'; + stopChars = stopChars_; } bool AutoComplete::IsStopChar(char ch) { - return ch && strchr(stopChars, ch); + return ch && (stopChars.find(ch) != std::string::npos); } void AutoComplete::SetFillUpChars(const char *fillUpChars_) { - strncpy(fillUpChars, fillUpChars_, sizeof(fillUpChars)); - fillUpChars[sizeof(fillUpChars) - 1] = '\0'; + fillUpChars = fillUpChars_; } bool AutoComplete::IsFillUpChar(char ch) { - return ch && strchr(fillUpChars, ch); + return ch && (fillUpChars.find(ch) != std::string::npos); } void AutoComplete::SetSeparator(char separator_) { |