X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftrans_mgr.h;h=4507f48272cef9a03678d5ec5252179452b7e10d;hb=28168bd4df9a568e79cdc57cb257743b7adb7c2a;hp=1a6917386f585e9708336643c3e1ab2654074819;hpb=532141facfd18627e9972f7a4f3d2032d18e0d2c;p=lyx.git

diff --git a/src/trans_mgr.h b/src/trans_mgr.h
index 1a6917386f..4507f48272 100644
--- a/src/trans_mgr.h
+++ b/src/trans_mgr.h
@@ -20,11 +20,11 @@ public:
 	///
 	virtual ~TransState() {}
 	///
-	virtual string normalkey(char, char *) = 0;
+	virtual string const normalkey(char) = 0;
 	///
 	virtual bool backspace() = 0;
 	///
-	virtual string deadkey(char, KmodInfo) = 0;
+	virtual string const deadkey(char, KmodInfo) = 0;
 	///
 	static char const TOKEN_SEP;
 };
@@ -44,7 +44,7 @@ protected:
 	///
 	KmodInfo deadkey2_info_;
 	///
-	KmodException comb_info_;
+	Keyexc comb_info_;
 	///
 	TransState * init_state_;
 	///
@@ -61,70 +61,62 @@ public:
 
 
 /// Init State
-class TransInitState : 
-	virtual public TransFSMData,
-	public TransState {
+class TransInitState :	virtual public TransFSMData, public TransState {
 public:
 	///
 	TransInitState();
 	///
-	virtual string normalkey(char, char *);
+	virtual string const normalkey(char);
 	///
 	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();
 	///
-	virtual string normalkey(char, char *);
+	virtual string const normalkey(char);
 	///
 	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 string const normalkey(char);
 	///
 	virtual bool backspace() {
 		// cancel the second deadkey
 		deadkey2_ = 0;
 		deadkey2_info_.accent = TEX_NOACCENT;
 		currentState = deadkey_state_;
-		
+
 		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,7 +135,7 @@ private:
 	///
 	Trans * t2_;
 	///
-	static Trans * default_;
+	static Trans default_;
 	///
 	CharacterSet chset_;
 	///
@@ -166,7 +158,7 @@ public:
 	///
 	void DisableKeymap();
 	///
-	bool setCharset(const char *);
+	bool setCharset(string const &);
 	///
 	bool backspace() {
 		return trans_fsm_.currentState->backspace();
@@ -174,21 +166,23 @@ public:
 	///
 	void TranslateAndInsert(char, LyXText *);
 	///
-	inline string deadkey(char, KmodInfo);
+	string const deadkey(char, KmodInfo);
 	///
-	inline string normalkey(char, char *);
+	string const normalkey(char);
 	///
 	void deadkey(char, tex_accent, LyXText *);
 };
 
 
-string TransManager::normalkey(char c, char * t)
+inline
+string const TransManager::normalkey(char c)
 {
-	return trans_fsm_.currentState->normalkey(c, t);
+	return trans_fsm_.currentState->normalkey(c);
 }
 
 
-string TransManager::deadkey(char c, KmodInfo t)
+inline
+string const TransManager::deadkey(char c, KmodInfo t)
 {
 	return trans_fsm_.currentState->deadkey(c, t);
 }