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;
};
char deadkey2_;
///
KmodInfo deadkey2_info_;
+#if 0
///
KmodException comb_info_;
+#else
+ ///
+ Keyexc comb_info_;
+#endif
///
TransState * init_state_;
///
/// Init State
-class TransInitState:
- virtual public TransFSMData,
- public TransState {
+class TransInitState : virtual public TransFSMData, public TransState {
public:
- ///
- TransInitState();
- ///
- virtual string normalkey(char, char *);
- ///
- virtual bool backspace() { return true; }
- ///
- virtual string deadkey(char, KmodInfo);
+ ///
+ TransInitState();
+#if 0
+ ///
+ virtual string const normalkey(char, string const &);
+#else
+ ///
+ virtual string const normalkey(char);
+#endif
+ ///
+ virtual bool backspace() { return true; }
+ ///
+ virtual string const deadkey(char, KmodInfo);
};
/// Deadkey State
-class TransDeadkeyState:
- virtual public TransFSMData,
- public TransState {
+class TransDeadkeyState : virtual public TransFSMData, public TransState {
public:
- ///
- TransDeadkeyState();
- ///
- virtual string normalkey(char, char *);
- ///
- virtual bool backspace()
- {
+ ///
+ TransDeadkeyState();
+#if 0
+ ///
+ 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();
- ///
- virtual string normalkey(char, char *);
- ///
- virtual bool backspace()
- {
+ ///
+ TransCombinedState();
+#if 0
+ ///
+ virtual string const normalkey(char, string const &);
+#else
+ ///
+ virtual string const normalkey(char);
+#endif
+ ///
+ virtual bool backspace() {
// cancel the second deadkey
deadkey2_ = 0;
deadkey2_info_.accent = TEX_NOACCENT;
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();
};
+
///
-class TransManager
-{
+class TransManager {
private:
///
TransFSM trans_fsm_;
///
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:
///
void DisableKeymap();
///
- bool setCharset(const char *);
+ bool setCharset(string const &);
///
- bool backspace()
- {
+ bool backspace() {
return trans_fsm_.currentState->backspace();
}
///
void TranslateAndInsert(char, LyXText *);
///
- inline string deadkey(char, KmodInfo);
+ string const deadkey(char, KmodInfo);
+#if 0
///
- inline string normalkey(char, char *);
+ string const normalkey(char, string const &);
+#else
+ ///
+ 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);
}