Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made Convert() methods const

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-09-22 20:15:00 +00:00
parent 9769627970
commit 57c5293e49
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docs/latex/wx/encconv.tex
View File

@@ -79,26 +79,26 @@ or output encoding is not supported.)
\membersection{wxEncodingConverter::Convert}\label{wxencodingconverterconvert} \membersection{wxEncodingConverter::Convert}\label{wxencodingconverterconvert}
\func{void}{Convert}{\param{const char* }{input}, \param{char* }{output}} \constfunc{void}{Convert}{\param{const char* }{input}, \param{char* }{output}}
\func{void}{Convert}{\param{const wchar\_t* }{input}, \param{wchar\_t* }{output}} \constfunc{void}{Convert}{\param{const wchar\_t* }{input}, \param{wchar\_t* }{output}}
\func{void}{Convert}{\param{const char* }{input}, \param{wchar\_t* }{output}} \constfunc{void}{Convert}{\param{const char* }{input}, \param{wchar\_t* }{output}}
\func{void}{Convert}{\param{const wchar\_t* }{input}, \param{char* }{output}} \constfunc{void}{Convert}{\param{const wchar\_t* }{input}, \param{char* }{output}}
Convert input string according to settings passed to Convert input string according to settings passed to
\helpref{Init}{wxencodingconverterinit} and writes the result to {\it output}. \helpref{Init}{wxencodingconverterinit} and writes the result to {\it output}.
\func{void}{Convert}{\param{char* }{str}} \constfunc{void}{Convert}{\param{char* }{str}}
\func{void}{Convert}{\param{wchar\_t* }{str}} \constfunc{void}{Convert}{\param{wchar\_t* }{str}}
Convert input string according to settings passed to Convert input string according to settings passed to
\helpref{Init}{wxencodingconverterinit} in-place, i.e. write the result to the \helpref{Init}{wxencodingconverterinit} in-place, i.e. write the result to the
same memory area. same memory area.
\func{wxString}{Convert}{\param{const wxString\& }{input}} \constfunc{wxString}{Convert}{\param{const wxString\& }{input}}
Convert wxString and return new wxString object. Convert wxString and return new wxString object.

14
include/wx/encconv.h
View File

@@ -93,15 +93,15 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
// Convert input string according to settings passed to Init. // Convert input string according to settings passed to Init.
// Note that you must call Init before using Convert! // Note that you must call Init before using Convert!
void Convert(const char* input, char* output); void Convert(const char* input, char* output) const;
void Convert(char* str) { Convert(str, str); } void Convert(char* str) const { Convert(str, str); }
wxString Convert(const wxString& input); wxString Convert(const wxString& input) const;
#if wxUSE_WCHAR_T #if wxUSE_WCHAR_T
void Convert(const char* input, wchar_t* output); void Convert(const char* input, wchar_t* output) const;
void Convert(const wchar_t* input, char* output); void Convert(const wchar_t* input, char* output) const;
void Convert(const wchar_t* input, wchar_t* output); void Convert(const wchar_t* input, wchar_t* output) const;
void Convert(wchar_t* str) { Convert(str, str); } void Convert(wchar_t* str) const { Convert(str, str); }
#endif #endif
// Return equivalent(s) for given font that are used // Return equivalent(s) for given font that are used
// under given platform. wxPLATFORM_CURRENT means the plaform // under given platform. wxPLATFORM_CURRENT means the plaform

10
src/common/encconv.cpp
View File

@@ -173,7 +173,7 @@ bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_e
void wxEncodingConverter::Convert(const char* input, char* output) void wxEncodingConverter::Convert(const char* input, char* output) const
{ {
wxASSERT_MSG(!m_UnicodeOutput, wxT("You cannot convert to unicode if output is const char*!")); wxASSERT_MSG(!m_UnicodeOutput, wxT("You cannot convert to unicode if output is const char*!"));
wxASSERT_MSG(!m_UnicodeInput, wxT("You cannot convert from unicode if input is const char*!")); wxASSERT_MSG(!m_UnicodeInput, wxT("You cannot convert from unicode if input is const char*!"));
@@ -197,7 +197,7 @@ void wxEncodingConverter::Convert(const char* input, char* output)
#if wxUSE_WCHAR_T #if wxUSE_WCHAR_T
void wxEncodingConverter::Convert(const char* input, wchar_t* output) void wxEncodingConverter::Convert(const char* input, wchar_t* output) const
{ {
wxASSERT_MSG(m_UnicodeOutput, wxT("You cannot convert to 8-bit if output is const wchar_t*!")); wxASSERT_MSG(m_UnicodeOutput, wxT("You cannot convert to 8-bit if output is const wchar_t*!"));
wxASSERT_MSG(!m_UnicodeInput, wxT("You cannot convert from unicode if input is const char*!")); wxASSERT_MSG(!m_UnicodeInput, wxT("You cannot convert from unicode if input is const char*!"));
@@ -222,7 +222,7 @@ void wxEncodingConverter::Convert(const char* input, wchar_t* output)
void wxEncodingConverter::Convert(const wchar_t* input, char* output) void wxEncodingConverter::Convert(const wchar_t* input, char* output) const
{ {
wxASSERT_MSG(!m_UnicodeOutput, wxT("You cannot convert to unicode if output is const char*!")); wxASSERT_MSG(!m_UnicodeOutput, wxT("You cannot convert to unicode if output is const char*!"));
wxASSERT_MSG(m_UnicodeInput, wxT("You cannot convert from 8-bit if input is const wchar_t*!")); wxASSERT_MSG(m_UnicodeInput, wxT("You cannot convert from 8-bit if input is const wchar_t*!"));
@@ -247,7 +247,7 @@ void wxEncodingConverter::Convert(const wchar_t* input, char* output)
void wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output) void wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output) const
{ {
wxASSERT_MSG(m_UnicodeOutput, wxT("You cannot convert to 8-bit if output is const wchar_t*!")); wxASSERT_MSG(m_UnicodeOutput, wxT("You cannot convert to 8-bit if output is const wchar_t*!"));
wxASSERT_MSG(m_UnicodeInput, wxT("You cannot convert from 8-bit if input is const wchar_t*!")); wxASSERT_MSG(m_UnicodeInput, wxT("You cannot convert from 8-bit if input is const wchar_t*!"));
@@ -274,7 +274,7 @@ void wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output)
#endif // wxUSE_WCHAR_T #endif // wxUSE_WCHAR_T
wxString wxEncodingConverter::Convert(const wxString& input) wxString wxEncodingConverter::Convert(const wxString& input) const
{ {
if (m_JustCopy) return input; if (m_JustCopy) return input;