aboutsummaryrefslogtreecommitdiffstats
path: root/src/base/songloading/songloading_strategy_txt.hpp
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2011-11-08 10:26:04 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2013-01-05 17:17:49 +0100
commitc1c799117e7076046182e12d71d06e2c9444e9be (patch)
tree7940de26d0c786134fa103703320bd3efcbba00c /src/base/songloading/songloading_strategy_txt.hpp
parent31ba94d4efa6e3f64ffacf1711438e88d8b3035d (diff)
downloadusdx-c1c799117e7076046182e12d71d06e2c9444e9be.tar.gz
usdx-c1c799117e7076046182e12d71d06e2c9444e9be.tar.xz
usdx-c1c799117e7076046182e12d71d06e2c9444e9be.zip
changed all wstring/wchar_t to string/char
Diffstat (limited to 'src/base/songloading/songloading_strategy_txt.hpp')
-rw-r--r--src/base/songloading/songloading_strategy_txt.hpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/base/songloading/songloading_strategy_txt.hpp b/src/base/songloading/songloading_strategy_txt.hpp
index 6177a5d3..293c65e6 100644
--- a/src/base/songloading/songloading_strategy_txt.hpp
+++ b/src/base/songloading/songloading_strategy_txt.hpp
@@ -32,7 +32,7 @@
#include <log4cxx/logger.h>
#include "songloading_strategy.hpp"
#include "songloading_strategy_factory.hpp"
-#include "utils/unicode_file.hpp"
+#include "utils/text_file.hpp"
namespace usdx
{
@@ -44,21 +44,21 @@ namespace usdx
/**
* Split the header field in name and value.
*/
- std::pair<std::wstring, std::wstring> split_header_field(std::wstring &line);
+ std::pair<std::string, std::string> split_header_field(std::string &line);
- bool parse_line(Song* song, UnicodeFile& file, 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);
+ bool parse_line(Song* song, TextFile& 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);
public:
SongloadingStrategyTxt();
virtual ~SongloadingStrategyTxt();
virtual Song* load_song(Song* song);
- virtual Song* load_header(const boost::filesystem::wpath& filename);
+ virtual Song* load_header(const boost::filesystem::path& filename);
- static std::wstring get_fileextension(void) { return L".txt"; };
+ static std::string get_fileextension(void) { return ".txt"; };
};
REGISTER_SONGLOADING_STRATEGY(SongloadingStrategyTxt);