slightly nicer workaround for pickier compiler warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
bf8f21fdf8
commit
409a7ba772
@ -122,7 +122,7 @@ protected:
|
||||
static void Escape (wxString& s, const wxChar& c);
|
||||
static bool IsEscape(const wxChar*& uri);
|
||||
|
||||
static wxInt32 CharToHex(const wxChar& c);
|
||||
static wxChar CharToHex(const wxChar& c);
|
||||
|
||||
static bool IsUnreserved (const wxChar& c);
|
||||
static bool IsReserved (const wxChar& c);
|
||||
|
@ -117,7 +117,7 @@ wxChar wxURI::TranslateEscape(const wxChar* s)
|
||||
{
|
||||
wxASSERT_MSG(IsHex(*s) && IsHex(*(s+1)), wxT("Invalid escape!"));
|
||||
|
||||
return (wxChar)( CharToHex(*s) * 0x10 + CharToHex(*++s) );
|
||||
return CharToHex(*s) * 0x10 + CharToHex(*++s);
|
||||
}
|
||||
|
||||
wxString wxURI::Unescape(const wxString& uri)
|
||||
@ -1150,7 +1150,7 @@ bool wxURI::ParseIPvFuture(const wxChar*& uri)
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
//static
|
||||
wxInt32 wxURI::CharToHex(const wxChar& c)
|
||||
wxChar wxURI::CharToHex(const wxChar& c)
|
||||
{
|
||||
if ((c >= wxT('A')) && (c <= wxT('Z'))) return c - wxT('A') + 0x0A;
|
||||
if ((c >= wxT('a')) && (c <= wxT('z'))) return c - wxT('a') + 0x0a;
|
||||
|
Loading…
Reference in New Issue
Block a user