Kaydet (Commit) 31eed9e7 authored tarafından Noel Grandin's avatar Noel Grandin

std::list->std::vector in DropTarget

Change-Id: I4fe707ccea55d8bdc4f108e8af5d5f0223a34776
Reviewed-on: https://gerrit.libreoffice.org/52542Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 221413dc
...@@ -83,7 +83,7 @@ void DropTarget::removeDropTargetListener( const Reference< XDropTargetListener ...@@ -83,7 +83,7 @@ void DropTarget::removeDropTargetListener( const Reference< XDropTargetListener
{ {
::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex );
m_aListeners.remove( xListener ); m_aListeners.erase( std::remove(m_aListeners.begin(), m_aListeners.end(), xListener), m_aListeners.end() );
} }
sal_Bool DropTarget::isActive() sal_Bool DropTarget::isActive()
...@@ -113,7 +113,7 @@ void DropTarget::setDefaultActions( sal_Int8 actions ) ...@@ -113,7 +113,7 @@ void DropTarget::setDefaultActions( sal_Int8 actions )
void DropTarget::drop( const DropTargetDropEvent& dtde ) throw() void DropTarget::drop( const DropTargetDropEvent& dtde ) throw()
{ {
osl::ClearableGuard< ::osl::Mutex > aGuard( m_aMutex ); osl::ClearableGuard< ::osl::Mutex > aGuard( m_aMutex );
std::list< Reference< XDropTargetListener > > aListeners( m_aListeners ); std::vector< Reference< XDropTargetListener > > aListeners( m_aListeners );
aGuard.clear(); aGuard.clear();
for (auto const& listener : aListeners) for (auto const& listener : aListeners)
...@@ -125,7 +125,7 @@ void DropTarget::drop( const DropTargetDropEvent& dtde ) throw() ...@@ -125,7 +125,7 @@ void DropTarget::drop( const DropTargetDropEvent& dtde ) throw()
void DropTarget::dragEnter( const DropTargetDragEnterEvent& dtde ) throw() void DropTarget::dragEnter( const DropTargetDragEnterEvent& dtde ) throw()
{ {
osl::ClearableGuard< ::osl::Mutex > aGuard( m_aMutex ); osl::ClearableGuard< ::osl::Mutex > aGuard( m_aMutex );
std::list< Reference< XDropTargetListener > > aListeners( m_aListeners ); std::vector< Reference< XDropTargetListener > > aListeners( m_aListeners );
aGuard.clear(); aGuard.clear();
for (auto const& listener : aListeners) for (auto const& listener : aListeners)
...@@ -137,7 +137,7 @@ void DropTarget::dragEnter( const DropTargetDragEnterEvent& dtde ) throw() ...@@ -137,7 +137,7 @@ void DropTarget::dragEnter( const DropTargetDragEnterEvent& dtde ) throw()
void DropTarget::dragExit( const DropTargetEvent& dte ) throw() void DropTarget::dragExit( const DropTargetEvent& dte ) throw()
{ {
osl::ClearableGuard< ::osl::Mutex > aGuard( m_aMutex ); osl::ClearableGuard< ::osl::Mutex > aGuard( m_aMutex );
std::list< Reference< XDropTargetListener > > aListeners( m_aListeners ); std::vector< Reference< XDropTargetListener > > aListeners( m_aListeners );
aGuard.clear(); aGuard.clear();
for (auto const& listener : aListeners) for (auto const& listener : aListeners)
...@@ -149,7 +149,7 @@ void DropTarget::dragExit( const DropTargetEvent& dte ) throw() ...@@ -149,7 +149,7 @@ void DropTarget::dragExit( const DropTargetEvent& dte ) throw()
void DropTarget::dragOver( const DropTargetDragEvent& dtde ) throw() void DropTarget::dragOver( const DropTargetDragEvent& dtde ) throw()
{ {
osl::ClearableGuard< ::osl::Mutex > aGuard( m_aMutex ); osl::ClearableGuard< ::osl::Mutex > aGuard( m_aMutex );
std::list< Reference< XDropTargetListener > > aListeners( m_aListeners ); std::vector< Reference< XDropTargetListener > > aListeners( m_aListeners );
aGuard.clear(); aGuard.clear();
for (auto const& listener : aListeners) for (auto const& listener : aListeners)
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <list> #include <list>
#include <unordered_map> #include <unordered_map>
#include <vector>
#include <X11/Xlib.h> #include <X11/Xlib.h>
...@@ -77,7 +78,7 @@ namespace x11 { ...@@ -77,7 +78,7 @@ namespace x11 {
::Window m_aTargetWindow; ::Window m_aTargetWindow;
rtl::Reference<SelectionManager> rtl::Reference<SelectionManager>
m_xSelectionManager; m_xSelectionManager;
::std::list< css::uno::Reference< css::datatransfer::dnd::XDropTargetListener > > ::std::vector< css::uno::Reference< css::datatransfer::dnd::XDropTargetListener > >
m_aListeners; m_aListeners;
DropTarget(); DropTarget();
......
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