More fixes to insettabular/text (and some missing features added).

[lyx.git] / src / lyxfunc.h

diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index ec0685a265b850ba2411f1f066db3e51caf3d55b..ae7a8683ec6ddff0100289de6ab14654675c043f 100644 (file)
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -6,6 +6,7 @@
 #pragma interface
 #endif
 
+#include FORMS_H_LOCATION
 #include "commandtags.h"
 #include "kbsequence.h"
 #include "insets/lyxinset.h"
@@ -40,16 +41,16 @@ public:
        LyXFunc(LyXView *);
     
        /// LyX dispatcher, executes lyx actions.
-       string Dispatch(int action, char const * arg = 0);
+       string const Dispatch(int action, string const & arg = string());
                         
        /// The same but uses the name of a lyx command.
-       string Dispatch(string const & cmd);
+       string const Dispatch(string const & cmd);
 
        /// Same again but for xtl buffers.  Still looking for better idea.
        bool Dispatch(int action, auto_mem_buffer &);
 
-       /// A keyboard event is processed to execute a lyx action. 
-       int processKeyEvent(XEvent * ev);
+       ///
+       int processKeySym(KeySym k, unsigned int state);
 
        ///
        func_status getStatus(int ac) const;
@@ -60,13 +61,13 @@ public:
        // These can't be global because are part of the
        // internal state (ale970227)
        /// Get the current keyseq string
-       string keyseqStr() const;
+       string const keyseqStr() const;
 
        /// Is the key sequence uncomplete?
        bool keyseqUncomplete() const;
 
        /// get options for the current keyseq
-       string keyseqOptions() const;
+       string const keyseqOptions() const;
 
         /// True if lyxfunc reports an error
         bool errorStat() const { return errorstat; }
@@ -75,7 +76,7 @@ public:
         /// Buffer to store result messages
         void setErrorMessage(string const &) const; 
         /// Buffer to store result messages
-        string getMessage() const { return dispatch_buffer; }
+        string const getMessage() const { return dispatch_buffer; }
         /// Get next inset of this class from current cursor position  
         Inset * getInsetByCode(Inset::Code);
        
@@ -120,10 +121,6 @@ private:
 
        ///
        void doImport(string const &);
-       ///
-       void doImportHelper(string const &, string const &, string const &,
-               bool func(BufferView *, string const &) );
-
        ///
        void MenuInsertLyXFile(string const &);
 
@@ -146,7 +143,7 @@ bool LyXFunc::wasMetaKey() const
      
 
 inline
-string LyXFunc::keyseqStr() const
+string const LyXFunc::keyseqStr() const
 {
        // Why not just remove this function
        string text;
@@ -156,7 +153,7 @@ string LyXFunc::keyseqStr() const
 
 
 inline
-string LyXFunc::keyseqOptions() const
+string const LyXFunc::keyseqOptions() const
 {
        // Why not just remove this function
        string text;