Abdelrazak Younes wrote:
Abdelrazak Younes wrote:
Hello,

As discussed with Georg in another thread, this patch transfers the singletons defined in the Application class to the private LyX::Singletons implementation.

Singletons::lyx_func_ is a scoped_ptr instead of a full LyXFunc because the LyXFunc constructor needs some global variables that where not initialised at the time of the pimpl_ construction. This constructor needs some cleaning up.

I've done that. So this updated patch modifies the LyXFunc class. A LyXView is not needed any more at construction. Neither is the top level keymap. The LyXFunc key sequences are initialized only if we are in GUI mode.

I have also erased this private method LyXFunc::setupLocalKeymap() that was not used anywhere.

Once this patch is in, I will rename LyXFunc::owner to LyXFunc::lyx_view_ and put some BOOST_ASSERT. A classification between Gui and Kernel oriented LFUNs would be welcome.

The Singletons structure now also contains the formally global variable toplevel_keymap.

Committed.

Abdel.

Reply via email to