Fixed typo.

[wxWidgets.git] / src / common / ftp.cpp

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 417849ea00e5c878c65bfa4bb03ac09daf7c8e16..c7318863eec56122d2fda3660dd92cb7cdf9467b 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -19,10 +19,6 @@
 // declarations
 // ============================================================================
 
 // declarations
 // ============================================================================
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-  #pragma implementation "ftp.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -348,7 +344,7 @@ char wxFTP::GetResult()
     }
 
     // if we got here we must have a non empty code string
     }
 
     // if we got here we must have a non empty code string

-    return code[0u];
+    return (char)code[0u];

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -387,7 +383,7 @@ bool wxFTP::SetTransferMode(TransferMode transferMode)
         return false;
     }
 
         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;
 
     // Set the status-member
     m_currentTransfermode = transferMode;
 


@@ -645,8 +641,8 @@ wxSocketBase *wxFTP::AcceptIfActive(wxSocketBase *sock)
     return sock;
 }
 
     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
 {
     // Just fills in the return value with the local IP
     // address of the current socket.  Also it fill in the


@@ -771,7 +767,7 @@ wxInputStream *wxFTP::GetInputStream(const wxString& path)
         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;
 
     if ( !CheckCommand(tmp_str, '1') )
         return NULL;
 


@@ -824,7 +820,7 @@ bool wxFTP::GetList(wxArrayString& files,
     //        - Windows : like "dir" command
     //        - others  : ?
     wxString line(details ? _T("LIST") : _T("NLST"));
     //        - Windows : like "dir" command
     //        - others  : ?
     wxString line(details ? _T("LIST") : _T("NLST"));

-    if ( !wildcard.IsEmpty() )
+    if ( !wildcard.empty() )

     {
         line << _T(' ') << wildcard;
     }
     {
         line << _T(' ') << wildcard;
     }


@@ -865,7 +861,7 @@ bool wxFTP::FileExists(const wxString& fileName)
     if ( GetList(fileList, fileName, false) )
     {
         // Some ftp-servers (Ipswitch WS_FTP Server 1.0.5 does this)
     if ( GetList(fileList, fileName, false) )
     {
         // Some ftp-servers (Ipswitch WS_FTP Server 1.0.5 does this)

-        // displays this behaviour when queried on a non-existing file:
+        // displays this behaviour when queried on a nonexistent file:

         // NLST this_file_does_not_exist
         // 150 Opening ASCII data connection for directory listing
         // (no data transferred)
         // NLST this_file_does_not_exist
         // 150 Opening ASCII data connection for directory listing
         // (no data transferred)