diff options
| author | Noel Grandin <noel@peralex.com> | 2016-07-04 13:35:04 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-07-04 12:55:14 +0000 |
| commit | f81316af4f3c69d1f405040f4eddc523ce792add (patch) | |
| tree | 142315d47f77de9d81d1b3a4d9f543cbd34f7317 /svx/source/sdr | |
| parent | d92b41ce9c87547fde5c43b3bea05b3be79a63f6 (diff) | |
merge sdr::event::EventHandler with sdr::event::TimerEventHandler
Change-Id: Id81c6b67d95d976dae417cf225bd43347c716d06
Reviewed-on: https://gerrit.libreoffice.org/26905
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svx/source/sdr')
| -rw-r--r-- | svx/source/sdr/contact/viewobjectcontactofgraphic.cxx | 4 | ||||
| -rw-r--r-- | svx/source/sdr/event/eventhandler.cxx | 39 |
2 files changed, 14 insertions, 29 deletions
diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx index 7b04b17a30ba..fa5028ae566f 100644 --- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx @@ -37,7 +37,7 @@ namespace sdr public: // basic constructor. - AsynchGraphicLoadingEvent(EventHandler& rEventHandler, sdr::contact::ViewObjectContactOfGraphic& rVOCOfGraphic); + AsynchGraphicLoadingEvent(TimerEventHandler& rEventHandler, sdr::contact::ViewObjectContactOfGraphic& rVOCOfGraphic); // destructor virtual ~AsynchGraphicLoadingEvent(); @@ -47,7 +47,7 @@ namespace sdr }; AsynchGraphicLoadingEvent::AsynchGraphicLoadingEvent( - EventHandler& rEventHandler, sdr::contact::ViewObjectContactOfGraphic& rVOCOfGraphic) + TimerEventHandler& rEventHandler, sdr::contact::ViewObjectContactOfGraphic& rVOCOfGraphic) : BaseEvent(rEventHandler), mrVOCOfGraphic(rVOCOfGraphic) { diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx index 908a7b4b5946..681d9cf673fe 100644 --- a/svx/source/sdr/event/eventhandler.cxx +++ b/svx/source/sdr/event/eventhandler.cxx @@ -28,7 +28,7 @@ namespace sdr { namespace event { - BaseEvent::BaseEvent(EventHandler& rEventHandler) + BaseEvent::BaseEvent(TimerEventHandler& rEventHandler) : mrEventHandler(rEventHandler) { mrEventHandler.AddEvent(*this); @@ -46,12 +46,12 @@ namespace sdr { namespace event { - void EventHandler::AddEvent(BaseEvent& rBaseEvent) + void TimerEventHandler::AddEvent(BaseEvent& rBaseEvent) { maVector.push_back(&rBaseEvent); } - void EventHandler::RemoveEvent(BaseEvent& rBaseEvent) + void TimerEventHandler::RemoveEvent(BaseEvent& rBaseEvent) { if(maVector.back() == &rBaseEvent) { @@ -60,7 +60,7 @@ namespace sdr } else { - const BaseEventVector::iterator aFindResult = ::std::find( + const auto aFindResult = ::std::find( maVector.begin(), maVector.end(), &rBaseEvent); DBG_ASSERT(aFindResult != maVector.end(), "EventHandler::RemoveEvent: Event to be removed not found (!)"); @@ -68,7 +68,7 @@ namespace sdr } } - BaseEvent* EventHandler::GetEvent() + BaseEvent* TimerEventHandler::GetEvent() { if(!maVector.empty()) { @@ -81,12 +81,15 @@ namespace sdr } } - EventHandler::EventHandler() + TimerEventHandler::TimerEventHandler() { + SetPriority(SchedulerPriority::HIGH); + Stop(); } - EventHandler::~EventHandler() + TimerEventHandler::~TimerEventHandler() { + Stop(); while(!maVector.empty()) { delete GetEvent(); @@ -94,7 +97,7 @@ namespace sdr } // Trigger and consume the events - void EventHandler::ExecuteEvents() + void TimerEventHandler::ExecuteEvents() { for(;;) { @@ -107,28 +110,10 @@ namespace sdr } // for control - bool EventHandler::IsEmpty() const + bool TimerEventHandler::IsEmpty() const { return (0L == maVector.size()); } - } // end of namespace mixer -} // end of namespace sdr - - -namespace sdr -{ - namespace event - { - TimerEventHandler::TimerEventHandler() - { - SetPriority(SchedulerPriority::HIGH); - Stop(); - } - - TimerEventHandler::~TimerEventHandler() - { - Stop(); - } // The timer when it is triggered; from class Timer void TimerEventHandler::Invoke() |