X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftrans_mgr.h;h=4507f48272cef9a03678d5ec5252179452b7e10d;hb=98c966c64594611e469313314abd1e59524adb4a;hp=2145f6a5df839fa3454529e822abe5743cfec860;hpb=9f42e337f0f34729a52b73506d3c0fdfaad9acf0;p=lyx.git

diff --git a/src/trans_mgr.h b/src/trans_mgr.h
index 2145f6a5df..4507f48272 100644
--- 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;
 	///
@@ -49,7 +44,7 @@ protected:
 	///
 	KmodInfo deadkey2_info_;
 	///
-	KmodException comb_info_;
+	Keyexc comb_info_;
 	///
 	TransState * init_state_;
 	///
@@ -66,17 +61,12 @@ public:
 
 
 /// Init State
-class TransInitState : 	virtual public TransFSMData, public TransState {
+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; }
 	///
@@ -89,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_;
@@ -111,20 +96,15 @@ 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
 		deadkey2_ = 0;
 		deadkey2_info_.accent = TEX_NOACCENT;
 		currentState = deadkey_state_;
-		
+
 		return false;
 	}
 	///
@@ -187,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