The graphics part of J�rgen S's latest patch + a few tweaks of my own.

[lyx.git] / src / trans_mgr.h

diff --git a/src/trans_mgr.h b/src/trans_mgr.h
index 842c07ae2eac898a20aa3554b7f0c20baf2dc65b..1864bc80e3b0703668c4bf50bcb610d6141d718c 100644 (file)
--- a/src/trans_mgr.h
+++ b/src/trans_mgr.h
@@ -20,7 +20,7 @@ public:
        ///
        virtual ~TransState() {}
        ///
-       virtual string const normalkey(char, string const &) = 0;
+       virtual string const normalkey(char) = 0;
        ///
        virtual bool backspace() = 0;
        ///
@@ -44,7 +44,7 @@ protected:
        ///
        KmodInfo deadkey2_info_;
        ///
-       KmodException comb_info_;
+       Keyexc comb_info_;
        ///
        TransState * init_state_;
        ///
@@ -66,7 +66,7 @@ public:
        ///
        TransInitState();
        ///
-       virtual string const normalkey(char, string const &);
+       virtual string const normalkey(char);
        ///
        virtual bool backspace() { return true; }
        ///
@@ -80,7 +80,7 @@ public:
        ///
        TransDeadkeyState();
        ///
-       virtual string const normalkey(char, string const &);
+       virtual string const normalkey(char);
        ///
        virtual bool backspace() {
                currentState = init_state_;
@@ -97,7 +97,7 @@ public:
        ///
        TransCombinedState();
        ///
-       virtual string const normalkey(char, string const &);
+       virtual string const normalkey(char);
        ///
        virtual bool backspace() {
                // cancel the second deadkey
@@ -166,20 +166,22 @@ public:
        ///
        void TranslateAndInsert(char, LyXText *);
        ///
-       inline string const deadkey(char, KmodInfo);
+       string const deadkey(char, KmodInfo);
        ///
-       inline string const normalkey(char, string const &);
+       string const normalkey(char);
        ///
        void deadkey(char, tex_accent, LyXText *);
 };
 
 
-string const TransManager::normalkey(char c, string const & t)
+inline
+string const TransManager::normalkey(char c)
 {
-       return trans_fsm_.currentState->normalkey(c, t);
+       return trans_fsm_.currentState->normalkey(c);
 }
 
 
+inline
 string const TransManager::deadkey(char c, KmodInfo t)
 {
        return trans_fsm_.currentState->deadkey(c, t);