X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftrans_mgr.h;h=4507f48272cef9a03678d5ec5252179452b7e10d;hb=28168bd4df9a568e79cdc57cb257743b7adb7c2a;hp=842c07ae2eac898a20aa3554b7f0c20baf2dc65b;hpb=3eea90dbbc24f9dafc6c0a42d5b14fe213dbcd6a;p=lyx.git

diff --git a/src/trans_mgr.h b/src/trans_mgr.h
index 842c07ae2e..4507f48272 100644
--- a/src/trans_mgr.h
+++ b/src/trans_mgr.h
@@ -20,7 +20,7 @@ public:
 	///
 	virtual ~TransState() {}
 	///
-	virtual string const normalkey(char, string const &) = 0;
+	virtual string const normalkey(char) = 0;
 	///
 	virtual bool backspace() = 0;
 	///
@@ -44,7 +44,7 @@ protected:
 	///
 	KmodInfo deadkey2_info_;
 	///
-	KmodException comb_info_;
+	Keyexc comb_info_;
 	///
 	TransState * init_state_;
 	///
@@ -61,12 +61,12 @@ public:
 
 
 /// Init State
-class TransInitState : 	virtual public TransFSMData, public TransState {
+class TransInitState :	virtual public TransFSMData, public TransState {
 public:
 	///
 	TransInitState();
 	///
-	virtual string const normalkey(char, string const &);
+	virtual string const normalkey(char);
 	///
 	virtual bool backspace() { return true; }
 	///
@@ -80,7 +80,7 @@ public:
 	///
 	TransDeadkeyState();
 	///
-	virtual string const normalkey(char, string const &);
+	virtual string const normalkey(char);
 	///
 	virtual bool backspace() {
 		currentState = init_state_;
@@ -97,14 +97,14 @@ public:
 	///
 	TransCombinedState();
 	///
-	virtual string const normalkey(char, string const &);
+	virtual string const normalkey(char);
 	///
 	virtual bool backspace() {
 		// cancel the second deadkey
 		deadkey2_ = 0;
 		deadkey2_info_.accent = TEX_NOACCENT;
 		currentState = deadkey_state_;
-		
+
 		return false;
 	}
 	///
@@ -166,20 +166,22 @@ public:
 	///
 	void TranslateAndInsert(char, LyXText *);
 	///
-	inline string const deadkey(char, KmodInfo);
+	string const deadkey(char, KmodInfo);
 	///
-	inline string const normalkey(char, string const &);
+	string const normalkey(char);
 	///
 	void deadkey(char, tex_accent, LyXText *);
 };
 
 
-string const TransManager::normalkey(char c, string const & t)
+inline
+string const TransManager::normalkey(char c)
 {
-	return trans_fsm_.currentState->normalkey(c, t);
+	return trans_fsm_.currentState->normalkey(c);
 }
 
 
+inline
 string const TransManager::deadkey(char c, KmodInfo t)
 {
 	return trans_fsm_.currentState->deadkey(c, t);