BufferManager no longer owns buffers, only register them

1 files changed, 5 insertions, 5 deletions

diff --git a/src/buffer_manager.hh b/src/buffer_manager.hh
index ee3473cd..7109dc11 100644
--- a/src/buffer_manager.hh
+++ b/src/buffer_manager.hh
@@ -1,20 +1,20 @@
 #ifndef buffer_manager_hh_INCLUDED
 #define buffer_manager_hh_INCLUDED
 
-#include "buffer.hh"
 #include "completion.hh"
 #include "utils.hh"
 
 #include <unordered_map>
-#include <memory>
 
 namespace Kakoune
 {
 
+class Buffer;
+
 class BufferManager : public Singleton<BufferManager>
 {
 public:
-    typedef std::unordered_map<std::string, std::unique_ptr<Buffer>> BufferMap;
+    typedef std::unordered_map<std::string, Buffer*> BufferMap;
 
     struct iterator : public BufferMap::const_iterator
     {
@@ -23,11 +23,11 @@ public:
         iterator() {}
         iterator(const parent_type& other) : parent_type(other) {}
         Buffer& operator*()  const { return *(parent_type::operator*().second); }
-        Buffer* operator->() const { return parent_type::operator*().second.get(); }
+        Buffer* operator->() const { return parent_type::operator*().second; }
     };
 
     void register_buffer(Buffer* buffer);
-    void delete_buffer(Buffer* buffer);
+    void unregister_buffer(Buffer* buffer);
 
     iterator begin() const { return iterator(m_buffers.begin()); }
     iterator end() const { return iterator(m_buffers.end()); }