diff options
| author | Ima Mechanique <ima.mechanique@secondlife.com> | 2013-12-17 18:23:09 +0000 |
|---|---|---|
| committer | Ima Mechanique <ima.mechanique@secondlife.com> | 2013-12-17 18:23:09 +0000 |
| commit | f6d86fcacf79c8147e2075db64caee7521f3b227 (patch) | |
| tree | 9ec21c2b92362a8cbb669f8909f5fe279c2daec1 /indra | |
| parent | 96e26e2ee4805ff56505f868b648203a642d8d06 (diff) | |
Fixing some BOOL to bool and changing one function to void
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llui/llkeywords.cpp | 15 | ||||
| -rwxr-xr-x | indra/llui/llkeywords.h | 8 |
2 files changed, 10 insertions, 13 deletions
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp index 5f5810812e..393681be27 100755 --- a/indra/llui/llkeywords.cpp +++ b/indra/llui/llkeywords.cpp @@ -34,10 +34,10 @@ #include "lltexteditor.h" #include "llstl.h" -inline BOOL LLKeywordToken::isHead(const llwchar* s) const +inline bool LLKeywordToken::isHead(const llwchar* s) const { // strncmp is much faster than string compare - BOOL res = TRUE; + bool res = TRUE; const llwchar* t = mToken.c_str(); S32 len = mToken.size(); for (S32 i=0; i<len; i++) @@ -51,9 +51,9 @@ inline BOOL LLKeywordToken::isHead(const llwchar* s) const return res; } -inline BOOL LLKeywordToken::isTail(const llwchar* s) const +inline bool LLKeywordToken::isTail(const llwchar* s) const { - BOOL res = TRUE; + bool res = TRUE; const llwchar* t = mDelimiter.c_str(); S32 len = mDelimiter.size(); for (S32 i=0; i<len; i++) @@ -67,7 +67,7 @@ inline BOOL LLKeywordToken::isTail(const llwchar* s) const return res; } -LLKeywords::LLKeywords() : mLoaded(FALSE) { } +LLKeywords::LLKeywords() { } LLKeywords::~LLKeywords() { @@ -195,11 +195,10 @@ LLColor4 LLKeywords::getColorGroup(const std::string key_in) return LLUIColorTable::instance().getColor(ColourGroup); } -bool LLKeywords::initialise(LLSD SyntaxXML) +void LLKeywords::initialise(LLSD SyntaxXML) { mSyntax = SyntaxXML; - mLoaded = true; - return mLoaded; + mLoaded = TRUE; } void LLKeywords::processTokens() diff --git a/indra/llui/llkeywords.h b/indra/llui/llkeywords.h index d0f1de8389..689fd75bcd 100755 --- a/indra/llui/llkeywords.h +++ b/indra/llui/llkeywords.h @@ -83,8 +83,8 @@ public: S32 getLengthHead() const { return mToken.size(); } S32 getLengthTail() const { return mDelimiter.size(); } - BOOL isHead(const llwchar* s) const; - BOOL isTail(const llwchar* s) const; + bool isHead(const llwchar* s) const; + bool isTail(const llwchar* s) const; const LLWString& getToken() const { return mToken; } const LLColor4& getColor() const { return mColor; } TOKEN_TYPE getType() const { return mType; } @@ -112,12 +112,10 @@ public: void addColorGroup(const std::string key_in, const LLColor4 color); void clearLoaded() { mLoaded = false; } LLColor4 getColorGroup(const std::string key_in); - BOOL loadFromFile(); - BOOL loadFromFile(const std::string& filename); bool isLoaded() const { return mLoaded; } void findSegments(std::vector<LLTextSegmentPtr> *seg_list, const LLWString& text, const LLColor4 &defaultColor, class LLTextEditor& editor ); - bool initialise(LLSD SyntaxXML); + void initialise(LLSD SyntaxXML); void processTokens(); // Add the token as described |