cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / lyxfunc.h

diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index 21d34fda034c78fe045db3967a8b3f2178f8cb53..7a2b322e69068ba4592e29e12ca1d0ee6f176b0a 100644 (file)
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -18,6 +18,8 @@
 #include "kbsequence.h"
 #include "lfuns.h"
 
+#include "support/docstring.h"
+
 #include <boost/shared_ptr.hpp>
 #include <boost/signals/trackable.hpp>
 
@@ -39,20 +41,14 @@ class LyXView;
 class LyXFunc : public boost::signals::trackable {
 public:
        ///
-       explicit
-       LyXFunc(LyXView *);
+       explicit LyXFunc(LyXView *);
 
        /// LyX dispatcher, executes lyx actions.
-       void dispatch(FuncRequest const &, bool verbose = false);
-
-       /// Dispatch via a string argument
-       void dispatch(std::string const & s, bool verbose = false);
+       void dispatch(FuncRequest const &);
 
        /// return the status bar state string
-       std::string const view_status_message();
+       std::string const viewStatusMessage();
 
-       ///
-       typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
        ///
        void processKeySym(LyXKeySymPtr key, key_modifier::state state);
 
@@ -65,15 +61,11 @@ public:
        /// True if lyxfunc reports an error
        bool errorStat() const { return errorstat; }
        /// Buffer to store result messages
-       void setMessage(std::string const & m) const;
+       void setMessage(lyx::docstring const & m) const;
        /// Buffer to store result messages
-       void setErrorMessage(std::string const &) const;
-       /// Buffer to store result messages from getStatus
-       void setStatusMessage(std::string const &) const;
+       void setErrorMessage(lyx::docstring const &) const;
        /// Buffer to store result messages
-       std::string const getMessage() const { return dispatch_buffer; }
-       /// Buffer to store result messages
-       std::string const getStatusMessage() const { return status_buffer; }
+       lyx::docstring const getMessage() const { return dispatch_buffer; }
        /// Handle a accented char key sequence
        void handleKeyFunc(kb_action action);
 
@@ -85,7 +77,7 @@ private:
        LyXView * owner;
 
        /// the last character added to the key sequence, in ISO encoded form
-       char encoded_last_key;
+       lyx::char_type encoded_last_key;
 
        ///
        kb_sequence keyseq;
@@ -94,8 +86,6 @@ private:
        ///
        key_modifier::state meta_fake_bit;
        ///
-       void moveCursorUpdate();
-       ///
        void setupLocalKeymap();
        /// Error status, only Dispatch can change this flag
        mutable bool errorstat;
@@ -103,25 +93,19 @@ private:
        /** Buffer to store messages and result data. Is there a
            good reason to have this one as static in Dispatch? (Ale)
        */
-       mutable std::string dispatch_buffer;
-       /** Buffer to store messages and result data from getStatus
-       */
-       mutable std::string status_buffer;
+       mutable lyx::docstring dispatch_buffer;
 
        /// send a post-dispatch status message
-       void sendDispatchMessage(std::string const & msg, FuncRequest const & ev, bool verbose);
+       void sendDispatchMessage(lyx::docstring const & msg,
+               FuncRequest const & ev);
 
        // I think the following should be moved to BufferView. (Asger)
-
        ///
        void menuNew(std::string const & argument, bool fromTemplate);
-
        ///
        void open(std::string const &);
-
        ///
        void doImport(std::string const &);
-
        ///
        void closeBuffer();
 };