Fix working of the spellchecker dialog with ispell when there are no

[lyx.git] / src / trans_mgr.h

diff --git a/src/trans_mgr.h b/src/trans_mgr.h
index 842c07ae2eac898a20aa3554b7f0c20baf2dc65b..7b7e812c328baf60eabdbacafacd89ed0fcd40fb 100644 (file)
--- a/src/trans_mgr.h
+++ b/src/trans_mgr.h
@@ -19,8 +19,13 @@ 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;
        ///
@@ -43,8 +48,13 @@ protected:
        char deadkey2_;
        ///
        KmodInfo deadkey2_info_;
+#if 0
        ///
        KmodException comb_info_;
+#else
+       ///
+       Keyexc comb_info_;
+#endif
        ///
        TransState * init_state_;
        ///
@@ -65,8 +75,13 @@ 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; }
        ///
@@ -79,8 +94,13 @@ 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_;
@@ -96,8 +116,13 @@ 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
@@ -166,20 +191,35 @@ public:
        ///
        void TranslateAndInsert(char, LyXText *);
        ///
-       inline string const deadkey(char, KmodInfo);
+       string const deadkey(char, KmodInfo);
+#if 0
        ///
-       inline string const normalkey(char, string const &);
+       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
 string const TransManager::deadkey(char c, KmodInfo t)
 {
        return trans_fsm_.currentState->deadkey(c, t);