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/engine_context.cpp

    r130 r3185  
    33
    44#include "directorycache.h"
    5 #include "event_loop.h"
    65#include "logging_private.h"
    76#include "pathcache.h"
     
    98#include "socket.h"
    109
     10#include <libfilezilla/event_loop.hpp>
     11
    1112namespace {
    1213struct logging_options_changed_event_type;
    13 typedef CEvent<logging_options_changed_event_type> CLoggingOptionsChangedEvent;
     14typedef fz::simple_event<logging_options_changed_event_type> CLoggingOptionsChangedEvent;
    1415
    15 class CLoggingOptionsChanged final : public CEventHandler, COptionChangeEventHandler
     16class CLoggingOptionsChanged final : public fz::event_handler, COptionChangeEventHandler
    1617{
    1718public:
    18         CLoggingOptionsChanged(COptionsBase& options, CEventLoop & loop)
    19                 : CEventHandler(loop)
     19        CLoggingOptionsChanged(COptionsBase& options, fz::event_loop & loop)
     20                : fz::event_handler(loop)
    2021                , options_(options)
    2122        {
    2223                RegisterOption(OPTION_LOGGING_DEBUGLEVEL);
    2324                RegisterOption(OPTION_LOGGING_RAWLISTING);
    24                 SendEvent<CLoggingOptionsChangedEvent>();
     25                send_event<CLoggingOptionsChangedEvent>();
    2526        }
    2627
     
    2930                if (options.test(OPTION_LOGGING_DEBUGLEVEL) || options.test(OPTION_LOGGING_RAWLISTING)) {
    3031                        CLogging::UpdateLogLevel(options_); // In main thread
    31                         SendEvent<CLoggingOptionsChangedEvent>();
     32                        send_event<CLoggingOptionsChangedEvent>();
    3233                }
    3334        }
    3435
    35         virtual void operator()(const CEventBase&)
     36        virtual void operator()(const fz::event_base&)
    3637        {
    3738                CLogging::UpdateLogLevel(options_); // In worker thread
     
    5455        ~Impl()
    5556        {
    56                 optionChangeHandler_.RemoveHandler();
     57                optionChangeHandler_.remove_handler();
    5758        }
    5859
    59         CEventLoop loop_;
     60        fz::event_loop loop_;
    6061        CRateLimiter limiter_;
    6162        CDirectoryCache directory_cache_;
     
    7980}
    8081
    81 CEventLoop& CFileZillaEngineContext::GetEventLoop()
     82fz::event_loop& CFileZillaEngineContext::GetEventLoop()
    8283{
    8384        return impl_->loop_;
Note: See TracChangeset for help on using the changeset viewer.