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

move FormatPos struct to basic_buffer class, it should be private

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-02-19 23:51:27 +01:00
parent 1d55d4c4a1
commit 51d4f34cf3
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/strbuffer.h
View File

@@ -26,8 +26,10 @@
#include <sstream> #include <sstream>
#include <list> #include <list>
struct FormatPos template <class C> class basic_buffer
{ {
struct FormatPos
{
size_t Position; size_t Position;
short Value; short Value;
@@ -35,10 +37,8 @@ struct FormatPos
{ {
return Position < f.Position; return Position < f.Position;
} }
}; };
template <class C> class basic_buffer
{
std::basic_ostringstream<C> itsString; std::basic_ostringstream<C> itsString;
std::list<FormatPos> itsFormat; std::list<FormatPos> itsFormat;
std::basic_string<C> *itsTempString; std::basic_string<C> *itsTempString;
@@ -129,7 +129,7 @@ template <class C> basic_buffer<C> &basic_buffer<C>::operator<<(const basic_buff
itsString << buf.itsString.str(); itsString << buf.itsString.str();
std::list<FormatPos> tmp = buf.itsFormat; std::list<FormatPos> tmp = buf.itsFormat;
if (len) if (len)
for (std::list<FormatPos>::iterator it = tmp.begin(); it != tmp.end(); it++) for (typename std::list<typename basic_buffer<C>::FormatPos>::iterator it = tmp.begin(); it != tmp.end(); it++)
it->Position += len; it->Position += len;
itsFormat.merge(tmp); itsFormat.merge(tmp);
return *this; return *this;
@@ -145,7 +145,8 @@ template <class C> Window &operator<<(Window &w, const basic_buffer<C> &buf)
else else
{ {
std::basic_string<C> tmp; std::basic_string<C> tmp;
std::list<FormatPos>::const_iterator b = buf.itsFormat.begin(), e = buf.itsFormat.end(); typename std::list<typename basic_buffer<C>::FormatPos>::const_iterator b = buf.itsFormat.begin();
typename std::list<typename basic_buffer<C>::FormatPos>::const_iterator e = buf.itsFormat.end();
for (size_t i = 0; i < s.length() || b != e; i++) for (size_t i = 0; i < s.length() || b != e; i++)
{ {
while (b != e && i == b->Position) while (b != e && i == b->Position)