summaryrefslogtreecommitdiff
path: root/include/vcl
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2017-08-16 23:04:39 +0900
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-08-18 10:35:00 +0200
commit75539963e621faafdc0d3ef6759cadb2e0a5d9b4 (patch)
treed8a632850c455825a491a59fcd18311efc8014d2 /include/vcl
parentd7a9abdce528581362ac39185b51c9ff88e9d494 (diff)
vcl: DockingManager owns ImplDockingWindowWrappers
so simplify code with std::unique_ptr. Change-Id: Ieec470e0a5f52c0d652d169c1ced6ca7307f062f Reviewed-on: https://gerrit.libreoffice.org/41217 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/vcl')
-rw-r--r--include/vcl/dockwin.hxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index fb0b2863a8e8..92637db78771 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -24,6 +24,7 @@
#include <vcl/dllapi.h>
#include <vcl/builder.hxx>
#include <vcl/floatwin.hxx>
+#include <memory>
#include <vector>
// data to be sent with docking events
@@ -164,12 +165,15 @@ public:
class VCL_DLLPUBLIC DockingManager
{
- ::std::vector<ImplDockingWindowWrapper *> mDockingWindows;
+ std::vector<std::unique_ptr<ImplDockingWindowWrapper>> mvDockingWindows;
public:
DockingManager();
~DockingManager();
+ DockingManager& operator=( DockingManager const & ) = delete; // MSVC2015 workaround
+ DockingManager( DockingManager const & ) = delete; // MSVC2015 workaround
+
void AddWindow( const vcl::Window *pWin );
void RemoveWindow( const vcl::Window *pWin );