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

[DEV] editork work again like as previous

Browse Source
This commit is contained in:
Edouard DUPIN
2013-05-21 09:50:19 +02:00
parent 7b456f1cdb
commit 543cd8ddf1
7 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/appl/Buffer/BufferText.cpp
View File

@@ -1001,7 +1001,7 @@ void BufferText::AddChar(uniChar_t unicodeData)
// normal adding char ...
if (true == m_EdnBuf.GetUTF8Mode()) {
char tmpUTF8[16];
unicode::convertUnicodeToUtf8(unicodeData, tmpUTF8);
unicodeData.GetUtf8(tmpUTF8);
etk::Vector<int8_t> tmpVect;
int32_t localOfset = strlen(tmpUTF8);
tmpVect.PushBack((int8_t*)tmpUTF8, localOfset);

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

@@ -246,7 +246,7 @@ int32_t EdnBuf::Replace(int32_t start, int32_t end, etk::UString &insertText)
tmpInsertText.PushBack(*tmpPointer++);
}
} else {
etk::Vector<unsigned int> tmppp = insertText.GetVector();
etk::Vector<uniChar_t> tmppp = insertText.GetVector();
convertUnicodeToIso(m_charsetType, tmppp, tmpInsertText);
}
if (tmpInsertText.Size()>0) {
@@ -622,7 +622,7 @@ int32_t EdnBuf::GetExpandedChar(int32_t &pos, int32_t indent, uniChar_t outUnico
tmp[kkk] = tmpString[kkk];
tmp[kkk+1] = '\0';
}
unicode::convertUtf8ToUnicode(tmp, outUnicode[0]);
outUnicode[0].SetUtf8(tmp);
outUnicode[1] = 0;
} else {
outUnicode[0] = '<';
@@ -939,7 +939,7 @@ bool EdnBuf::SearchForward(int32_t startPos, etk::UString &search, int32_t *foun
searchVect.PushBack(*tmpPointer++);
}
} else {
etk::Vector<unsigned int> tmppp = search.GetVector();
etk::Vector<etk::UniChar> tmppp = search.GetVector();
convertUnicodeToIso(m_charsetType, tmppp, searchVect);
}
// remove the '\0' at the end of the string ...
@@ -995,7 +995,7 @@ bool EdnBuf::SearchBackward(int32_t startPos, etk::UString &search, int32_t *fou
searchVect.PushBack(*tmpPointer++);
}
} else {
etk::Vector<unsigned int> tmppp = search.GetVector();
etk::Vector<etk::UniChar> tmppp = search.GetVector();
convertUnicodeToIso(m_charsetType, tmppp, searchVect);
}
// remove the '\0' at the end of the string ...
@@ -1146,7 +1146,7 @@ int32_t EdnBuf::LocalInsert(int32_t pos, etk::UString &insertText)
tmpInsertText.PushBack(*tmpPointer++);
}
} else {
etk::Vector<unsigned int> tmppp = insertText.GetVector();
etk::Vector<etk::UniChar> tmppp = insertText.GetVector();
convertUnicodeToIso(m_charsetType, tmppp, tmpInsertText);
}
if (tmpInsertText.Size()>0) {