]> git.lyx.org Git - features.git/blobdiff - src/LyXFunc.cpp
rename LyXKeySym into KeySymbol
[features.git] / src / LyXFunc.cpp
index ff93bd876deb171e237aef21b3cc96026182e2f9..1ea7b4acfc9d4d6f74ef30c90023339e392b79fa 100644 (file)
@@ -28,7 +28,7 @@
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "bufferview_funcs.h"
-#include "LCursor.h"
+#include "Cursor.h"
 #include "CutAndPaste.h"
 #include "debug.h"
 #include "DispatchResult.h"
 #include "Importer.h"
 #include "InsetIterator.h"
 #include "Intl.h"
-#include "kb_keymap.h"
+#include "KeyMap.h"
 #include "Language.h"
-#include "LColor.h"
+#include "Color.h"
 #include "Session.h"
 #include "LyX.h"
 #include "lyx_cb.h"
 #include "LyXAction.h"
 #include "lyxfind.h"
-#include "LyXLex.h"
+#include "Lexer.h"
 #include "LyXRC.h"
 #include "Row.h"
 #include "LyXServer.h"
@@ -80,7 +80,7 @@
 #include "frontends/FileDialog.h"
 #include "frontends/FontLoader.h"
 #include "frontends/Gui.h"
-#include "frontends/LyXKeySym.h"
+#include "frontends/KeySymbol.h"
 #include "frontends/LyXView.h"
 #include "frontends/Menubar.h"
 #include "frontends/Toolbars.h"
@@ -146,7 +146,7 @@ namespace fs = boost::filesystem;
 
 namespace {
 
-bool getLocalStatus(LCursor cursor,
+bool getLocalStatus(Cursor cursor,
               FuncRequest const & cmd, FuncStatus & status)
 {
        // Try to fix cursor in case it is broken.
@@ -155,10 +155,10 @@ bool getLocalStatus(LCursor cursor,
        // This is, of course, a mess. Better create a new doc iterator and use
        // this in Inset::getStatus. This might require an additional
        // BufferView * arg, though (which should be avoided)
-       //LCursor safe = *this;
+       //Cursor safe = *this;
        bool res = false;
        for ( ; cursor.depth(); cursor.pop()) {
-               //lyxerr << "\nLCursor::getStatus: cmd: " << cmd << endl << *this << endl;
+               //lyxerr << "\nCursor::getStatus: cmd: " << cmd << endl << *this << endl;
                BOOST_ASSERT(cursor.idx() <= cursor.lastidx());
                BOOST_ASSERT(cursor.pit() <= cursor.lastpit());
                BOOST_ASSERT(cursor.pos() <= cursor.lastpos());
@@ -207,10 +207,10 @@ LyXFunc::LyXFunc()
 }
 
 
-void LyXFunc::initKeySequences(kb_keymap * kb)
+void LyXFunc::initKeySequences(KeyMap * kb)
 {
-       keyseq.reset(new kb_sequence(kb, kb));
-       cancel_meta_seq.reset(new kb_sequence(kb, kb));
+       keyseq.reset(new KeySequence(kb, kb));
+       cancel_meta_seq.reset(new KeySequence(kb, kb));
 }
 
 
@@ -275,7 +275,7 @@ void LyXFunc::gotoBookmark(unsigned int idx, bool openFile, bool switchToBuffer)
 }
 
 
-void LyXFunc::processKeySym(LyXKeySymPtr keysym, key_modifier::state state)
+void LyXFunc::processKeySym(KeySymbolPtr keysym, key_modifier::state state)
 {
        LYXERR(Debug::KEY) << "KeySym is " << keysym->getSymbolName() << endl;
 
@@ -383,7 +383,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
        //lyxerr << "LyXFunc::getStatus: cmd: " << cmd << endl;
        FuncStatus flag;
 
-       LCursor & cur = view()->cursor();
+       Cursor & cur = view()->cursor();
 
        /* In LyX/Mac, when a dialog is open, the menus of the
           application can still be accessed without giving focus to
@@ -1271,11 +1271,11 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                        data = "literate ";
                                        break;
                                }
-                               data += LyXLex::quoteString(logfile.second);
+                               data += Lexer::quoteString(logfile.second);
                                lyx_view_->getDialogs().show("log", data);
                        } else if (name == "vclog") {
                                string const data = "vc " +
-                                       LyXLex::quoteString(lyx_view_->buffer()->lyxvc().getLogFile());
+                                       Lexer::quoteString(lyx_view_->buffer()->lyxvc().getLogFile());
                                lyx_view_->getDialogs().show("log", data);
                        } else
                                lyx_view_->getDialogs().show(name, data);
@@ -1489,8 +1489,8 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        }
 
                        bool const graphicsbg_changed =
-                               (lyx_name == lcolor.getLyXName(LColor::graphicsbg) &&
-                                x11_name != lcolor.getX11Name(LColor::graphicsbg));
+                               (lyx_name == lcolor.getLyXName(Color::graphicsbg) &&
+                                x11_name != lcolor.getX11Name(Color::graphicsbg));
 
                        if (!lcolor.setColor(lyx_name, x11_name)) {
                                setErrorMessage(
@@ -1556,7 +1556,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        InsetBase::Code const inset_code =
                                InsetBase::translate(name);
 
-                       LCursor & cur = view()->cursor();
+                       Cursor & cur = view()->cursor();
                        FuncRequest fr(LFUN_INSET_TOGGLE, action);
 
                        InsetBase & inset = lyx_view_->buffer()->inset();
@@ -1566,7 +1566,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                if (!it->asInsetMath()
                                    && (inset_code == InsetBase::NO_CODE
                                    || inset_code == it->lyxCode())) {
-                                       LCursor tmpcur = cur;
+                                       Cursor tmpcur = cur;
                                        tmpcur.pushLeft(*it);
                                        it->dispatch(tmpcur, fr);
                                }
@@ -1596,7 +1596,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        Buffer defaults(fname);
 
                        istringstream ss(argument);
-                       LyXLex lex(0,0);
+                       Lexer lex(0,0);
                        lex.setStream(ss);
                        int const unknown_tokens = defaults.readHeader(lex);
 
@@ -1621,7 +1621,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                lyx_view_->buffer()->params().getEngine();
 
                        istringstream ss(argument);
-                       LyXLex lex(0,0);
+                       Lexer lex(0,0);
                        lex.setStream(ss);
                        int const unknown_tokens =
                                lyx_view_->buffer()->readHeader(lex);
@@ -1635,7 +1635,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        if (engine == lyx_view_->buffer()->params().getEngine())
                                break;
 
-                       LCursor & cur = view()->cursor();
+                       Cursor & cur = view()->cursor();
                        FuncRequest fr(LFUN_INSET_REFRESH);
 
                        InsetBase & inset = lyx_view_->buffer()->inset();