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/engine/engineprivate.h

    r130 r3185  
    22#define __FILEZILLAENGINEPRIVATE_H__
    33
    4 #include "timeex.h"
     4#include <libfilezilla/event.hpp>
     5#include <libfilezilla/event_handler.hpp>
     6#include <libfilezilla/mutex.hpp>
     7#include <libfilezilla/time.hpp>
    58
    69#include "engine_context.h"
    7 #include "event.h"
    8 #include "event_handler.h"
    910#include "FileZillaEngine.h"
    10 #include "mutex.h"
    1111#include "option_change_event_handler.h"
    1212
     
    2424
    2525struct filezilla_engine_event_type;
    26 typedef CEvent<filezilla_engine_event_type, EngineNotificationType> CFileZillaEngineEvent;
     26typedef fz::simple_event<filezilla_engine_event_type, EngineNotificationType> CFileZillaEngineEvent;
    2727
    2828class CTransferStatusManager final
     
    4545
    4646protected:
    47         mutex mutex_;
     47        fz::mutex mutex_;
    4848
    4949        CTransferStatus status_;
     
    5454};
    5555
    56 class CFileZillaEnginePrivate final : public CEventHandler, COptionChangeEventHandler
     56class CFileZillaEnginePrivate final : public fz::event_handler, COptionChangeEventHandler
    5757{
    5858public:
     
    136136        int ContinueConnect();
    137137
    138         void operator()(CEventBase const& ev);
     138        void operator()(fz::event_base const& ev);
    139139        void OnEngineEvent(EngineNotificationType type);
    140140        void OnTimer(int timer_id);
     
    143143        // General mutex for operations on the engine
    144144        // Todo: More fine-grained locking, a global mutex isn't nice
    145         static mutex mutex_;
     145        static fz::mutex mutex_;
    146146
    147147        // Used to synchronize access to the notification list
    148         mutex notification_mutex_;
     148        fz::mutex notification_mutex_;
    149149
    150150        wxEvtHandler *m_pEventHandler{};
     
    159159        // Remember last path used in a dirlisting.
    160160        CServerPath m_lastListDir;
    161         CMonotonicClock m_lastListTime;
     161        fz::monotonic_clock m_lastListTime;
    162162
    163163        std::unique_ptr<CControlSocket> m_pControlSocket;
     
    188188        {
    189189                CServer server;
    190                 CDateTime time;
     190                fz::datetime time;
    191191                bool critical{};
    192192        };
    193193        static std::list<t_failedLogins> m_failedLogins;
    194194        int m_retryCount{};
    195         timer_id m_retryTimer{};
     195        fz::timer_id m_retryTimer{};
    196196
    197197        CRateLimiter& m_rateLimiter;
     
    206206
    207207struct command_event_type{};
    208 typedef CEvent<command_event_type> CCommandEvent;
     208typedef fz::simple_event<command_event_type> CCommandEvent;
    209209
    210210struct async_request_reply_event_type{};
    211 typedef CEvent<async_request_reply_event_type, std::unique_ptr<CAsyncRequestNotification>> CAsyncRequestReplyEvent;
     211typedef fz::simple_event<async_request_reply_event_type, std::unique_ptr<CAsyncRequestNotification>> CAsyncRequestReplyEvent;
    212212
    213213#endif //__FILEZILLAENGINEPRIVATE_H__
Note: See TracChangeset for help on using the changeset viewer.