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

Context: do not store buffer, ask editor for it

Browse Source
This commit is contained in:
Maxime Coste 2012-08-15 17:32:46 +02:00
parent 9e3323bf68
commit 99eaa259e6
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/context.hh
View File

@ -12,19 +12,19 @@ struct Context
{ {
Context() {} Context() {}
Context(Editor& editor) Context(Editor& editor)
: m_editor(&editor), m_buffer(&editor.buffer()) {} : m_editor(&editor) {}
// to allow func(Context(Editor(...))) // to allow func(Context(Editor(...)))
Context(Editor&& editor) Context(Editor&& editor)
: m_editor(&editor), m_buffer(&editor.buffer()) {} : m_editor(&editor) {}
Buffer& buffer() const Buffer& buffer() const
{ {
if (not has_buffer()) if (not has_buffer())
throw runtime_error("no buffer in context"); throw runtime_error("no buffer in context");
return *m_buffer; return m_editor->buffer();
} }
bool has_buffer() const { return m_buffer; } bool has_buffer() const { return m_editor; }
Editor& editor() const Editor& editor() const
{ {
@ -56,8 +56,6 @@ struct Context
public: public:
safe_ptr<Editor> m_editor; safe_ptr<Editor> m_editor;
safe_ptr<Buffer> m_buffer;
int m_numeric_param = 0; int m_numeric_param = 0;
}; };