some != NULL checks

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

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 70e4e9a688e42d2508bbb2409724407362e59bc2..829d4bf212fd9974ad66f6874613542983e9acf5 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -32,10 +32,7 @@
 #include <stdlib.h>
 #include "wx/string.h"
 #include "wx/utils.h"
-// #include "wx/data.h"
-#define WXSOCK_INTERNAL
 #include "wx/sckaddr.h"
-#undef WXSOCK_INTERNAL
 #include "wx/socket.h"
 #include "wx/url.h"
 #include "wx/sckstrm.h"
@@ -67,7 +64,7 @@ wxFTP::wxFTP()
   m_passwd += wxGetHostName();
 
   SetNotify(0);
-  SetFlags(NONE);
+  SetFlags(wxSOCKET_NONE);
 }
 
 wxFTP::~wxFTP()
@@ -129,8 +126,9 @@ bool wxFTP::Close()
     m_lastError = wxPROTO_STREAMING;
     return FALSE;
   }
-  if (m_connected)
+  if (IsConnected())
     SendCommand(wxString(wxT("QUIT")), '2');
+
   return wxSocketClient::Close();
 }
 
@@ -350,7 +348,7 @@ wxInputStream *wxFTP::GetInputStream(const wxString& path)
 
     in_stream->m_ftpsize = wxAtoi(WXSTRINGCAST str_size);
   }
-  sock->SetFlags(WAITALL);
+  sock->SetFlags(wxSOCKET_WAITALL);
 
   return in_stream;
 }