///////////////////////////////////////////////////////////////////////////////
-// Name: common/sstream.cpp
+// Name: src/common/sstream.cpp
// Purpose: string-based streams implementation
// Author: Vadim Zeitlin
// Modified by: Ryan Norton (UTF8 UNICODE)
// Created: 2004-09-19
-// RCS-ID: $Id$
// Copyright: (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ----------------------------------------------------------------------------
// TODO: Do we want to include the null char in the stream? If so then
-// just add +1 to m_len in the ctor
+// just add +1 to m_len in the ctor
wxStringInputStream::wxStringInputStream(const wxString& s)
#if wxUSE_UNICODE
// FIXME-UTF8: use wxCharBufferWithLength if we have it
#endif
{
#if wxUSE_UNICODE
- wxASSERT_MSG(m_buf.data() != NULL, _T("Could not convert string to UTF8!"));
+ wxASSERT_MSG(m_buf.data() != NULL, wxT("Could not convert string to UTF8!"));
#endif
m_pos = 0;
}
// getlength
// ----------------------------------------------------------------------------
-wxFileOffset wxStringInputStream::GetLength() const
-{
- return m_len;
+wxFileOffset wxStringInputStream::GetLength() const
+{
+ return m_len;
}
// ----------------------------------------------------------------------------
break;
default:
- wxFAIL_MSG( _T("invalid seek mode") );
+ wxFAIL_MSG( wxT("invalid seek mode") );
return wxInvalidOffset;
}
- if ( ofs < 0 || ofs > wx_static_cast(wxFileOffset, m_len) )
+ if ( ofs < 0 || ofs > static_cast<wxFileOffset>(m_len) )
return wxInvalidOffset;
// FIXME: this can't be right
wxFileOffset wxStringInputStream::OnSysTell() const
{
- return wx_static_cast(wxFileOffset, m_pos);
+ return static_cast<wxFileOffset>(m_pos);
}
// ----------------------------------------------------------------------------
wxFileOffset wxStringOutputStream::OnSysTell() const
{
- return wx_static_cast(wxFileOffset, m_pos);
+ return static_cast<wxFileOffset>(m_pos);
}
// ----------------------------------------------------------------------------
size_t wxStringOutputStream::OnSysWrite(const void *buffer, size_t size)
{
- const char *p = wx_static_cast(const char *, buffer);
+ const char *p = static_cast<const char *>(buffer);
-#if wxUSE_UNICODE_WCHAR
+#if wxUSE_UNICODE
// the part of the string we have here may be incomplete, i.e. it can stop
// in the middle of an UTF-8 character and so converting it would fail; if
// this is the case, accumulate the part which we failed to convert until
// not update m_pos as m_str hasn't changed
return size;
}
-#else // !wxUSE_UNICODE_WCHAR
- // no recoding necessary, the data is supposed to already be in UTF-8 (if
- // supported) or ASCII otherwise
+#else // !wxUSE_UNICODE
+ // no recoding necessary
m_str->append(p, size);
-#endif // wxUSE_UNICODE_WCHAR/!wxUSE_UNICODE_WCHAR
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
// update position
m_pos += size;