summaryrefslogtreecommitdiff
path: root/src/editor.hh
diff options
context:
space:
mode:
authorMaxime Coste <frrrwww@gmail.com>2012-11-30 18:32:49 +0100
committerMaxime Coste <frrrwww@gmail.com>2012-11-30 18:32:49 +0100
commitb764a0a63ed23434f5b6e82c4503c8efc7bbdf8b (patch)
tree7808410301651e188f063d05b8a374248d8cedb4 /src/editor.hh
parent956ac60d4ac1048ca8a5713c9ccc90941288aff0 (diff)
Selection: refactoring, move CaptureList to Selection
Diffstat (limited to 'src/editor.hh')
-rw-r--r--src/editor.hh10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/editor.hh b/src/editor.hh
index df2d0ffb..bcd7e027 100644
--- a/src/editor.hh
+++ b/src/editor.hh
@@ -39,8 +39,8 @@ enum class InsertMode : unsigned
class Editor : public SafeCountable
{
public:
- typedef std::function<SelectionAndCaptures (const Selection&)> Selector;
- typedef std::function<SelectionAndCapturesList (const Selection&)> MultiSelector;
+ typedef std::function<Selection (const Selection&)> Selector;
+ typedef std::function<SelectionList (const Selection&)> MultiSelector;
Editor(Buffer& buffer);
virtual ~Editor() {}
@@ -65,10 +65,10 @@ public:
void select(const BufferIterator& iterator);
void select(const Selector& selector,
SelectMode mode = SelectMode::Replace);
- void select(SelectionAndCapturesList selections);
+ void select(SelectionList selections);
void multi_select(const MultiSelector& selector);
- const SelectionAndCapturesList& selections() const { return m_selections; }
+ const SelectionList& selections() const { return m_selections; }
std::vector<String> selections_content() const;
bool undo();
@@ -95,7 +95,7 @@ private:
virtual void on_incremental_insertion_end() {}
safe_ptr<Buffer> m_buffer;
- SelectionAndCapturesList m_selections;
+ SelectionList m_selections;
FilterGroup m_filters;
};