* do not ignore "requires" field in MathMacro

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index 233fe40a018e96e5ee653ac9285aa85021a7935c..807efc06188ceee2d91269c98cb42673b1914a92 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -27,24 +27,24 @@
 #include "ErrorList.h"
 #include "Format.h"
 #include "gettext.h"
-#include "kb_keymap.h"
+#include "KeyMap.h"
 #include "Language.h"
 #include "Session.h"
 #include "Color.h"
-#include "lyx_cb.h"
+#include "callback.h"
 #include "LyXAction.h"
 #include "LyXFunc.h"
 #include "Lexer.h"
 #include "LyXRC.h"
-#include "LyXServer.h"
-#include "LyXServerSocket.h"
-#include "LyXTextClassList.h"
+#include "Server.h"
+#include "ServerSocket.h"
+#include "TextClassList.h"
 #include "MenuBackend.h"
 #include "Messages.h"
 #include "Mover.h"
 #include "ToolbarBackend.h"
 
-#include "frontends/Alert.h"
+#include "frontends/alert.h"
 #include "frontends/Application.h"
 #include "frontends/Gui.h"
 #include "frontends/LyXView.h"
@@ -161,11 +161,11 @@ struct LyX::Singletons
        ///
        BufferList buffer_list_;
        ///
-       boost::scoped_ptr<kb_keymap> toplevel_keymap_;
+       boost::scoped_ptr<KeyMap> toplevel_keymap_;
        ///
-       boost::scoped_ptr<LyXServer> lyx_server_;
+       boost::scoped_ptr<Server> lyx_server_;
        ///
-       boost::scoped_ptr<LyXServerSocket> lyx_socket_;
+       boost::scoped_ptr<ServerSocket> lyx_socket_;
        ///
        boost::scoped_ptr<frontend::Application> application_;
        /// lyx session, containing lastfiles, lastfilepos, and lastopened
@@ -265,28 +265,28 @@ LyXFunc const & LyX::lyxFunc() const
 }
 
 
-LyXServer & LyX::server()
+Server & LyX::server()
 {
        BOOST_ASSERT(pimpl_->lyx_server_.get());
        return *pimpl_->lyx_server_.get(); 
 }
 
 
-LyXServer const & LyX::server() const 
+Server const & LyX::server() const 
 {
        BOOST_ASSERT(pimpl_->lyx_server_.get());
        return *pimpl_->lyx_server_.get(); 
 }
 
 
-LyXServerSocket & LyX::socket()
+ServerSocket & LyX::socket()
 {
        BOOST_ASSERT(pimpl_->lyx_socket_.get());
        return *pimpl_->lyx_socket_.get();
 }
 
 
-LyXServerSocket const & LyX::socket() const
+ServerSocket const & LyX::socket() const
 {
        BOOST_ASSERT(pimpl_->lyx_socket_.get());
        return *pimpl_->lyx_socket_.get();
@@ -307,7 +307,7 @@ frontend::Application const & LyX::application() const
 }
 
 
-kb_keymap & LyX::topLevelKeymap()
+KeyMap & LyX::topLevelKeymap()
 {
        BOOST_ASSERT(pimpl_->toplevel_keymap_.get());
        return *pimpl_->toplevel_keymap_.get();
@@ -326,7 +326,7 @@ Converters & LyX::systemConverters()
 }
 
 
-kb_keymap const & LyX::topLevelKeymap() const
+KeyMap const & LyX::topLevelKeymap() const
 {
        BOOST_ASSERT(pimpl_->toplevel_keymap_.get());
        return *pimpl_->toplevel_keymap_.get();
@@ -360,7 +360,7 @@ void LyX::setGuiLanguage(std::string const & language)
 }
 
 
-Buffer const * const LyX::updateInset(InsetBase const * inset) const
+Buffer const * const LyX::updateInset(Inset const * inset) const
 {
        if (!inset)
                return 0;
@@ -454,8 +454,8 @@ int LyX::exec(int & argc, char * argv[])
        */
        // Note: socket callback must be registered after init(argc, argv)
        // such that package().temp_dir() is properly initialized.
-       pimpl_->lyx_server_.reset(new LyXServer(&pimpl_->lyxfunc_, lyxrc.lyxpipes));
-       pimpl_->lyx_socket_.reset(new LyXServerSocket(&pimpl_->lyxfunc_, 
+       pimpl_->lyx_server_.reset(new Server(&pimpl_->lyxfunc_, lyxrc.lyxpipes));
+       pimpl_->lyx_socket_.reset(new ServerSocket(&pimpl_->lyxfunc_, 
                        FileName(package().temp_dir().absFilename() + "/lyxsocket")));
 
        // Start the real execution loop.
@@ -885,7 +885,7 @@ bool LyX::init()
                //setGuiLanguage(lyxrc.gui_language);
 
                // Set up bindings
-               pimpl_->toplevel_keymap_.reset(new kb_keymap);
+               pimpl_->toplevel_keymap_.reset(new KeyMap);
                defaultKeyBindings(pimpl_->toplevel_keymap_.get());
                pimpl_->toplevel_keymap_->read(lyxrc.bind_file);
 
@@ -938,7 +938,7 @@ bool LyX::init()
 }
 
 
-void LyX::defaultKeyBindings(kb_keymap  * kbmap)
+void LyX::defaultKeyBindings(KeyMap  * kbmap)
 {
        kbmap->bind("Right", FuncRequest(LFUN_CHAR_FORWARD));
        kbmap->bind("Left", FuncRequest(LFUN_CHAR_BACKWARD));
@@ -1007,7 +1007,7 @@ void LyX::emergencyCleanup() const
 }
 
 
-void LyX::deadKeyBindings(kb_keymap * kbmap)
+void LyX::deadKeyBindings(KeyMap * kbmap)
 {
        // bindKeyings for transparent handling of deadkeys
        // The keysyms are gotten from XFree86 X11R6
@@ -1464,7 +1464,7 @@ LyXFunc & theLyXFunc()
 }
 
 
-LyXServer & theLyXServer()
+Server & theServer()
 {
        // FIXME: this should not be use_gui dependent
        BOOST_ASSERT(use_gui);
@@ -1472,7 +1472,7 @@ LyXServer & theLyXServer()
 }
 
 
-LyXServerSocket & theLyXServerSocket()
+ServerSocket & theServerSocket()
 {
        // FIXME: this should not be use_gui dependent
        BOOST_ASSERT(use_gui);
@@ -1480,7 +1480,7 @@ LyXServerSocket & theLyXServerSocket()
 }
 
 
-kb_keymap & theTopLevelKeymap()
+KeyMap & theTopLevelKeymap()
 {
        BOOST_ASSERT(use_gui);
        return LyX::ref().topLevelKeymap();