remove test code for wxScopeGuard (there's already a better ScopeGuardTestCase)

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

diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h
index 21312e87fd6a27e27f15643c96878171e1a1d938..bfe39ce0176f108173a8b9f8bcec48582f5283bb 100644 (file)
--- a/include/wx/protocol/ftp.h
+++ b/include/wx/protocol/ftp.h
@@ -2,7 +2,7 @@
 // Name:        ftp.h
 // Purpose:     FTP protocol
 // Author:      Vadim Zeitlin
 // Name:        ftp.h
 // Purpose:     FTP protocol
 // Author:      Vadim Zeitlin

-// Modified by: Mark Johnson, wxWindows@mj10777.de 
+// Modified by: Mark Johnson, wxWindows@mj10777.de

 //              20000917 : RmDir, GetLastResult, GetList
 // Created:     07/07/1997
 // RCS-ID:      $Id$
 //              20000917 : RmDir, GetLastResult, GetList
 // Created:     07/07/1997
 // RCS-ID:      $Id$


@@ -35,9 +35,6 @@ public:
     virtual ~wxFTP();
 
     // Connecting and disconnecting
     virtual ~wxFTP();
 
     // Connecting and disconnecting

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

     bool Connect(const wxSockAddress& addr, bool wait = true);
     bool Connect(const wxString& host);
 
     bool Connect(const wxSockAddress& addr, bool wait = true);
     bool Connect(const wxString& host);
 


@@ -48,18 +45,17 @@ public:
 
     // set transfer mode now
     void SetPassive(bool pasv) { m_bPassive = pasv; }
 
     // set transfer mode now
     void SetPassive(bool pasv) { m_bPassive = pasv; }

-    void SetDefaultTimeout(wxUint32 Value);

     bool SetBinary() { return SetTransferMode(BINARY); }
     bool SetAscii() { return SetTransferMode(ASCII); }
     bool SetTransferMode(TransferMode mode);
 
     // Generic FTP interface
 
     bool SetBinary() { return SetTransferMode(BINARY); }
     bool SetAscii() { return SetTransferMode(ASCII); }
     bool SetTransferMode(TransferMode mode);
 
     // Generic FTP interface
 

-    // the error code
-    virtual wxProtocolError GetError() { return m_lastError; }
+    // FTP doesn't know the MIME type of the last downloaded/uploaded file
+    virtual wxString GetContentType() const { return wxEmptyString; }

 
     // the last FTP server reply
 
     // the last FTP server reply

-    const wxString& GetLastResult() { return m_lastResult; }
+    const wxString& GetLastResult() const { return m_lastResult; }

 
     // send any FTP command (should be full FTP command line but without
     // trailing "\r\n") and return its return code
 
     // send any FTP command (should be full FTP command line but without
     // trailing "\r\n") and return its return code


@@ -68,6 +64,7 @@ public:
     // check that the command returned the given code
     bool CheckCommand(const wxString& command, char expectedReturn)
     {
     // check that the command returned the given code
     bool CheckCommand(const wxString& command, char expectedReturn)
     {

+        // SendCommand() does updates m_lastError

         return SendCommand(command) == expectedReturn;
     }
 
         return SendCommand(command) == expectedReturn;
     }
 


@@ -81,7 +78,7 @@ public:
 
     // Get the size of a file in the current dir.
     // this function tries its best to deliver the size in bytes using BINARY
 
     // Get the size of a file in the current dir.
     // this function tries its best to deliver the size in bytes using BINARY

-    // (the SIZE command reports different sizes depending on whether 
+    // (the SIZE command reports different sizes depending on whether

     // type is set to ASCII or BINARY)
     // returns -1 if file is non-existant or size could not be found
     int GetFileSize(const wxString& fileName);
     // type is set to ASCII or BINARY)
     // returns -1 if file is non-existant or size could not be found
     int GetFileSize(const wxString& fileName);


@@ -145,37 +142,34 @@ protected:
     wxSocketBase *AcceptIfActive(wxSocketBase *sock);
 
 
     wxSocketBase *AcceptIfActive(wxSocketBase *sock);
 
 

-    wxString m_user,
-             m_passwd;
+    // internal variables:

 
 

-    wxString m_lastResult;
-    wxProtocolError m_lastError;
+    wxString        m_lastResult;

 
     // true if there is an FTP transfer going on
 
     // true if there is an FTP transfer going on

-    bool m_streaming;
+    bool            m_streaming;

 
     // although this should be set to ASCII by default according to STD9,
     // we will use BINARY transfer mode by default for backwards compatibility
 
     // although this should be set to ASCII by default according to STD9,
     // we will use BINARY transfer mode by default for backwards compatibility

-    TransferMode m_currentTransfermode;
-
-    friend class wxInputFTPStream;
-    friend class wxOutputFTPStream;
+    TransferMode    m_currentTransfermode;

 
     bool            m_bPassive;
 
     bool            m_bPassive;

-    wxUint32        m_uiDefaultTimeout;

 
     // following is true when  a read or write times out, we then assume
     // the connection is dead and abort. we avoid additional delays this way
     bool            m_bEncounteredError;
 
 
 
     // following is true when  a read or write times out, we then assume
     // the connection is dead and abort. we avoid additional delays this way
     bool            m_bEncounteredError;
 
 

+    friend class wxInputFTPStream;
+    friend class wxOutputFTPStream;
+

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxFTP)
     DECLARE_PROTOCOL(wxFTP)
 };
 
 // the trace mask used by assorted wxLogTrace() in ftp code, do
 // wxLog::AddTraceMask(FTP_TRACE_MASK) to see them in output
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxFTP)
     DECLARE_PROTOCOL(wxFTP)
 };
 
 // the trace mask used by assorted wxLogTrace() in ftp code, do
 // wxLog::AddTraceMask(FTP_TRACE_MASK) to see them in output

-#define FTP_TRACE_MASK _T("ftp")
+#define FTP_TRACE_MASK wxT("ftp")

 
 #endif // wxUSE_PROTOCOL_FTP
 
 
 #endif // wxUSE_PROTOCOL_FTP