ws cleanup

[lyx.git] / src / trans_mgr.h

diff --git a/src/trans_mgr.h b/src/trans_mgr.h
index f3abf31c13d8c45063450fc3035f9a4ff2e6d78e..4507f48272cef9a03678d5ec5252179452b7e10d 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) = 0;
        ///
        virtual bool backspace() = 0;
        ///
-       virtual string deadkey(char, KmodInfo) = 0;
+       virtual string const deadkey(char, KmodInfo) = 0;
        ///
        static char const TOKEN_SEP;
 };
@@ -44,7 +44,7 @@ protected:
        ///
        KmodInfo deadkey2_info_;
        ///
-       KmodException comb_info_;
+       Keyexc comb_info_;
        ///
        TransState * init_state_;
        ///
@@ -61,16 +61,16 @@ 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);
        ///
        virtual bool backspace() { return true; }
        ///
-       virtual string deadkey(char, KmodInfo);
+       virtual string const deadkey(char, KmodInfo);
 };
 
 
@@ -80,14 +80,14 @@ public:
        ///
        TransDeadkeyState();
        ///
-       virtual string normalkey(char, char *);
+       virtual string const normalkey(char);
        ///
        virtual bool backspace() {
                currentState = init_state_;
                return false;
        }
        ///
-       virtual string deadkey(char, KmodInfo);
+       virtual string const deadkey(char, KmodInfo);
 };
 
 
@@ -97,18 +97,18 @@ public:
        ///
        TransCombinedState();
        ///
-       virtual string normalkey(char, char *);
+       virtual string const normalkey(char);
        ///
        virtual bool backspace() {
                // cancel the second deadkey
                deadkey2_ = 0;
                deadkey2_info_.accent = TEX_NOACCENT;
                currentState = deadkey_state_;
-               
+
                return false;
        }
        ///
-       virtual string deadkey(char, KmodInfo);
+       virtual string const deadkey(char, KmodInfo);
 };
 
 
@@ -135,7 +135,7 @@ private:
        ///
        Trans * t2_;
        ///
-       static Trans * default_;
+       static Trans default_;
        ///
        CharacterSet chset_;
        ///
@@ -158,7 +158,7 @@ public:
        ///
        void DisableKeymap();
        ///
-       bool setCharset(const char *);
+       bool setCharset(string const &);
        ///
        bool backspace() {
                return trans_fsm_.currentState->backspace();
@@ -166,21 +166,23 @@ public:
        ///
        void TranslateAndInsert(char, LyXText *);
        ///
-       inline string deadkey(char, KmodInfo);
+       string const deadkey(char, KmodInfo);
        ///
-       inline string normalkey(char, char *);
+       string const normalkey(char);
        ///
        void deadkey(char, tex_accent, LyXText *);
 };
 
 
-string TransManager::normalkey(char c, char * t)
+inline
+string const TransManager::normalkey(char c)
 {
-       return trans_fsm_.currentState->normalkey(c, t);
+       return trans_fsm_.currentState->normalkey(c);
 }
 
 
-string TransManager::deadkey(char c, KmodInfo t)
+inline
+string const TransManager::deadkey(char c, KmodInfo t)
 {
        return trans_fsm_.currentState->deadkey(c, t);
 }