Move change listener registration to BufferChangeListener_AutoRegister

DynamicSelectionList now just inherit from this class, so that
the registration logic can be shared.

1 files changed, 4 insertions, 46 deletions

diff --git a/src/dynamic_selection_list.cc b/src/dynamic_selection_list.cc
index bca16293..a258ddd7 100644
--- a/src/dynamic_selection_list.cc
+++ b/src/dynamic_selection_list.cc
@@ -5,55 +5,12 @@ namespace Kakoune
 
 DynamicSelectionList::DynamicSelectionList(const Buffer& buffer,
                                            SelectionList selections)
-    : m_buffer(&buffer), SelectionList(std::move(selections))
+    : SelectionList(std::move(selections)),
+      BufferChangeListener_AutoRegister(buffer)
 {
-    m_buffer->change_listeners().insert(this);
     check_invariant();
 }
 
-DynamicSelectionList::~DynamicSelectionList()
-{
-    m_buffer->change_listeners().erase(this);
-}
-
-DynamicSelectionList::DynamicSelectionList(const DynamicSelectionList& other)
-    : SelectionList(other), m_buffer(other.m_buffer)
-{
-    m_buffer->change_listeners().insert(this);
-}
-
-DynamicSelectionList& DynamicSelectionList::operator=(const DynamicSelectionList& other)
-{
-    SelectionList::operator=((const SelectionList&)other);
-    if (m_buffer != other.m_buffer)
-    {
-        m_buffer->change_listeners().erase(this);
-        m_buffer = other.m_buffer;
-        m_buffer->change_listeners().insert(this);
-    }
-    check_invariant();
-    return *this;
-}
-
-DynamicSelectionList::DynamicSelectionList(DynamicSelectionList&& other)
-    : SelectionList(std::move(other)), m_buffer(other.m_buffer)
-{
-    m_buffer->change_listeners().insert(this);
-}
-
-DynamicSelectionList& DynamicSelectionList::operator=(DynamicSelectionList&& other)
-{
-    SelectionList::operator=(std::move(other));
-    if (m_buffer != other.m_buffer)
-    {
-        m_buffer->change_listeners().erase(this);
-        m_buffer = other.m_buffer;
-        m_buffer->change_listeners().insert(this);
-    }
-    check_invariant();
-    return *this;
-}
-
 DynamicSelectionList& DynamicSelectionList::operator=(SelectionList selections)
 {
     SelectionList::operator=(std::move(selections));
@@ -64,9 +21,10 @@ DynamicSelectionList& DynamicSelectionList::operator=(SelectionList selections)
 void DynamicSelectionList::check_invariant() const
 {
 #ifdef KAK_DEBUG
+    const Buffer* buf = &buffer();
     for (auto& sel : *this)
     {
-        assert(m_buffer == &sel.buffer());
+        assert(buf == &sel.buffer());
         sel.check_invariant();
     }
 #endif