tdf#97525 vcl: make DeletionListener internal

move include/vcl/impdel.hxx to vcl/inc/
include impdel.hxx in salframe.hxx
remove vcl/impdel.hxx includes in pch
add missing <list> includes

Change-Id: Id146363b2e20ce0238542929c26a83efb1e8c4bd
Reviewed-on: https://gerrit.libreoffice.org/23664
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

3 files changed, 83 insertions, 0 deletions

diff --git a/vcl/inc/impdel.hxx b/vcl/inc/impdel.hxx
new file mode 100644
index 000000000000..95f373b1dcb9
--- /dev/null
+++ b/vcl/inc/impdel.hxx
@@ -0,0 +1,81 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_VCL_IMPDEL_HXX
+#define INCLUDED_VCL_IMPDEL_HXX
+
+#include <list>
+
+namespace vcl
+{
+
+class DeletionListener;
+
+class DeletionNotifier
+{
+    std::list< DeletionListener* > m_aListeners;
+    protected:
+    DeletionNotifier() {}
+
+    ~DeletionNotifier()
+    { notifyDelete(); }
+
+    inline void notifyDelete();
+
+    public:
+    void addDel( DeletionListener* pListener )
+    { m_aListeners.push_back( pListener ); }
+
+    void removeDel( DeletionListener* pListener )
+    { m_aListeners.remove( pListener ); }
+};
+
+class DeletionListener
+{
+    DeletionNotifier*  m_pNotifier;
+    public:
+    DeletionListener( DeletionNotifier* pNotifier )
+    :  m_pNotifier( pNotifier )
+       {
+           if( m_pNotifier )
+               m_pNotifier->addDel( this );
+       }
+   ~DeletionListener()
+   {
+       if( m_pNotifier )
+           m_pNotifier->removeDel( this );
+   }
+   void deleted() { m_pNotifier = nullptr; }
+   bool isDeleted() const { return (m_pNotifier == nullptr); }
+};
+
+inline void DeletionNotifier::notifyDelete()
+{
+    for( std::list< DeletionListener* >::const_iterator it =
+            m_aListeners.begin(); it != m_aListeners.end(); ++it )
+       (*it)->deleted();
+
+    m_aListeners.clear();
+}
+
+} // namespace vcl
+
+#endif // INCLUDED_VCL_IMPDEL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index 11d95e825d70..134a6d6ecd32 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_VCL_INC_SALFRAME_HXX
 #define INCLUDED_VCL_INC_SALFRAME_HXX
 
+#include "impdel.hxx"
 #include "salwtype.hxx"
 #include "salgeom.hxx"
 
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index db8bdfb0b6d1..e06a6b1d07c9 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -25,6 +25,7 @@
 #include <vcl/idle.hxx>
 #include <vcl/rendersettings.hxx>
 
+#include <list>
 #include <vector>
 #include <set>