HeeroYui/edn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] UniChar ==> UChar & Hach ==> Hash

Browse Source
This commit is contained in:
Edouard DUPIN
2013-10-18 21:15:02 +02:00
parent 16f78eaef2
commit cf8a720924
10 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sources/appl/Buffer/EdnBuf/EdnBuf.cpp
View File

@@ -151,7 +151,7 @@ void EdnBuf::getRange(int32_t start, int32_t end, etk::UString &output)
localOutput.pushBack('\0');
output = (char*)&localOutput[0];
} else {
etk::Vector<uniChar_t> tmpUnicodeData;
etk::Vector<etk::UChar> tmpUnicodeData;
// transform in unicode :
convertIsoToUnicode(m_charsetType, localOutput, tmpUnicodeData);
output = tmpUnicodeData;
@@ -247,7 +247,7 @@ int32_t EdnBuf::Replace(int32_t start, int32_t end, etk::UString &insertText)
tmpInsertText.pushBack(*tmpPointer++);
}
} else {
etk::Vector<uniChar_t> tmppp = insertText.getVector();
etk::Vector<etk::UChar> tmppp = insertText.getVector();
convertUnicodeToIso(m_charsetType, tmppp, tmpInsertText);
}
if (tmpInsertText.size()>0) {
@@ -544,7 +544,7 @@ int32_t EdnBuf::getExpandedChar(int32_t &pos, int32_t indent, char outUTF8[MAX_E
* @return number of displayable char (display char width)
*
*/
int32_t EdnBuf::getExpandedChar(int32_t &pos, int32_t indent, uniChar_t outUnicode[MAX_EXP_CHAR_LEN], uint32_t &currentChar)
int32_t EdnBuf::getExpandedChar(int32_t &pos, int32_t indent, etk::UChar outUnicode[MAX_EXP_CHAR_LEN], uint32_t &currentChar)
{
int32_t i, nSpaces;
char c = m_data.get(pos);
@@ -601,7 +601,7 @@ int32_t EdnBuf::getExpandedChar(int32_t &pos, int32_t indent, uniChar_t outUnico
return 5;
}
// clear all the data ...
memset(outUnicode, 0, sizeof(uniChar_t)*MAX_EXP_CHAR_LEN);
memset(outUnicode, 0, sizeof(etk::UChar)*MAX_EXP_CHAR_LEN);
// Otherwise, just return the character
if (false == m_isUtf8) {
@@ -940,7 +940,7 @@ bool EdnBuf::SearchForward(int32_t startPos, etk::UString &search, int32_t *foun
searchVect.pushBack(*tmpPointer++);
}
} else {
etk::Vector<etk::UniChar> tmppp = search.getVector();
etk::Vector<etk::UChar> tmppp = search.getVector();
convertUnicodeToIso(m_charsetType, tmppp, searchVect);
}
// remove the '\0' at the end of the string ...
@@ -996,7 +996,7 @@ bool EdnBuf::SearchBackward(int32_t startPos, etk::UString &search, int32_t *fou
searchVect.pushBack(*tmpPointer++);
}
} else {
etk::Vector<etk::UniChar> tmppp = search.getVector();
etk::Vector<etk::UChar> tmppp = search.getVector();
convertUnicodeToIso(m_charsetType, tmppp, searchVect);
}
// remove the '\0' at the end of the string ...
@@ -1147,7 +1147,7 @@ int32_t EdnBuf::LocalInsert(int32_t pos, etk::UString &insertText)
tmpInsertText.pushBack(*tmpPointer++);
}
} else {
etk::Vector<etk::UniChar> tmppp = insertText.getVector();
etk::Vector<etk::UChar> tmppp = insertText.getVector();
convertUnicodeToIso(m_charsetType, tmppp, tmpInsertText);
}
if (tmpInsertText.size()>0) {

2
sources/appl/Buffer/EdnBuf/EdnBuf.h
View File

@@ -77,7 +77,7 @@ class EdnBuf {
int32_t StartOfLine(int32_t _pos);
int32_t EndOfLine(int32_t _pos);
int32_t getExpandedChar(int32_t& _pos, int32_t _indent, uniChar_t _outUnicode[MAX_EXP_CHAR_LEN], uint32_t& _currentChar);
int32_t getExpandedChar(int32_t& _pos, int32_t _indent, etk::UChar _outUnicode[MAX_EXP_CHAR_LEN], uint32_t& _currentChar);
int32_t getExpandedChar(int32_t& _pos, int32_t _indent, char _outUTF8[MAX_EXP_CHAR_LEN], uint32_t& _currentChar);
int32_t ExpandCharacter(char _c, int32_t _indent, char _outUTF8[MAX_EXP_CHAR_LEN]); // TODO : remove
int32_t CharWidth(char _c, int32_t _indent); // TODO : rework this