From 15c0132fd080003f2bf47749e30e1f724b249341 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Mon, 29 Mar 2010 07:30:52 +0200 Subject: dynamic registration of songloading_strategies with static template --- src/base/songloading/songloading_strategy_txt.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/base/songloading/songloading_strategy_txt.cpp') diff --git a/src/base/songloading/songloading_strategy_txt.cpp b/src/base/songloading/songloading_strategy_txt.cpp index 7560a9c2..b80289ee 100644 --- a/src/base/songloading/songloading_strategy_txt.cpp +++ b/src/base/songloading/songloading_strategy_txt.cpp @@ -32,7 +32,7 @@ #include #include "songloading_strategy_txt.hpp" -#include "utils/file.hpp" +#include "utils/unicode_file.hpp" #include "utils/locale_independent_float.hpp" namespace usdx @@ -83,7 +83,7 @@ namespace usdx { LOG4CXX_DEBUG(log, L"Starting loading song from file: " << song->get_filename()); - File file(song->get_filename()); + UnicodeFile file(song->get_filename()); int line_number = 0; while (file.stream().good() && parse_line(song, file, ++line_number)); @@ -93,7 +93,7 @@ namespace usdx return song; } - bool SongloadingStrategyTxt::parse_line(Song* song, File& file, const int line_number) + bool SongloadingStrategyTxt::parse_line(Song* song, UnicodeFile& file, const int line_number) { try { std::wstring line; @@ -191,7 +191,7 @@ namespace usdx Song* SongloadingStrategyTxt::load_header(const boost::filesystem::wpath& filename) { - File file(filename); + UnicodeFile file(filename); std::wstring line; std::map header_fields; -- cgit v1.2.3