From f6f4742410cff1413ea1c1bd326278d89a929f12 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 7 Aug 2013 19:39:26 +0200 Subject: event/DeferredMonitor: rename Run() to RunDeferred() --- src/GlobalEvents.cxx | 4 ++-- src/event/DeferredMonitor.cxx | 4 ++-- src/event/DeferredMonitor.hxx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/GlobalEvents.cxx b/src/GlobalEvents.cxx index ed7697b1a..b587f1ff7 100644 --- a/src/GlobalEvents.cxx +++ b/src/GlobalEvents.cxx @@ -37,7 +37,7 @@ namespace GlobalEvents { Monitor(EventLoop &_loop):DeferredMonitor(_loop) {} protected: - virtual void Run() override; + virtual void RunDeferred() override; }; static Manual monitor; @@ -59,7 +59,7 @@ InvokeGlobalEvent(GlobalEvents::Event event) } void -GlobalEvents::Monitor::Run() +GlobalEvents::Monitor::RunDeferred() { const unsigned f = flags.exchange(0); diff --git a/src/event/DeferredMonitor.cxx b/src/event/DeferredMonitor.cxx index e4242414c..5e6d87f30 100644 --- a/src/event/DeferredMonitor.cxx +++ b/src/event/DeferredMonitor.cxx @@ -39,11 +39,11 @@ DeferredMonitor::Schedule() } void -DeferredMonitor::DoRun() +DeferredMonitor::Run() { const auto id = source_id.exchange(0); if (id != 0) - Run(); + RunDeferred(); } gboolean diff --git a/src/event/DeferredMonitor.hxx b/src/event/DeferredMonitor.hxx index e055b6c9d..abc11b0b3 100644 --- a/src/event/DeferredMonitor.hxx +++ b/src/event/DeferredMonitor.hxx @@ -48,10 +48,10 @@ public: void Cancel(); protected: - virtual void Run() = 0; + virtual void RunDeferred() = 0; private: - void DoRun(); + void Run(); static gboolean Callback(gpointer data); }; -- cgit v1.2.3