xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use StringView in BufferManager

Browse Source
This commit is contained in:
Maxime Coste 2014-04-19 09:53:37 +01:00
parent 97b08a6f09
commit b2123547df
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/buffer_manager.cc
View File

@ -21,7 +21,7 @@ BufferManager::~BufferManager()
void BufferManager::register_buffer(Buffer& buffer) void BufferManager::register_buffer(Buffer& buffer)
{ {
const String& name = buffer.name(); StringView name = buffer.name();
for (auto& buf : m_buffers) for (auto& buf : m_buffers)
{ {
if (buf->name() == name) if (buf->name() == name)
@ -59,13 +59,13 @@ void BufferManager::delete_buffer(Buffer& buffer)
kak_assert(false); kak_assert(false);
} }
void BufferManager::delete_buffer_if_exists(const String& name) void BufferManager::delete_buffer_if_exists(StringView name)
{ {
if (Buffer* buf = get_buffer_ifp(name)) if (Buffer* buf = get_buffer_ifp(name))
delete_buffer(*buf); delete_buffer(*buf);
} }
Buffer* BufferManager::get_buffer_ifp(const String& name) Buffer* BufferManager::get_buffer_ifp(StringView name)
{ {
for (auto& buf : m_buffers) for (auto& buf : m_buffers)
{ {
@ -77,11 +77,11 @@ Buffer* BufferManager::get_buffer_ifp(const String& name)
return nullptr; return nullptr;
} }
Buffer& BufferManager::get_buffer(const String& name) Buffer& BufferManager::get_buffer(StringView name)
{ {
Buffer* res = get_buffer_ifp(name); Buffer* res = get_buffer_ifp(name);
if (not res) if (not res)
throw runtime_error("no such buffer '" + name + "'"); throw runtime_error("no such buffer '"_str + name + "'");
return *res; return *res;
} }

6
src/buffer_manager.hh
View File

@ -23,14 +23,14 @@ public:
void unregister_buffer(Buffer& buffer); void unregister_buffer(Buffer& buffer);
void delete_buffer(Buffer& buffer); void delete_buffer(Buffer& buffer);
void delete_buffer_if_exists(const String& name); void delete_buffer_if_exists(StringView name);
iterator begin() const { return m_buffers.cbegin(); } iterator begin() const { return m_buffers.cbegin(); }
iterator end() const { return m_buffers.cend(); } iterator end() const { return m_buffers.cend(); }
size_t count() const { return m_buffers.size(); } size_t count() const { return m_buffers.size(); }
Buffer* get_buffer_ifp(const String& name); Buffer* get_buffer_ifp(StringView name);
Buffer& get_buffer(const String& name); Buffer& get_buffer(StringView name);
void set_last_used_buffer(Buffer& buffer); void set_last_used_buffer(Buffer& buffer);
CandidateList complete_buffer_name(StringView prefix, CandidateList complete_buffer_name(StringView prefix,