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

[lyx.git] / src / trans_mgr.h

diff --git a/src/trans_mgr.h b/src/trans_mgr.h
index 1a6917386f585e9708336643c3e1ab2654074819..e45bf55adaa56a99202751ab2c7a02eb2bc550e1 100644 (file)
--- a/src/trans_mgr.h
+++ b/src/trans_mgr.h
@@ -20,11 +20,11 @@ public:
        ///
        virtual ~TransState() {}
        ///
-       virtual string normalkey(char, char *) = 0;
+       virtual string const normalkey(char, string const &) = 0;
        ///
        virtual bool backspace() = 0;
        ///
-       virtual string deadkey(char, KmodInfo) = 0;
+       virtual string const deadkey(char, KmodInfo) = 0;
        ///
        static char const TOKEN_SEP;
 };
@@ -61,49 +61,43 @@ public:
 
 
 /// Init State
-class TransInitState : 
-       virtual public TransFSMData,
-       public TransState {
+class TransInitState :         virtual public TransFSMData, public TransState {
 public:
        ///
        TransInitState();
        ///
-       virtual string normalkey(char, char *);
+       virtual string const normalkey(char, string const &);
        ///
        virtual bool backspace() { return true; }
        ///
-       virtual string deadkey(char, KmodInfo);
+       virtual string const deadkey(char, KmodInfo);
 };
 
 
 /// Deadkey State
-class TransDeadkeyState : 
-       virtual public TransFSMData,
-       public TransState {
+class TransDeadkeyState : virtual public TransFSMData, public TransState {
 public:
        ///
        TransDeadkeyState();
        ///
-       virtual string normalkey(char, char *);
+       virtual string const normalkey(char, string const &);
        ///
        virtual bool backspace() {
                currentState = init_state_;
                return false;
        }
        ///
-       virtual string deadkey(char, KmodInfo);
+       virtual string const deadkey(char, KmodInfo);
 };
 
 
 /// Combined State
-class TransCombinedState: 
-       virtual public TransFSMData,
-       public TransState {
+class TransCombinedState : virtual public TransFSMData, public TransState {
 public:
        ///
        TransCombinedState();
        ///
-       virtual string normalkey(char, char *);
+       virtual string const normalkey(char, string const &);
        ///
        virtual bool backspace() {
                // cancel the second deadkey
@@ -114,17 +108,15 @@ public:
                return false;
        }
        ///
-       virtual string deadkey(char, KmodInfo);
+       virtual string const deadkey(char, KmodInfo);
 };
 
 
 ///
-class TransFSM :       
-       virtual public TransFSMData,
-       public TransInitState,
-       public TransDeadkeyState,
-       public TransCombinedState
-{
+class TransFSM : virtual public TransFSMData,
+                public TransInitState,
+                public TransDeadkeyState,
+                public TransCombinedState {
 public:
        ///
        TransFSM();
@@ -166,7 +158,7 @@ public:
        ///
        void DisableKeymap();
        ///
-       bool setCharset(const char *);
+       bool setCharset(string const &);
        ///
        bool backspace() {
                return trans_fsm_.currentState->backspace();
@@ -174,21 +166,21 @@ public:
        ///
        void TranslateAndInsert(char, LyXText *);
        ///
-       inline string deadkey(char, KmodInfo);
+       inline string const deadkey(char, KmodInfo);
        ///
-       inline string normalkey(char, char *);
+       inline string const normalkey(char, string const &);
        ///
        void deadkey(char, tex_accent, LyXText *);
 };
 
 
-string TransManager::normalkey(char c, char * t)
+string const TransManager::normalkey(char c, string const & t)
 {
        return trans_fsm_.currentState->normalkey(c, t);
 }
 
 
-string TransManager::deadkey(char c, KmodInfo t)
+string const TransManager::deadkey(char c, KmodInfo t)
 {
        return trans_fsm_.currentState->deadkey(c, t);
 }