From b442284f092295f31f6016aa060643d3d42ceb61 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Fri, 18 Oct 2013 21:15:02 +0200 Subject: [PATCH] [DEV] UniChar ==> UChar & Hach ==> Hash --- ejson/Object.h | 2 +- ejson/Value.cpp | 6 +++--- ejson/Value.h | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ejson/Object.h b/ejson/Object.h index 6bc39cc..a84d5d7 100644 --- a/ejson/Object.h +++ b/ejson/Object.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include diff --git a/ejson/Value.cpp b/ejson/Value.cpp index 2618df4..a9ad695 100644 --- a/ejson/Value.cpp +++ b/ejson/Value.cpp @@ -34,7 +34,7 @@ void ejson::Value::addIndent(etk::UString& _data, int32_t _indent) const { } } -void ejson::Value::drawElementParsed(const etk::UniChar& _val, const ejson::filePos& _filePos) const { +void ejson::Value::drawElementParsed(const etk::UChar& _val, const ejson::filePos& _filePos) const { if (_val == '\n') { JSON_DEBUG(_filePos << " parse '\\n'"); } else if (_val == '\t') { @@ -60,7 +60,7 @@ int32_t ejson::Value::countWhiteChar(const etk::UString& _data, int32_t _pos, ej } -bool ejson::Value::checkString(const etk::UniChar& _val) const { +bool ejson::Value::checkString(const etk::UChar& _val) const { if( _val == '!' || _val == '"' || _val == '#' @@ -99,7 +99,7 @@ bool ejson::Value::checkString(const etk::UniChar& _val) const { return true; } -bool ejson::Value::checkNumber(const etk::UniChar& _val) const { +bool ejson::Value::checkNumber(const etk::UChar& _val) const { if( _val == '-' || _val == '+' || _val == 'e' diff --git a/ejson/Value.h b/ejson/Value.h index 193d735..fa93831 100644 --- a/ejson/Value.h +++ b/ejson/Value.h @@ -76,7 +76,7 @@ namespace ejson return *this; } void newLine(void) { m_col=0; m_line++; }; - bool check(const etk::UniChar& _val) { + bool check(const etk::UChar& _val) { m_col++; if (_val == '\n') { newLine(); @@ -143,17 +143,17 @@ namespace ejson * @param[in] _val Char that is parsed. * @param[in] _filePos Position of the char in the file. */ - void drawElementParsed(const etk::UniChar& _val, const ejson::filePos& _filePos) const; + void drawElementParsed(const etk::UChar& _val, const ejson::filePos& _filePos) const; /** * @brief check if an name (for object named) (not : !"#$%&'()*+,/;<=>?@[\]^`{|}~ \n\t\r). * @param[in] _val Value to check the conformity. */ - bool checkString(const etk::UniChar& _val) const; + bool checkString(const etk::UChar& _val) const; /** * @brief check if an number -+.0123456789e). * @param[in] _val Value to check the conformity. */ - bool checkNumber(const etk::UniChar& _val) const; + bool checkNumber(const etk::UChar& _val) const; /** * @brief count the number of white char in the string from the specify position (stop at the first element that is not a white char) * @param[in] _data Data to parse.