Cleaned up the API for class/structure/function names to follow the wxWindows convent...

[wxWidgets.git] / include / wx / protocol / ftp.h

diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h
index 7fca01f8b79c869623d537a0bf4b76eeb56c29b6..459f2bfd6cd353278e745f17f2e1a48921bbcd0b 100644 (file)
--- a/include/wx/protocol/ftp.h
+++ b/include/wx/protocol/ftp.h
@@ -8,6 +8,7 @@
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////

+

 #ifndef __WX_FTP_H__
 #define __WX_FTP_H__
 
 #ifndef __WX_FTP_H__
 #define __WX_FTP_H__
 


@@ -20,28 +21,23 @@
 #include "wx/protocol/protocol.h"
 #include "wx/url.h"
 
 #include "wx/protocol/protocol.h"
 #include "wx/url.h"
 

-class WXDLLEXPORT wxFTP : public wxProtocol {
-  DECLARE_DYNAMIC_CLASS(wxFTP)
-  DECLARE_PROTOCOL(wxFTP)
+class WXDLLEXPORT wxFTP : public wxProtocol
+{

 public:
   typedef enum { ASCII, BINARY } wxFTPmode;
 
   wxFTP();
 public:
   typedef enum { ASCII, BINARY } wxFTPmode;
 
   wxFTP();

-  ~wxFTP();
+  virtual ~wxFTP();

 
 

-  bool Close();
-  bool Connect(wxSockAddress& addr);
+  bool Connect(wxSockAddress& addr, bool wait = TRUE);

   bool Connect(const wxString& host);
 
   bool Connect(const wxString& host);
 

+  // [forcibly] close the connection
+  bool Close(bool force = FALSE);
+

   void SetUser(const wxString& user) { m_user = user; }
   void SetPassword(const wxString& passwd) { m_passwd = passwd; }
 
   void SetUser(const wxString& user) { m_user = user; }
   void SetPassword(const wxString& passwd) { m_passwd = passwd; }
 

-  // Low-level methods
-  bool SendCommand(const wxString& command, char exp_ret);
-  inline virtual wxProtocolError GetError()
-      { return m_lastError; }
-  const wxString& GetLastResult();             // Get the complete return 
-

   // Filesystem commands
   bool ChDir(const wxString& dir);
   bool MkDir(const wxString& dir);
   // Filesystem commands
   bool ChDir(const wxString& dir);
   bool MkDir(const wxString& dir);


@@ -56,6 +52,14 @@ public:
   wxOutputStream *GetOutputStream(const wxString& path);
 
   // List method
   wxOutputStream *GetOutputStream(const wxString& path);
 
   // List method

+  bool GetList(wxArrayString& files, const wxString& wildcard = wxEmptyString);
+
+  // Low-level methods
+  bool SendCommand(const wxString& command, char exp_ret);
+  virtual wxProtocolError GetError() { return m_lastError; }
+  const wxString& GetLastResult();             // Get the complete return 
+
+  // deprecated

   wxList *GetList(const wxString& wildcard);
 
 protected:
   wxList *GetList(const wxString& wildcard);
 
 protected:


@@ -69,6 +73,9 @@ protected:
 
   wxSocketClient *GetPort();
   bool GetResult(char exp);
 
   wxSocketClient *GetPort();
   bool GetResult(char exp);

+
+  DECLARE_DYNAMIC_CLASS(wxFTP)
+  DECLARE_PROTOCOL(wxFTP)

 };
 
 };
 

-#endif
+#endif // __WX_FTP_H__