diff options
| author | Andrzej Rybczak <electricityispower@gmail.com> | 2012-09-08 17:50:01 +0200 |
|---|---|---|
| committer | Andrzej Rybczak <electricityispower@gmail.com> | 2012-09-08 17:50:01 +0200 |
| commit | d5e2d315fd138327e98c579fba2021f5edf1eec2 (patch) | |
| tree | ad050a6c3c8b967e7fb5094c1226b3e3b148cbfb /src/browser.cpp | |
| parent | cf06d9fa8db1adf903ad8b26c1127bb476b1e379 (diff) | |
use wstrings uncoditionally where needed
Diffstat (limited to 'src/browser.cpp')
| -rw-r--r-- | src/browser.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/browser.cpp b/src/browser.cpp index c8030547..4bd72b90 100644 --- a/src/browser.cpp +++ b/src/browser.cpp @@ -119,10 +119,10 @@ void Browser::SwitchTo() DrawHeader(); } -std::basic_string<my_char_t> Browser::Title() +std::wstring Browser::Title() { - std::basic_string<my_char_t> result = U("Browse: "); - result += Scroller(TO_WSTRING(itsBrowsedDir), itsScrollBeginning, COLS-result.length()-(Config.new_design ? 2 : Global::VolumeState.length())); + std::wstring result = L"Browse: "; + result += Scroller(ToWString(itsBrowsedDir), itsScrollBeginning, COLS-result.length()-(Config.new_design ? 2 : Global::VolumeState.length())); return result; } @@ -550,12 +550,12 @@ void Browser::ClearDirectory(const std::string &path) const if (remove(full_path.c_str()) == 0) { const char msg[] = "Deleting \"%s\"..."; - ShowMessage(msg, Shorten(TO_WSTRING(full_path), COLS-const_strlen(msg)).c_str()); + ShowMessage(msg, Shorten(ToWString(full_path), COLS-const_strlen(msg)).c_str()); } else { const char msg[] = "Couldn't remove \"%s\": %s"; - ShowMessage(msg, Shorten(TO_WSTRING(full_path), COLS-const_strlen(msg)-25).c_str(), strerror(errno)); + ShowMessage(msg, Shorten(ToWString(full_path), COLS-const_strlen(msg)-25).c_str(), strerror(errno)); } } closedir(dir); |