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

OptionDescs are const in OptionRegistry

Browse Source
This commit is contained in:
Maxime Coste 2016-09-26 22:59:02 +01:00
parent 5e3effc1f0
commit a0c20a924a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/option_manager.cc
View File

@ -115,7 +115,7 @@ void OptionManager::on_option_changed(const Option& option)
CandidateList OptionsRegistry::complete_option_name(StringView prefix, CandidateList OptionsRegistry::complete_option_name(StringView prefix,
ByteCount cursor_pos) const ByteCount cursor_pos) const
{ {
using OptionPtr = std::unique_ptr<OptionDesc>; using OptionPtr = std::unique_ptr<const OptionDesc>;
return complete(prefix, cursor_pos, m_descs | return complete(prefix, cursor_pos, m_descs |
filter([](const OptionPtr& desc) filter([](const OptionPtr& desc)
{ return not (desc->flags() & OptionFlags::Hidden); }) | { return not (desc->flags() & OptionFlags::Hidden); }) |

4
src/option_manager.hh
View File

@ -234,7 +234,7 @@ public:
const OptionDesc* option_desc(StringView name) const const OptionDesc* option_desc(StringView name) const
{ {
auto it = find_if(m_descs, auto it = find_if(m_descs,
[&name](const std::unique_ptr<OptionDesc>& opt) [&name](const std::unique_ptr<const OptionDesc>& opt)
{ return opt->name() == name; }); { return opt->name() == name; });
return it != m_descs.end() ? it->get() : nullptr; return it != m_descs.end() ? it->get() : nullptr;
} }
@ -244,7 +244,7 @@ public:
CandidateList complete_option_name(StringView prefix, ByteCount cursor_pos) const; CandidateList complete_option_name(StringView prefix, ByteCount cursor_pos) const;
private: private:
OptionManager& m_global_manager; OptionManager& m_global_manager;
Vector<std::unique_ptr<OptionDesc>, MemoryDomain::Options> m_descs; Vector<std::unique_ptr<const OptionDesc>, MemoryDomain::Options> m_descs;
}; };
} }