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 7b7e812c328baf60eabdbacafacd89ed0fcd40fb..1864bc80e3b0703668c4bf50bcb610d6141d718c 100644 (file)
--- a/src/trans_mgr.h
+++ b/src/trans_mgr.h
@@ -19,13 +19,8 @@ class TransState {
 public:
        ///
        virtual ~TransState() {}
-#if 0
-       ///
-       virtual string const normalkey(char, string const &) = 0;
-#else
        ///
        virtual string const normalkey(char) = 0;
-#endif
        ///
        virtual bool backspace() = 0;
        ///
@@ -48,13 +43,8 @@ protected:
        char deadkey2_;
        ///
        KmodInfo deadkey2_info_;
-#if 0
-       ///
-       KmodException comb_info_;
-#else
        ///
        Keyexc comb_info_;
-#endif
        ///
        TransState * init_state_;
        ///
@@ -75,13 +65,8 @@ class TransInitState :       virtual public TransFSMData, public TransState {
 public:
        ///
        TransInitState();
-#if 0
-       ///
-       virtual string const normalkey(char, string const &);
-#else
        ///
        virtual string const normalkey(char);
-#endif
        ///
        virtual bool backspace() { return true; }
        ///
@@ -94,13 +79,8 @@ class TransDeadkeyState : virtual public TransFSMData, public TransState {
 public:
        ///
        TransDeadkeyState();
-#if 0
-       ///
-       virtual string const normalkey(char, string const &);
-#else
        ///
        virtual string const normalkey(char);
-#endif
        ///
        virtual bool backspace() {
                currentState = init_state_;
@@ -116,13 +96,8 @@ class TransCombinedState : virtual public TransFSMData, public TransState {
 public:
        ///
        TransCombinedState();
-#if 0
-       ///
-       virtual string const normalkey(char, string const &);
-#else
        ///
        virtual string const normalkey(char);
-#endif
        ///
        virtual bool backspace() {
                // cancel the second deadkey
@@ -192,31 +167,18 @@ public:
        void TranslateAndInsert(char, LyXText *);
        ///
        string const deadkey(char, KmodInfo);
-#if 0
-       ///
-       string const normalkey(char, string const &);
-#else
        ///
        string const normalkey(char);
-#endif
        ///
        void deadkey(char, tex_accent, LyXText *);
 };
 
 
-#if 0
-inline
-string const TransManager::normalkey(char c, string const & t)
-{
-       return trans_fsm_.currentState->normalkey(c, t);
-}
-#else
 inline
 string const TransManager::normalkey(char c)
 {
        return trans_fsm_.currentState->normalkey(c);
 }
-#endif
 
 
 inline