X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftrans_mgr.h;h=1a6917386f585e9708336643c3e1ab2654074819;hb=35cf7dcb2bdfdcda465b69c58465f657c77fd9d7;hp=d75a56e871dd5a4cde9cf6badc9410672c30b421;hpb=0eccdd1c3613e5170deb77b22174dd0afde833e9;p=lyx.git

diff --git a/src/trans_mgr.h b/src/trans_mgr.h
index d75a56e871..1a6917386f 100644
--- a/src/trans_mgr.h
+++ b/src/trans_mgr.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
-#ifndef _Trans_Manager_h_
-#define _Trans_Manager_h_
+#ifndef Trans_Manager_h
+#define Trans_Manager_h
 
 #ifdef __GNUG__
 #pragma interface
@@ -8,25 +8,25 @@
 
 #include "tex-accent.h"
 #include "trans_decl.h"
+#include "chset.h"
+#include "LString.h"
 
 class LyXText;
-class LString;
-class CharacterSet;
 class Trans;
 
 /// Translation State
 class TransState {
 public:
 	///
-	virtual ~TransState();
+	virtual ~TransState() {}
 	///
-	virtual string normalkey(char,char*)=0;
+	virtual string normalkey(char, char *) = 0;
 	///
-	virtual bool backspace()=0;
+	virtual bool backspace() = 0;
 	///
-	virtual string deadkey(char,KmodInfo)=0;
+	virtual string deadkey(char, KmodInfo) = 0;
 	///
-	static const char TOKEN_SEP;
+	static char const TOKEN_SEP;
 };
 
 
@@ -34,8 +34,7 @@ public:
 class TransFSMData {
 protected:
 	///
-	virtual ~TransFSMData()
-	{}
+	virtual ~TransFSMData() {}
 	///
 	char deadkey_;
 	///
@@ -47,53 +46,52 @@ protected:
 	///
 	KmodException comb_info_;
 	///
-	TransState* init_state_;
+	TransState * init_state_;
 	///
-	TransState* deadkey_state_;
+	TransState * deadkey_state_;
 	///
-	TransState* combined_state_;
+	TransState * combined_state_;
 	///
 public:
 	///
 	TransFSMData();
 	///
-	TransState* currentState;
+	TransState * currentState;
 };
 
 
 /// Init State
-class TransInitState: 
+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();
+	///
+	virtual string normalkey(char, char *);
+	///
+	virtual bool backspace() { return true; }
+	///
+	virtual string deadkey(char, KmodInfo);
 };
 
 
 /// Deadkey State
-class TransDeadkeyState: 
+class TransDeadkeyState : 
 	virtual public TransFSMData,
 	public TransState {
 public:
-		///
-		TransDeadkeyState();
-		///
-		virtual string normalkey(char,char*);
-		///
-		virtual bool backspace()
-	{
-		currentState=init_state_;
+	///
+	TransDeadkeyState();
+	///
+	virtual string normalkey(char, char *);
+	///
+	virtual bool backspace() {
+		currentState = init_state_;
 		return false;
 	}
-		///
-		virtual string deadkey(char,KmodInfo);
+	///
+	virtual string deadkey(char, KmodInfo);
 };
 
 
@@ -102,27 +100,26 @@ class TransCombinedState:
 	virtual public TransFSMData,
 	public TransState {
 public:
-		///
-		TransCombinedState();
-		///
-		virtual string normalkey(char,char*);
-		///
-		virtual bool backspace()
-	{
+	///
+	TransCombinedState();
+	///
+	virtual string normalkey(char, char *);
+	///
+	virtual bool backspace() {
 		// cancel the second deadkey
-		deadkey2_=0;
-		deadkey2_info_.accent=TEX_NOACCENT;
-		currentState=deadkey_state_;
+		deadkey2_ = 0;
+		deadkey2_info_.accent = TEX_NOACCENT;
+		currentState = deadkey_state_;
 		
 		return false;
 	}
-		///
-		virtual string deadkey(char,KmodInfo);
+	///
+	virtual string deadkey(char, KmodInfo);
 };
 
 
 ///
-class TransFSM:	
+class TransFSM :	
 	virtual public TransFSMData,
 	public TransInitState,
 	public TransDeadkeyState,
@@ -133,26 +130,26 @@ public:
 	TransFSM();
 };
 
+
 ///
-class TransManager
-{
+class TransManager {
 private:
 	///
 	TransFSM trans_fsm_;
 	///
-	Trans* active_;
+	Trans * active_;
 	///
-	Trans* t1_;
+	Trans * t1_;
 	///
-	Trans* t2_;
+	Trans * t2_;
 	///
-	static Trans* default_;
+	static Trans * default_;
 	///
-	CharacterSet* chset_;
+	CharacterSet chset_;
 	///
-	void insert(string,LyXText*);
+	void insert(string const &, LyXText *);
 	///
-	void insertVerbatim(const string&,LyXText*);
+	void insertVerbatim(string const &, LyXText *);
 public:
 	///
 	TransManager();
@@ -169,33 +166,31 @@ public:
 	///
 	void DisableKeymap();
 	///
-	bool setCharset(const char*);
+	bool setCharset(const char *);
 	///
-	bool backspace()
-	{
+	bool backspace() {
 		return trans_fsm_.currentState->backspace();
 	}
 	///
-	void TranslateAndInsert(char,LyXText*);
+	void TranslateAndInsert(char, LyXText *);
 	///
-	inline string deadkey(char,KmodInfo);
+	inline string deadkey(char, KmodInfo);
 	///
-	inline string normalkey(char,char*);
+	inline string normalkey(char, char *);
 	///
-	void deadkey(char,tex_accent,LyXText*);
-    
+	void deadkey(char, tex_accent, LyXText *);
 };
 
 
-string TransManager::normalkey(char c,char *t)
+string TransManager::normalkey(char c, char * t)
 {
-	return trans_fsm_.currentState->normalkey(c,t);
+	return trans_fsm_.currentState->normalkey(c, t);
 }
 
 
-string TransManager::deadkey(char c,KmodInfo t)
+string TransManager::deadkey(char c, KmodInfo t)
 {
-	return trans_fsm_.currentState->deadkey(c,t);
+	return trans_fsm_.currentState->deadkey(c, t);
 }
 
 #endif