* lyx_main.[Ch]

[lyx.git] / src / lyxfunc.h

diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index 428709ce1571bc0aa9b64527f83d26b8718d6abd..549e778d897be8ed85797cbcdc508018144712df 100644 (file)
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -20,9 +20,10 @@
 
 #include "support/docstring.h"
 
-#include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
 #include <boost/signals/trackable.hpp>
 
+namespace lyx {
 
 class BufferView;
 class FuncRequest;
@@ -41,7 +42,7 @@ class LyXView;
 class LyXFunc : public boost::signals::trackable {
 public:
        ///
-       explicit LyXFunc(LyXView * lv = 0);
+       explicit LyXFunc();
 
        /// LyX dispatcher, executes lyx actions.
        void dispatch(FuncRequest const &);
@@ -49,6 +50,9 @@ public:
        ///
        void setLyXView(LyXView * lv);
 
+       ///
+       void initKeySequences(kb_keymap * kb);
+
        /// return the status bar state string
        std::string const viewStatusMessage();
 
@@ -64,11 +68,11 @@ public:
        /// True if lyxfunc reports an error
        bool errorStat() const { return errorstat; }
        /// Buffer to store result messages
-       void setMessage(lyx::docstring const & m) const;
+       void setMessage(docstring const & m) const;
        /// Buffer to store result messages
-       void setErrorMessage(lyx::docstring const &) const;
+       void setErrorMessage(docstring const &) const;
        /// Buffer to store result messages
-       lyx::docstring const getMessage() const { return dispatch_buffer; }
+       docstring const getMessage() const { return dispatch_buffer; }
        /// Handle a accented char key sequence
        void handleKeyFunc(kb_action action);
 
@@ -77,29 +81,28 @@ private:
        BufferView * view() const;
 
        ///
-       LyXView * owner;
+       LyXView * lyx_view_;
 
        /// the last character added to the key sequence, in ISO encoded form
-       lyx::char_type encoded_last_key;
+       char_type encoded_last_key;
 
        ///
-       kb_sequence keyseq;
+       boost::scoped_ptr<kb_sequence> keyseq;
        ///
-       kb_sequence cancel_meta_seq;
+       boost::scoped_ptr<kb_sequence> cancel_meta_seq;
        ///
        key_modifier::state meta_fake_bit;
-       ///
-       void setupLocalKeymap();
+
        /// Error status, only Dispatch can change this flag
        mutable bool errorstat;
 
        /** Buffer to store messages and result data. Is there a
            good reason to have this one as static in Dispatch? (Ale)
        */
-       mutable lyx::docstring dispatch_buffer;
+       mutable docstring dispatch_buffer;
 
        /// send a post-dispatch status message
-       void sendDispatchMessage(lyx::docstring const & msg,
+       void sendDispatchMessage(docstring const & msg,
                FuncRequest const & ev);
 
        // I think the following should be moved to BufferView. (Asger)
@@ -115,15 +118,15 @@ private:
        bool ensureBufferClean(BufferView * bv);
 };
 
+/// Implementation is in lyx_main.C
 extern LyXFunc & theLyXFunc();
 
-namespace lyx {
-
-/// Implementation is in frontends/Application.C
+/// Implementation is in lyx_main.C
 extern FuncStatus getStatus(FuncRequest const & action);
 
-/// Implementation is in frontends/Application.C
+/// Implementation is in lyx_main.C
 extern void dispatch(FuncRequest const & action);
-}
+
+} // namespace lyx
 
 #endif