Ignore:
Timestamp:
Jan 9, 2017, 11:09:38 AM (2 years ago)
Author:
jrpelegrina
Message:

Update new version: 3.15.02

File:
1 edited

Legend:

Unmodified
Added
Removed
  • filezilla/trunk/fuentes/src/include/socket.h

    r130 r3185  
    22#define __SOCKET_H__
    33
    4 #include "event_handler.h"
     4#include <libfilezilla/event_handler.hpp>
    55
    66#include <errno.h>
     
    2929
    3030struct socket_event_type;
    31 typedef CEvent<socket_event_type, CSocketEventSource*, SocketEventType, int> CSocketEvent;
     31typedef fz::simple_event<socket_event_type, CSocketEventSource*, SocketEventType, int> CSocketEvent;
    3232
    3333struct hostaddress_event_type;
    34 typedef CEvent<hostaddress_event_type, CSocketEventSource*, wxString> CHostAddressEvent;
     34typedef fz::simple_event<hostaddress_event_type, CSocketEventSource*, wxString> CHostAddressEvent;
    3535
    3636class CCallback
     
    4040};
    4141
    42 void RemoveSocketEvents(CEventHandler * handler, CSocketEventSource const* const source);
     42void RemoveSocketEvents(fz::event_handler * handler, CSocketEventSource const* const source);
     43void ChangeSocketEventHandler(fz::event_handler * oldHandler, fz::event_handler * newHandler, CSocketEventSource const* const source);
    4344
    4445class CSocketThread;
     
    4748        friend class CSocketThread;
    4849public:
    49         CSocket(CEventHandler* pEvtHandler);
     50        CSocket(fz::event_handler* pEvtHandler);
    5051        virtual ~CSocket();
    5152
     
    114115
    115116        // Can only be called if the state is none
    116         void SetEventHandler(CEventHandler* pEvtHandler);
    117         CEventHandler* GetEventHandler() { return m_pEvtHandler; }
     117        void SetEventHandler(fz::event_handler* pEvtHandler);
     118        fz::event_handler* GetEventHandler() { return m_pEvtHandler; }
    118119
    119120        static void Cleanup(bool force);
     
    147148        void DetachThread();
    148149
    149         CEventHandler* m_pEvtHandler;
     150        fz::event_handler* m_pEvtHandler;
    150151
    151152        int m_fd;
     
    166167};
    167168
    168 #ifdef __WXMSW__
     169#ifdef FZ_WINDOWS
    169170
    170171#ifndef EISCONN
     
    231232// For the future:
    232233// Handle ERROR_NETNAME_DELETED=64
    233 #endif //__WXMSW__
     234#endif //FZ_WINDOWS
    234235
    235236#endif //__SOCKET_H__
Note: See TracChangeset for help on using the changeset viewer.