diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-08-03 17:20:26 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-08-03 17:20:26 +0200 |
| commit | 38a4b5ea2ab7188ce61d18c655893482dd098772 (patch) | |
| tree | bcd99d182901164ebdec9a57ba9a5deba435b729 /slideshow/source/engine/eventmultiplexer.cxx | |
| parent | 81f94ae79c7f5f3b49427dc7a8063a08baa797cf (diff) | |
slideshow: try to fix libc++/MSVC build by replacing boost::bind
Change-Id: I6418119f9d3e70ea89f7c8a094bbde42eeadec8c
Diffstat (limited to 'slideshow/source/engine/eventmultiplexer.cxx')
| -rw-r--r-- | slideshow/source/engine/eventmultiplexer.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx index d5c32fa9757e..2be7714360d3 100644 --- a/slideshow/source/engine/eventmultiplexer.cxx +++ b/slideshow/source/engine/eventmultiplexer.cxx @@ -351,7 +351,7 @@ void SAL_CALL EventMultiplexerListener::mousePressed( // might not be the main thread! if( mpEventQueue ) mpEventQueue->addEvent( - makeEvent( boost::bind( &EventMultiplexerImpl::mousePressed, + makeEvent( std::bind( &EventMultiplexerImpl::mousePressed, mpEventMultiplexer, e ), "EventMultiplexerImpl::mousePressed") ); @@ -366,7 +366,7 @@ void SAL_CALL EventMultiplexerListener::mouseReleased( // this might not be the main thread! if( mpEventQueue ) mpEventQueue->addEvent( - makeEvent( boost::bind( &EventMultiplexerImpl::mouseReleased, + makeEvent( std::bind( &EventMultiplexerImpl::mouseReleased, mpEventMultiplexer, e ), "EventMultiplexerImpl::mouseReleased") ); @@ -394,7 +394,7 @@ void SAL_CALL EventMultiplexerListener::mouseDragged( // might not be the main thread! if( mpEventQueue ) mpEventQueue->addEvent( - makeEvent( boost::bind( &EventMultiplexerImpl::mouseDragged, + makeEvent( std::bind( &EventMultiplexerImpl::mouseDragged, mpEventMultiplexer, e ), "EventMultiplexerImpl::mouseDragged") ); @@ -409,7 +409,7 @@ void SAL_CALL EventMultiplexerListener::mouseMoved( // might not be the main thread! if( mpEventQueue ) mpEventQueue->addEvent( - makeEvent( boost::bind( &EventMultiplexerImpl::mouseMoved, + makeEvent( std::bind( &EventMultiplexerImpl::mouseMoved, mpEventMultiplexer, e ), "EventMultiplexerImpl::mouseMoved") ); @@ -514,8 +514,7 @@ void EventMultiplexerImpl::tick() void EventMultiplexerImpl::scheduleTick() { EventSharedPtr pEvent( - makeDelay( boost::bind( &EventMultiplexerImpl::tick, - this ), + makeDelay( [this] () { this->tick(); }, mnTimeout, "EventMultiplexerImpl::tick with delay")); |