atria-soft/etk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV]correction of share position

Browse Source
This commit is contained in:
Edouard DUPIN 2013-11-14 07:48:23 +01:00
parent b946a5f7c6
commit d2a3fcaa63
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etk/UString.cpp
View File

@ -410,7 +410,7 @@ std::string extract_line(const std::string& _obj, int32_t _pos) {
} else if (stopPos >= _obj.size() ) {
stopPos = _obj.size();
}
return std::string(_obj, startPos, stopPos);
return std::string(_obj, startPos, stopPos - startPos);
}
std::u32string extract_line(const std::u32string& _obj, int32_t _pos) {
@ -439,7 +439,7 @@ std::u32string extract_line(const std::u32string& _obj, int32_t _pos) {
} else if (stopPos >= _obj.size() ) {
stopPos = _obj.size();
}
return std::u32string(_obj, startPos, stopPos);
return std::u32string(_obj, startPos, stopPos - startPos);
}
std::vector<std::string> string_split(const std::string& _input, char _val) {
@ -447,7 +447,7 @@ std::vector<std::string> string_split(const std::string& _input, char _val) {
size_t lastStartPos = 0;
for(size_t iii=0; iii<_input.size(); iii++) {
if (_input[iii]==_val) {
list.push_back(std::string(_input, lastStartPos, iii));
list.push_back(std::string(_input, lastStartPos, iii - lastStartPos));
lastStartPos = iii+1;
}
}

2
etk/os/FSNode.cpp
View File

@ -303,7 +303,7 @@ void etk::initDefaultFolder(const char* _applName) {
#ifdef __TARGET_OS__MacOs
baseFolderData += "/../../Resources/";
#else
baseFolderData += "/../../share";
baseFolderData += "/../share";
baseFolderData += binaryName;
baseFolderData += "/";
#endif