Kaydet (Commit) f600e145 authored tarafından Michael Stahl's avatar Michael Stahl

framework: replace boost::bind with C++11 lambda or for loop

Change-Id: I3bee504b5a3dce7d89af77c8fcf2f9e24d5119ca
Reviewed-on: https://gerrit.libreoffice.org/22105Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 806d3498
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <boost/bind.hpp>
#include <boost/intrusive_ptr.hpp> #include <boost/intrusive_ptr.hpp>
#include <osl/conditn.hxx> #include <osl/conditn.hxx>
#include <osl/diagnose.h> #include <osl/diagnose.h>
......
...@@ -52,7 +52,6 @@ ...@@ -52,7 +52,6 @@
#include <unordered_map> #include <unordered_map>
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <boost/bind.hpp>
#include <boost/intrusive_ptr.hpp> #include <boost/intrusive_ptr.hpp>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
......
...@@ -29,8 +29,6 @@ ...@@ -29,8 +29,6 @@
#include <tools/diagnose_ex.h> #include <tools/diagnose_ex.h>
#include <osl/conditn.hxx> #include <osl/conditn.hxx>
#include <boost/bind.hpp>
#include <functional> #include <functional>
#include <stack> #include <stack>
#include <queue> #include <queue>
...@@ -371,12 +369,7 @@ namespace framework ...@@ -371,12 +369,7 @@ namespace framework
void UndoManagerHelper_Impl::enterUndoContext( const OUString& i_title, const bool i_hidden, IMutexGuard& i_instanceLock ) void UndoManagerHelper_Impl::enterUndoContext( const OUString& i_title, const bool i_hidden, IMutexGuard& i_instanceLock )
{ {
impl_processRequest( impl_processRequest(
::boost::bind( [this, &i_title, i_hidden] () { return this->impl_enterUndoContext(i_title, i_hidden); },
&UndoManagerHelper_Impl::impl_enterUndoContext,
this,
::boost::cref( i_title ),
i_hidden
),
i_instanceLock i_instanceLock
); );
} }
...@@ -384,10 +377,7 @@ namespace framework ...@@ -384,10 +377,7 @@ namespace framework
void UndoManagerHelper_Impl::leaveUndoContext( IMutexGuard& i_instanceLock ) void UndoManagerHelper_Impl::leaveUndoContext( IMutexGuard& i_instanceLock )
{ {
impl_processRequest( impl_processRequest(
::boost::bind( [this] () { return this->impl_leaveUndoContext(); },
&UndoManagerHelper_Impl::impl_leaveUndoContext,
this
),
i_instanceLock i_instanceLock
); );
} }
...@@ -402,11 +392,7 @@ namespace framework ...@@ -402,11 +392,7 @@ namespace framework
); );
impl_processRequest( impl_processRequest(
::boost::bind( [this, &i_action] () { return this->impl_addUndoAction(i_action); },
&UndoManagerHelper_Impl::impl_addUndoAction,
this,
::boost::ref( i_action )
),
i_instanceLock i_instanceLock
); );
} }
...@@ -414,10 +400,7 @@ namespace framework ...@@ -414,10 +400,7 @@ namespace framework
void UndoManagerHelper_Impl::clear( IMutexGuard& i_instanceLock ) void UndoManagerHelper_Impl::clear( IMutexGuard& i_instanceLock )
{ {
impl_processRequest( impl_processRequest(
::boost::bind( [this] () { return this->impl_clear(); },
&UndoManagerHelper_Impl::impl_clear,
this
),
i_instanceLock i_instanceLock
); );
} }
...@@ -425,10 +408,7 @@ namespace framework ...@@ -425,10 +408,7 @@ namespace framework
void UndoManagerHelper_Impl::clearRedo( IMutexGuard& i_instanceLock ) void UndoManagerHelper_Impl::clearRedo( IMutexGuard& i_instanceLock )
{ {
impl_processRequest( impl_processRequest(
::boost::bind( [this] () { return this->impl_clearRedo(); },
&UndoManagerHelper_Impl::impl_clearRedo,
this
),
i_instanceLock i_instanceLock
); );
} }
...@@ -436,10 +416,7 @@ namespace framework ...@@ -436,10 +416,7 @@ namespace framework
void UndoManagerHelper_Impl::reset( IMutexGuard& i_instanceLock ) void UndoManagerHelper_Impl::reset( IMutexGuard& i_instanceLock )
{ {
impl_processRequest( impl_processRequest(
::boost::bind( [this] () { return this->impl_reset(); },
&UndoManagerHelper_Impl::impl_reset,
this
),
i_instanceLock i_instanceLock
); );
} }
...@@ -894,12 +871,7 @@ namespace framework ...@@ -894,12 +871,7 @@ namespace framework
void UndoManagerHelper_Impl::undo( IMutexGuard& i_instanceLock ) void UndoManagerHelper_Impl::undo( IMutexGuard& i_instanceLock )
{ {
impl_processRequest( impl_processRequest(
::boost::bind( [this, &i_instanceLock] () { return this->impl_doUndoRedo(i_instanceLock, true); },
&UndoManagerHelper_Impl::impl_doUndoRedo,
this,
::boost::ref( i_instanceLock ),
true
),
i_instanceLock i_instanceLock
); );
} }
...@@ -907,12 +879,7 @@ namespace framework ...@@ -907,12 +879,7 @@ namespace framework
void UndoManagerHelper_Impl::redo( IMutexGuard& i_instanceLock ) void UndoManagerHelper_Impl::redo( IMutexGuard& i_instanceLock )
{ {
impl_processRequest( impl_processRequest(
::boost::bind( [this, &i_instanceLock] () { return this->impl_doUndoRedo(i_instanceLock, false); },
&UndoManagerHelper_Impl::impl_doUndoRedo,
this,
::boost::ref( i_instanceLock ),
false
),
i_instanceLock i_instanceLock
); );
} }
......
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include <vcl/dockingarea.hxx> #include <vcl/dockingarea.hxx>
#include <vcl/settings.hxx> #include <vcl/settings.hxx>
#include <boost/bind.hpp>
using namespace ::com::sun::star; using namespace ::com::sun::star;
...@@ -1281,8 +1280,12 @@ void ToolbarLayoutManager::implts_createNonContextSensitiveToolBars() ...@@ -1281,8 +1280,12 @@ void ToolbarLayoutManager::implts_createNonContextSensitiveToolBars()
} }
if ( !aMakeVisibleToolbars.empty() ) if ( !aMakeVisibleToolbars.empty() )
::std::for_each( aMakeVisibleToolbars.begin(), aMakeVisibleToolbars.end(), {
::boost::bind( &ToolbarLayoutManager::requestToolbar, this, _1)); for (auto const& rURL : aMakeVisibleToolbars)
{
this->requestToolbar(rURL);
}
}
} }
void ToolbarLayoutManager::implts_createCustomToolBars( const uno::Sequence< uno::Sequence< beans::PropertyValue > >& aTbxSeqSeq ) void ToolbarLayoutManager::implts_createCustomToolBars( const uno::Sequence< uno::Sequence< beans::PropertyValue > >& aTbxSeqSeq )
......
...@@ -63,7 +63,6 @@ ...@@ -63,7 +63,6 @@
#include <vcl/commandinfoprovider.hxx> #include <vcl/commandinfoprovider.hxx>
#include <svtools/menuoptions.hxx> #include <svtools/menuoptions.hxx>
#include <boost/bind.hpp>
// namespaces // namespaces
...@@ -587,7 +586,10 @@ void ToolBarManager::setToolBarImage(const Image& _aImage,const CommandToInfoMap ...@@ -587,7 +586,10 @@ void ToolBarManager::setToolBarImage(const Image& _aImage,const CommandToInfoMap
{ {
const ::std::vector< sal_uInt16 >& _rIDs = _pIter->second.aIds; const ::std::vector< sal_uInt16 >& _rIDs = _pIter->second.aIds;
m_pToolBar->SetItemImage( _pIter->second.nId, _aImage ); m_pToolBar->SetItemImage( _pIter->second.nId, _aImage );
::std::for_each(_rIDs.begin(), _rIDs.end(), ::boost::bind(&ToolBox::SetItemImage, m_pToolBar.get(), _1,_aImage)); for (auto const& it : _rIDs)
{
m_pToolBar->SetItemImage(it, _aImage);
}
} }
void SAL_CALL ToolBarManager::elementReplaced( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception) void SAL_CALL ToolBarManager::elementReplaced( const css::ui::ConfigurationEvent& Event ) throw (css::uno::RuntimeException, std::exception)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment