* gcc does not like missing characters in keywords

[lyx.git] / src / LyX.h

diff --git a/src/LyX.h b/src/LyX.h
index b39ab729f0629252f71445c1222b04b904139313..76f9d59fe3e1399e5c970c021004a92d733e05d9 100644 (file)
--- a/src/LyX.h
+++ b/src/LyX.h
@@ -15,7 +15,7 @@
 #define LYX_H
 
 #include <boost/scoped_ptr.hpp>
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <string>
 
@@ -33,16 +33,19 @@ class Inset;
 class LyXFunc;
 class Server;
 class ServerSocket;
-class LyXView;
 class Messages;
 class Mover;
 class Movers;
 class Session;
 class KeyMap;
+class CmdDef;
 
 extern bool use_gui;
 
-namespace frontend { class Application; }
+namespace frontend {
+class Application;
+class LyXView;
+}
 
 /// initial startup
 class LyX : boost::noncopyable {
@@ -84,6 +87,9 @@ public:
        KeyMap & topLevelKeymap();
        KeyMap const & topLevelKeymap() const;
 
+       ///
+       CmdDef & topLevelCmdDef();
+
        ///
        Converters & converters();
        Converters & systemConverters();
@@ -96,12 +102,12 @@ public:
        void setGuiLanguage(std::string const & language);
 
        ///
-       LyXView * newLyXView();
+       frontend::LyXView * newLyXView();
 
        /** redraw \c inset in all the BufferViews in which it is currently
         *  visible. If successful return a pointer to the owning Buffer.
         */
-       Buffer const * const updateInset(Inset const *) const;
+       Buffer const * updateInset(Inset const *) const;
 
        void hideDialogs(std::string const & name, Inset * inset) const;
 
@@ -138,8 +144,6 @@ private:
 
        /// initial LyX set up
        bool init();
-       /// set up the default key bindings
-       void defaultKeyBindings(KeyMap * kbmap);
        /// set up the default dead key bindings if requested
        void deadKeyBindings(KeyMap * kbmap);
        /** Check for the existence of the user's support directory and,