diff options
| author | Maxime Coste <frrrwww@gmail.com> | 2012-09-26 14:22:24 +0200 |
|---|---|---|
| committer | Maxime Coste <frrrwww@gmail.com> | 2012-09-26 14:22:24 +0200 |
| commit | efc069b531446c75e884dbaf06f0d490f617f128 (patch) | |
| tree | 0e1bf22635b895d66abd04c02c6af9fb9e7f66bc /src/client.hh | |
| parent | f76323f56e8d98ad5ae9f1b26f83689e008c8454 (diff) | |
Extract IncrementalInserter::Mode as InsertMode
move ClientMode classes in a namespace due to InsertMode name collisions
Diffstat (limited to 'src/client.hh')
| -rw-r--r-- | src/client.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client.hh b/src/client.hh index 27000ab4..d0a64bb3 100644 --- a/src/client.hh +++ b/src/client.hh @@ -5,7 +5,6 @@ #include "completion.hh" #include "utils.hh" #include "string.hh" -#include "window.hh" namespace Kakoune { @@ -18,6 +17,7 @@ using PromptCallback = std::function<void (const String&, Context&)>; using KeyCallback = std::function<void (const Key&, Context&)>; class ClientMode; +enum class InsertMode : unsigned; class Client : public SafeCountable { @@ -25,7 +25,7 @@ public: Client(); ~Client(); - void insert(Editor& editor, IncrementalInserter::Mode mode); + void insert(Editor& editor, InsertMode mode); void repeat_last_insert(Context& context); void prompt(const String& prompt, Completer completer, @@ -41,7 +41,7 @@ public: private: friend class ClientMode; std::unique_ptr<ClientMode> m_mode; - std::pair<IncrementalInserter::Mode, std::vector<Key>> m_last_insert; + std::pair<InsertMode, std::vector<Key>> m_last_insert; }; struct prompt_aborted {}; |
