diff options
| author | Maxime Coste <frrrwww@gmail.com> | 2012-11-22 14:28:14 +0100 |
|---|---|---|
| committer | Maxime Coste <frrrwww@gmail.com> | 2012-11-22 14:28:14 +0100 |
| commit | 73c446e3790f9e8c95a1c4e18d3a739644dcfe70 (patch) | |
| tree | 27a4e0cc969baa73306af1dfef00bd99869dd2b9 /src/command_manager.hh | |
| parent | 7bcd0353cb801962fc85088040660b510315369a (diff) | |
code style cleanup in CommandManager
Diffstat (limited to 'src/command_manager.hh')
| -rw-r--r-- | src/command_manager.hh | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/command_manager.hh b/src/command_manager.hh index 07e7882b..f166f739 100644 --- a/src/command_manager.hh +++ b/src/command_manager.hh @@ -14,28 +14,25 @@ namespace Kakoune { -struct Context; - struct parse_error : runtime_error { parse_error(const String& error); }; +struct Context; using CommandParameters = memoryview<String>; - -typedef std::function<void (const CommandParameters&, - Context& context)> Command; - -typedef std::function<CandidateList (const Context& context, - const CommandParameters&, - size_t, ByteCount)> CommandCompleter; +using Command = std::function<void (const CommandParameters&, + Context& context)>; +using CommandCompleter = std::function<CandidateList (const Context& context, + const CommandParameters&, + size_t, ByteCount)>; class PerArgumentCommandCompleter { public: - typedef std::function<CandidateList (const Context&, - const String&, ByteCount)> ArgumentCompleter; - typedef memoryview<ArgumentCompleter> ArgumentCompleterList; + using ArgumentCompleter = std::function<CandidateList (const Context&, + const String&, ByteCount)>; + using ArgumentCompleterList = memoryview<ArgumentCompleter>; PerArgumentCommandCompleter(const ArgumentCompleterList& completers) : m_completers(completers.begin(), completers.end()) {} @@ -61,13 +58,13 @@ public: bool command_defined(const String& command_name) const; - void register_command(const String& command_name, + void register_command(String command_name, Command command, - const CommandCompleter& completer = CommandCompleter()); + CommandCompleter completer = CommandCompleter()); void register_commands(const memoryview<String>& command_names, Command command, - const CommandCompleter& completer = CommandCompleter()); + CommandCompleter completer = CommandCompleter()); private: void execute_single_command(const CommandParameters& params, |
