fixing iterator comparison

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

diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp
index 4a06cf857b9ee1591ac23f58deb0fd6b22fc0e16..0173b097b74a1c5f214bd52841b3f14bd321ce2b 100644 (file)
--- a/src/common/protocol.cpp
+++ b/src/common/protocol.cpp
@@ -19,12 +19,14 @@
 #if wxUSE_PROTOCOL
 
 #include "wx/protocol/protocol.h"
 #if wxUSE_PROTOCOL
 
 #include "wx/protocol/protocol.h"

+#include "wx/protocol/log.h"

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

+#include "wx/log.h"

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


@@ -32,6 +34,8 @@
 // wxProtoInfo
 // ----------------------------------------------------------------------------
 
 // wxProtoInfo
 // ----------------------------------------------------------------------------
 

+IMPLEMENT_CLASS(wxProtoInfo, wxObject)
+

 wxProtoInfo::wxProtoInfo(const wxChar *name, const wxChar *serv,
                          const bool need_host1, wxClassInfo *info)
            : m_protoname(name),
 wxProtoInfo::wxProtoInfo(const wxChar *name, const wxChar *serv,
                          const bool need_host1, wxClassInfo *info)
            : m_protoname(name),


@@ -64,6 +68,7 @@ wxProtocol::wxProtocol()
 #endif
 {
     m_lastError = wxPROTO_NOERR;
 #endif
 {
     m_lastError = wxPROTO_NOERR;

+    m_log = NULL;

     SetDefaultTimeout(60);      // default timeout is 60 seconds
 }
 
     SetDefaultTimeout(60);      // default timeout is 60 seconds
 }
 


@@ -95,6 +100,10 @@ void wxProtocol::SetDefaultTimeout(wxUint32 Value)
 #endif
 }
 
 #endif
 }
 

+wxProtocol::~wxProtocol()
+{
+    delete m_log;
+}

 
 // ----------------------------------------------------------------------------
 // Read a line from socket
 
 // ----------------------------------------------------------------------------
 // Read a line from socket


@@ -130,7 +139,7 @@ wxProtocolError wxProtocol::ReadLine(wxSocketBase *sock, wxString& result)
             if ( eol == pBuf )
             {
                 // check for case of "\r\n" being split
             if ( eol == pBuf )
             {
                 // check for case of "\r\n" being split

-                if ( result.empty() || result.Last() != _T('\r') )
+                if ( result.empty() || result.Last() != wxT('\r') )

                 {
                     // ignore the stray '\n'
                     eol = NULL;
                 {
                     // ignore the stray '\n'
                     eol = NULL;


@@ -179,4 +188,32 @@ wxProtocolError wxProtocol::ReadLine(wxString& result)
 
 #endif // wxUSE_SOCKETS
 
 
 #endif // wxUSE_SOCKETS
 

+// ----------------------------------------------------------------------------
+// logging
+// ----------------------------------------------------------------------------
+
+void wxProtocol::SetLog(wxProtocolLog *log)
+{
+    delete m_log;
+    m_log = log;
+}
+
+void wxProtocol::LogRequest(const wxString& str)
+{
+    if ( m_log )
+        m_log->LogRequest(str);
+}
+
+void wxProtocol::LogResponse(const wxString& str)
+{
+    if ( m_log )
+        m_log->LogResponse(str);
+}
+
+void wxProtocolLog::DoLogString(const wxString& str)
+{
+    wxUnusedVar(str); // unused if wxLogTrace() is disabled
+    wxLogTrace(m_traceMask, "%s", str);
+}
+

 #endif // wxUSE_PROTOCOL
 #endif // wxUSE_PROTOCOL