X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftrans_mgr.h;h=06e98991eb0d0d068df3c17d59f4f92d30da082f;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=083ef249142b21b4dff78379122003cbd4a67b49;hpb=44cd0fc9a1687cc63911c7f98d978594458e7813;p=lyx.git

diff --git a/src/trans_mgr.h b/src/trans_mgr.h
index 083ef24914..06e98991eb 100644
--- a/src/trans_mgr.h
+++ b/src/trans_mgr.h
@@ -17,6 +17,12 @@
 #include "chset.h"
 #include "trans_decl.h"
 
+#include <boost/scoped_ptr.hpp>
+
+
+namespace lyx {
+
+class LCursor;
 class LyXText;
 class Trans;
 
@@ -137,32 +143,32 @@ private:
 	///
 	Trans * active_;
 	///
-	Trans * t1_;
+	boost::scoped_ptr<Trans> t1_;
 	///
-	Trans * t2_;
+	boost::scoped_ptr<Trans> t2_;
 	///
 	static Trans default_;
 	///
 	CharacterSet chset_;
 	///
-	void insert(std::string const &, LyXText *);
+	void insert(std::string const &, LyXText *, LCursor & cur);
 	///
-	void insertVerbatim(std::string const &, LyXText *);
+	void insertVerbatim(std::string const &, LyXText *, LCursor & cur);
 public:
 	///
 	TransManager();
 	///
-	virtual ~TransManager();
+	~TransManager();
 	///
-	int SetPrimary(std::string const &);
+	int setPrimary(std::string const &);
 	///
-	int SetSecondary(std::string const &);
+	int setSecondary(std::string const &);
 	///
-	void EnablePrimary();
+	void enablePrimary();
 	///
-	void EnableSecondary();
+	void enableSecondary();
 	///
-	void DisableKeymap();
+	void disableKeymap();
 	///
 	bool setCharset(std::string const &);
 	///
@@ -170,13 +176,13 @@ public:
 		return trans_fsm_.currentState->backspace();
 	}
 	///
-	void TranslateAndInsert(char, LyXText *);
+	void translateAndInsert(char, LyXText *, LCursor &);
 	///
 	std::string const deadkey(char, KmodInfo);
 	///
 	std::string const normalkey(char);
 	///
-	void deadkey(char, tex_accent, LyXText *);
+	void deadkey(char, tex_accent, LyXText *, LCursor &);
 };
 
 
@@ -193,4 +199,7 @@ std::string const TransManager::deadkey(char c, KmodInfo t)
 	return trans_fsm_.currentState->deadkey(c, t);
 }
 
+
+} // namespace lyx
+
 #endif // TRANS_MANAGER_H