diff options
| -rw-r--r-- | src/AutoComplete.cxx | 14 | ||||
| -rw-r--r-- | src/AutoComplete.h | 4 |
2 files changed, 7 insertions, 11 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_) { diff --git a/src/AutoComplete.h b/src/AutoComplete.h index f7a0c3f1e..6838e4306 100644 --- a/src/AutoComplete.h +++ b/src/AutoComplete.h @@ -16,8 +16,8 @@ namespace Scintilla { */ class AutoComplete { bool active; - char stopChars[256]; - char fillUpChars[256]; + std::string stopChars; + std::string fillUpChars; char separator; char typesep; // Type seperator enum { maxItemLen=1000 }; |