next step...

[lyx.git] / src / trans_mgr.h

diff --git a/src/trans_mgr.h b/src/trans_mgr.h
index 93cc95adfe0c6ea49a3d8598a6777e530faac967..7b7e812c328baf60eabdbacafacd89ed0fcd40fb 100644 (file)
--- a/src/trans_mgr.h
+++ b/src/trans_mgr.h
@@ -19,12 +19,17 @@ class TransState {
 public:
        ///
        virtual ~TransState() {}
+#if 0
        ///
-       virtual string normalkey(char, char *) = 0;
+       virtual string const normalkey(char, string const &) = 0;
+#else
+       ///
+       virtual string const normalkey(char) = 0;
+#endif
        ///
        virtual bool backspace() = 0;
        ///
-       virtual string deadkey(char, KmodInfo) = 0;
+       virtual string const deadkey(char, KmodInfo) = 0;
        ///
        static char const TOKEN_SEP;
 };
@@ -43,8 +48,13 @@ protected:
        char deadkey2_;
        ///
        KmodInfo deadkey2_info_;
+#if 0
        ///
        KmodException comb_info_;
+#else
+       ///
+       Keyexc comb_info_;
+#endif
        ///
        TransState * init_state_;
        ///
@@ -61,49 +71,58 @@ public:
 
 
 /// Init State
-class TransInitState : 
-       virtual public TransFSMData,
-       public TransState {
+class TransInitState :         virtual public TransFSMData, public TransState {
 public:
        ///
        TransInitState();
+#if 0
        ///
-       virtual string normalkey(char, char *);
+       virtual string const normalkey(char, string const &);
+#else
+       ///
+       virtual string const normalkey(char);
+#endif
        ///
        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();
+#if 0
        ///
-       virtual string normalkey(char, char *);
+       virtual string const normalkey(char, string const &);
+#else
+       ///
+       virtual string const normalkey(char);
+#endif
        ///
        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();
+#if 0
        ///
-       virtual string normalkey(char, char *);
+       virtual string const normalkey(char, string const &);
+#else
+       ///
+       virtual string const normalkey(char);
+#endif
        ///
        virtual bool backspace() {
                // cancel the second deadkey
@@ -114,17 +133,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();
@@ -143,11 +160,11 @@ private:
        ///
        Trans * t2_;
        ///
-       static Trans * default_;
+       static Trans default_;
        ///
        CharacterSet chset_;
        ///
-       void insert(string, LyXText *);
+       void insert(string const &, LyXText *);
        ///
        void insertVerbatim(string const &, LyXText *);
 public:
@@ -166,7 +183,7 @@ public:
        ///
        void DisableKeymap();
        ///
-       bool setCharset(const char *);
+       bool setCharset(string const &);
        ///
        bool backspace() {
                return trans_fsm_.currentState->backspace();
@@ -174,21 +191,36 @@ public:
        ///
        void TranslateAndInsert(char, LyXText *);
        ///
-       inline string deadkey(char, KmodInfo);
+       string const deadkey(char, KmodInfo);
+#if 0
+       ///
+       string const normalkey(char, string const &);
+#else
        ///
-       inline string normalkey(char, char *);
+       string const normalkey(char);
+#endif
        ///
        void deadkey(char, tex_accent, LyXText *);
 };
 
 
-string TransManager::normalkey(char c, char * t)
+#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
 
 
-string TransManager::deadkey(char c, KmodInfo t)
+inline
+string const TransManager::deadkey(char c, KmodInfo t)
 {
        return trans_fsm_.currentState->deadkey(c, t);
 }