// declarations
// ============================================================================
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "ftp.h"
-#endif
-
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
}
// if we got here we must have a non empty code string
- return code[0u];
+ return (char)code[0u];
}
// ----------------------------------------------------------------------------
return false;
}
- // If we get here the operation has been succesfully completed
+ // If we get here the operation has been successfully completed
// Set the status-member
m_currentTransfermode = transferMode;
return sock;
}
-wxString wxFTP::GetPortCmdArgument(wxIPV4address addrLocal,
- wxIPV4address addrNew)
+wxString wxFTP::GetPortCmdArgument(const wxIPV4address& addrLocal,
+ const wxIPV4address& addrNew)
{
// Just fills in the return value with the local IP
// address of the current socket. Also it fill in the
wxInputStream *wxFTP::GetInputStream(const wxString& path)
{
-#if !wxUSE_URL
- return NULL;
-#else
if ( ( m_currentTransfermode == NONE ) && !SetTransferMode(BINARY) )
return NULL;
return NULL;
}
- wxString tmp_str = wxT("RETR ") + wxURL::ConvertFromURI(path);
+ wxString tmp_str = wxT("RETR ") + wxURI::Unescape(path);
if ( !CheckCommand(tmp_str, '1') )
return NULL;
wxInputFTPStream *in_stream = new wxInputFTPStream(this, sock);
return in_stream;
-#endif
}
wxOutputStream *wxFTP::GetOutputStream(const wxString& path)
// - Windows : like "dir" command
// - others : ?
wxString line(details ? _T("LIST") : _T("NLST"));
- if ( !wildcard.IsEmpty() )
+ if ( !wildcard.empty() )
{
line << _T(' ') << wildcard;
}