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

Yet more StringView params, less const String&

Browse Source
This commit is contained in:
Maxime Coste 2014-11-16 20:55:36 +00:00
parent ece03c3599
commit b43f0fb853
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/option_manager.cc
View File

@ -39,7 +39,7 @@ void OptionManager::unregister_watcher(OptionManagerWatcher& watcher)
m_watchers.erase(it); m_watchers.erase(it);
} }
Option& OptionManager::get_local_option(const String& name) Option& OptionManager::get_local_option(StringView name)
{ {
auto it = find_option(m_options, name); auto it = find_option(m_options, name);
if (it != m_options.end()) if (it != m_options.end())
@ -54,7 +54,7 @@ Option& OptionManager::get_local_option(const String& name)
} }
Option& OptionManager::operator[](const String& name) Option& OptionManager::operator[](StringView name)
{ {
auto it = find_option(m_options, name); auto it = find_option(m_options, name);
if (it != m_options.end()) if (it != m_options.end())
@ -65,7 +65,7 @@ Option& OptionManager::operator[](const String& name)
throw option_not_found(name); throw option_not_found(name);
} }
const Option& OptionManager::operator[](const String& name) const const Option& OptionManager::operator[](StringView name) const
{ {
return const_cast<OptionManager&>(*this)[name]; return const_cast<OptionManager&>(*this)[name];
} }

16
src/option_manager.hh
View File

@ -55,8 +55,8 @@ public:
template<typename T> bool is_of_type() const; template<typename T> bool is_of_type() const;
virtual String get_as_string() const = 0; virtual String get_as_string() const = 0;
virtual void set_from_string(const String& str) = 0; virtual void set_from_string(StringView str) = 0;
virtual void add_from_string(const String& str) = 0; virtual void add_from_string(StringView str) = 0;
virtual Option* clone(OptionManager& manager) const = 0; virtual Option* clone(OptionManager& manager) const = 0;
OptionManager& manager() const { return m_manager; } OptionManager& manager() const { return m_manager; }
@ -86,9 +86,9 @@ public:
OptionManager(OptionManager& parent); OptionManager(OptionManager& parent);
~OptionManager(); ~OptionManager();
Option& operator[] (const String& name); Option& operator[] (StringView name);
const Option& operator[] (const String& name) const; const Option& operator[] (StringView name) const;
Option& get_local_option(const String& name); Option& get_local_option(StringView name);
CandidateList complete_option_name(StringView prefix, CandidateList complete_option_name(StringView prefix,
ByteCount cursor_pos); ByteCount cursor_pos);
@ -137,13 +137,13 @@ public:
{ {
return option_to_string(m_value); return option_to_string(m_value);
} }
void set_from_string(const String& str) override void set_from_string(StringView str) override
{ {
T val; T val;
option_from_string(str, val); option_from_string(str, val);
set(std::move(val)); set(std::move(val));
} }
void add_from_string(const String& str) override void add_from_string(StringView str) override
{ {
T val; T val;
option_from_string(str, val); option_from_string(str, val);
@ -181,7 +181,7 @@ template<typename T> bool Option::is_of_type() const
} }
template<typename T> template<typename T>
auto find_option(T& container, const String& name) -> decltype(container.begin()) auto find_option(T& container, StringView name) -> decltype(container.begin())
{ {
using ptr_type = decltype(*container.begin()); using ptr_type = decltype(*container.begin());
return find_if(container, [&name](const ptr_type& opt) { return opt->name() == name; }); return find_if(container, [&name](const ptr_type& opt) { return opt->name() == name; });