Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use wstrings uncoditionally where needed

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-09-08 17:50:01 +02:00
parent cf06d9fa8d
commit d5e2d315fd
46 changed files with 196 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/scrollpad.h
View File

@@ -56,7 +56,7 @@ struct Scrollpad: public Window
/// given format for all occurences of given string or stops after first occurence
/// @return true if at least one occurence of the string was found, false otherwise
/// @see basic_buffer::setFormatting()
bool setFormatting(short val_b, const std::basic_string<my_char_t> &s,
bool setFormatting(short val_b, const std::wstring &s,
short val_e, bool case_sensitive, bool for_each = 1);
/// Removes all format flags and colors from stored text
@@ -70,7 +70,7 @@ struct Scrollpad: public Window
/// @return text stored in internal buffer
///
const std::basic_string<my_char_t> &content() { return m_buffer.str(); }
const std::wstring &content() { return m_buffer.str(); }
/// Refreshes the window
/// @see Window::Refresh()
@@ -109,12 +109,10 @@ struct Scrollpad: public Window
m_buffer << obj;
return *this;
}
# ifdef _UTF8
Scrollpad &operator<<(const std::string &s);
# endif // _UTF8
private:
basic_buffer<my_char_t> m_buffer;
WBuffer m_buffer;
size_t m_beginning;
@@ -122,7 +120,7 @@ private:
bool m_found_case_sensitive;
short m_found_value_begin;
short m_found_value_end;
std::basic_string<my_char_t> m_found_pattern;
std::wstring m_found_pattern;
size_t m_real_height;
};