don't use deprecated wxMenuItem methods

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

diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp
index 64c385528f2164b3cb9eda523b8a073208019d66..75981c5bb3751060337be443245b5c49a4fb7269 100644 (file)
--- a/src/common/protocol.cpp
+++ b/src/common/protocol.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        protocol.cpp
+// Name:        src/common/protocol.cpp

 // Purpose:     Implement protocol base class
 // Author:      Guilhem Lavaux
 // Modified by:
 // Purpose:     Implement protocol base class
 // Author:      Guilhem Lavaux
 // Modified by:


@@ -9,22 +9,22 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_PROTOCOL
 
 #include "wx/protocol/protocol.h"
 #endif
 
 #if wxUSE_PROTOCOL
 
 #include "wx/protocol/protocol.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/module.h"
+#endif
+

 #include "wx/url.h"
 #include "wx/url.h"

-#include "wx/module.h"

 
 #include <stdlib.h>
 
 
 #include <stdlib.h>
 


@@ -45,8 +45,12 @@ wxProtoInfo::wxProtoInfo(const wxChar *name, const wxChar *serv,
 {
     m_cinfo = info;
     m_needhost = need_host1;
 {
     m_cinfo = info;
     m_needhost = need_host1;

+#if wxUSE_URL

     next = wxURL::ms_protocols;
     wxURL::ms_protocols = this;
     next = wxURL::ms_protocols;
     wxURL::ms_protocols = this;

+#else
+    next = NULL;
+#endif

 }
 
 /////////////////////////////////////////////////////////////////
 }
 
 /////////////////////////////////////////////////////////////////


@@ -74,16 +78,16 @@ bool wxProtocol::Reconnect()
     if (!GetPeer(addr))
     {
         Close();
     if (!GetPeer(addr))
     {
         Close();

-        return FALSE;
+        return false;

     }
 
     if (!Close())
     }
 
     if (!Close())

-        return FALSE;
-        
+        return false;
+

     if (!Connect(addr))
     if (!Connect(addr))

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

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


@@ -91,17 +95,18 @@ bool wxProtocol::Reconnect()
 // ----------------------------------------------------------------------------
 
 /* static */
 // ----------------------------------------------------------------------------
 
 /* static */

-wxProtocolError wxProtocol::ReadLine(wxSocketBase *socket, wxString& result)
+wxProtocolError wxProtocol::ReadLine(wxSocketBase *sock, wxString& result)

 {
     static const int LINE_BUF = 4095;
 
     result.clear();
 
     wxCharBuffer buf(LINE_BUF);
 {
     static const int LINE_BUF = 4095;
 
     result.clear();
 
     wxCharBuffer buf(LINE_BUF);

+    char *pBuf = buf.data();

     while ( sock->WaitForRead() )
     {
         // peek at the socket to see if there is a CRLF
     while ( sock->WaitForRead() )
     {
         // peek at the socket to see if there is a CRLF

-        sock->Peek(buf.data(), LINE_BUF);
+        sock->Peek(pBuf, LINE_BUF);

 
         size_t nRead = sock->LastCount();
         if ( !nRead && sock->Error() )
 
         size_t nRead = sock->LastCount();
         if ( !nRead && sock->Error() )


@@ -110,13 +115,13 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *socket, wxString& result)
         // look for "\r\n" paying attention to a special case: "\r\n" could
         // have been split by buffer boundary, so check also for \r at the end
         // of the last chunk and \n at the beginning of this one
         // look for "\r\n" paying attention to a special case: "\r\n" could
         // have been split by buffer boundary, so check also for \r at the end
         // of the last chunk and \n at the beginning of this one

-        buf.data()[nRead] = '\0';
-        const char *eol = strchr(buf, '\n');
+        pBuf[nRead] = '\0';
+        const char *eol = strchr(pBuf, '\n');

 
         // if we found '\n', is there a '\r' as well?
         if ( eol )
         {
 
         // if we found '\n', is there a '\r' as well?
         if ( eol )
         {

-            if ( eol == buf.data() )
+            if ( eol == pBuf )

             {
                 // check for case of "\r\n" being split
                 if ( result.empty() || result.Last() != _T('\r') )
             {
                 // check for case of "\r\n" being split
                 if ( result.empty() || result.Last() != _T('\r') )


@@ -132,7 +137,7 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *socket, wxString& result)
             else // '\n' in the middle of the buffer
             {
                 // in any case, read everything up to and including '\n'
             else // '\n' in the middle of the buffer
             {
                 // in any case, read everything up to and including '\n'

-                nRead = eol - buf + 1;
+                nRead = eol - pBuf + 1;

 
                 if ( eol[-1] != '\r' )
                 {
 
                 if ( eol[-1] != '\r' )
                 {


@@ -142,12 +147,12 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *socket, wxString& result)
             }
         }
 
             }
         }
 

-        sock->Read(buf.data(), nRead);
+        sock->Read(pBuf, nRead);

         if ( sock->LastCount() != nRead )
             return wxPROTO_NETERR;
 
         if ( sock->LastCount() != nRead )
             return wxPROTO_NETERR;
 

-        buf.data()[nRead] = '\0';
-        result += wxString::FromAscii(buf);
+        pBuf[nRead] = '\0';
+        result += wxString::FromAscii(pBuf);

 
         if ( eol )
         {
 
         if ( eol )
         {


@@ -166,46 +171,6 @@ wxProtocolError wxProtocol::ReadLine(wxString& result)
     return ReadLine(this, result);
 }
 
     return ReadLine(this, result);
 }
 

-// old function which only chops '\n' and not '\r\n'
-wxProtocolError GetLine(wxSocketBase *sock, wxString& result)
-{
-#define PROTO_BSIZE 2048
-    size_t avail, size;
-    char tmp_buf[PROTO_BSIZE], tmp_str[PROTO_BSIZE];
-    char *ret;
-    bool found;
-
-    avail = sock->Read(tmp_buf, PROTO_BSIZE).LastCount();
-    if (sock->Error() || avail == 0)
-        return wxPROTO_NETERR;
-
-    memcpy(tmp_str, tmp_buf, avail);
-
-    // Not implemented on all systems
-    // ret = (char *)memccpy(tmp_str, tmp_buf, '\n', avail);
-    found = FALSE;
-    for (ret=tmp_str;ret < (tmp_str+avail); ret++)
-        if (*ret == '\n') 
-        {
-            found = TRUE;
-            break;
-        }
-
-    if (!found)
-        return wxPROTO_PROTERR;
-        
-    *ret = 0;
-
-    result = wxString::FromAscii( tmp_str );
-    result = result.Left(result.Length()-1);
-
-    size = ret-tmp_str+1;
-    sock->Unread(&tmp_buf[size], avail-size);
-  
-    return wxPROTO_NOERR;
-#undef PROTO_BSIZE
-}

 #endif // wxUSE_SOCKETS
 
 #endif // wxUSE_PROTOCOL
 #endif // wxUSE_SOCKETS
 
 #endif // wxUSE_PROTOCOL

-