Applied Angus patch to compile on DEC C++ and to avoid name clashes

[lyx.git] / src / lyxfunc.h

diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index ced5a7dc41c0dd6d73b32f27f908bc88be5d68ab..b4948a56c720c4aac5653e87a7e8a12242e6d404 100644 (file)
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -41,23 +41,21 @@ 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 &);
 
- #if FL_REVISION < 89
-       /// A keyboard event is processed to execute a lyx action. 
-       int processKeyEvent(XEvent * ev);
- #else
        ///
        int processKeySym(KeySym k, unsigned int state);
- #endif
-       ///
+
+       /// we need one internall which is called from inside LyXAction and
+       /// can contain the string argument.
        func_status getStatus(int ac) const;
+       func_status getStatus(int ac, string const & not_to_use_arg) const;
        
        /// The last key was meta
        bool wasMetaKey() const;
@@ -65,13 +63,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; }
@@ -80,10 +78,9 @@ public:
         /// Buffer to store result messages
         void setErrorMessage(string const &) const; 
         /// Buffer to store result messages
-        string getMessage() const { return dispatch_buffer; }
-        /// Get next inset of this class from current cursor position  
-        Inset * getInsetByCode(Inset::Code);
-       
+        string const getMessage() const { return dispatch_buffer; }
+       /// Handle a accented char keysequenze
+       void handleKeyFunc(kb_action action);
        /// Should a hint message be displayed?
        void setHintMessage(bool);
 private:
@@ -98,7 +95,7 @@ private:
        ///
        unsigned meta_fake_bit;
        ///
-       void moveCursorUpdate(bool selecting = false);
+       void moveCursorUpdate(bool flag = true, bool selecting = false);
        ///
        void setupLocalKeymap();
         ///
@@ -121,22 +118,21 @@ private:
        void MenuNew(bool fromTemplate);
 
        ///
-       void MenuOpen();
+       void Open(string const &);
 
        ///
        void doImport(string const &);
-       ///
-       void doImportHelper(string const &, string const &, string const &,
-               bool func(BufferView *, string const &) );
-
-       ///
-       void MenuInsertLyXFile(string const &);
 
        ///
        void CloseBuffer();
        ///
        void reloadBuffer();
-       /// This is the same for all lyxfunc objects
+       ///
+       //  This return or directly text (default) of getLyXText()
+       ///
+       LyXText * TEXT(bool) const;
+       ///
+       //  This is the same for all lyxfunc objects
        static bool show_sc;
 };
      
@@ -151,7 +147,7 @@ bool LyXFunc::wasMetaKey() const
      
 
 inline
-string LyXFunc::keyseqStr() const
+string const LyXFunc::keyseqStr() const
 {
        // Why not just remove this function
        string text;
@@ -161,7 +157,7 @@ string LyXFunc::keyseqStr() const
 
 
 inline
-string LyXFunc::keyseqOptions() const
+string const LyXFunc::keyseqOptions() const
 {
        // Why not just remove this function
        string text;