Andre Poenitz wrote:
On Wed, Sep 27, 2006 at 10:24:15AM -0000, [EMAIL PROTECTED] wrote:
URL: http://www.lyx.org/trac/file/lyx-devel/trunk/src/BufferView.C?rev=15161
==============================================================================
--- lyx-devel/trunk/src/BufferView.C (original)
+++ lyx-devel/trunk/src/BufferView.C Wed Sep 27 12:24:13 2006
@@ -186,7 +184,7 @@
                lyxerr[Debug::INFO] << BOOST_CURRENT_FUNCTION
                                    << " No Buffer!" << endl;
                // We are closing the buffer, use the first buffer as current
-               buffer_ = bufferlist.first();
+               buffer_ = theApp->bufferList().first();
        } else {
                // Set current buffer
                buffer_ = b;

Could you please add '-c' to your diff options so that we can see in
which function these changes are.

I didn't manage to configure tortoiseSVN to do that. Next time I will try to generate the diff by hand (but it is very cumbersome).


@@ -1484,8 +1481,8 @@
 Buffer const * Buffer::getMasterBuffer() const
 {
        if (!params().parentname.empty()
-           && bufferlist.exists(params().parentname)) {
-               Buffer const * buf = bufferlist.getBuffer(params().parentname);
+           && theApp->bufferList().exists(params().parentname)) {
+               Buffer const * buf = 
theApp->bufferList().getBuffer(params().parentname);
                if (buf)
                        return buf->getMasterBuffer();
        }

I wonder whether it might be better style to pass bufferlist as argument
to the function instead of accessing a singleton.

Agreed. Next step.


I am confused in general by LyX's idea of buffer, bufferlist,
BufferView, LyXView and application so this might be bogus...

It's not bogus. It's just that I am proceeding step by step.

Abdel.

Reply via email to