diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2010-01-28 11:32:39 +0100 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-01-05 17:17:46 +0100 |
commit | 271c7cabf5e16a1afed560b9f707b3955b3ec725 (patch) | |
tree | 026b6678c6973205e32698af795830d58c5121d6 /src/base/songloading/songloading_strategy_txt.hpp | |
parent | 2adaea29500b412c342838e22df2f8b4ac2eb02d (diff) | |
download | usdx-271c7cabf5e16a1afed560b9f707b3955b3ec725.tar.gz usdx-271c7cabf5e16a1afed560b9f707b3955b3ec725.tar.xz usdx-271c7cabf5e16a1afed560b9f707b3955b3ec725.zip |
converted all strings and chars to wstrings and wchar_ts
all strings with displayable content are now the wide strings for
proper
unicode handling
added boost dependency for proper reading unicode from files
Diffstat (limited to '')
-rw-r--r-- | src/base/songloading/songloading_strategy_txt.hpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/base/songloading/songloading_strategy_txt.hpp b/src/base/songloading/songloading_strategy_txt.hpp index 0f9fd23d..097f35cf 100644 --- a/src/base/songloading/songloading_strategy_txt.hpp +++ b/src/base/songloading/songloading_strategy_txt.hpp @@ -42,37 +42,37 @@ namespace usdx /** * Split the header field in name and value. */ - std::pair<std::string, std::string> split_header_field(std::string &line); + std::pair<std::wstring, std::wstring> split_header_field(std::wstring &line); /** * Removes whitespaces in front of the string. */ - std::string& ltrim(std::string& line); + std::wstring& ltrim(std::wstring& line); /** * Removes whitespaces behind the string. */ - std::string& rtrim(std::string& line); + std::wstring& rtrim(std::wstring& line); /** * Removes ''\r'' and ''\n'' in front of the string. */ - std::string& ltrim_newlines(std::string& line); + std::wstring& ltrim_newlines(std::wstring& line); /** * Removes ''\r'' and ''\n'' behind the string. */ - std::string& rtrim_newlines(std::string& line); + std::wstring& rtrim_newlines(std::wstring& line); /** * Removes whitespaces in front of the string and behind it. */ - std::string& trim(std::string& line); + std::wstring& trim(std::wstring& line); bool parse_line(Song* song, File& file, const int line_number); - void parse_newline(Song* song, std::istringstream& linestream, const int line_number); - void parse_bpm(Song* song, std::istringstream& linestream, const int line_number); - void parse_note(Song* song, char type, std::istringstream& linestream, const int line_number); + void parse_newline(Song* song, std::wistringstream& linestream, const int line_number); + void parse_bpm(Song* song, std::wistringstream& linestream, const int line_number); + void parse_note(Song* song, wchar_t type, std::wistringstream& linestream, const int line_number); public: |