X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTrans.h;h=a0610c48606413f74031244fffd8f1c62548a020;hb=3d4076b598deb18660e50ec9c327efc3b15f15d0;hp=ceb6536c0f260cdc21b031c040a97a1bab573956;hpb=a939474037f118987f48eacec2d5272761f22641;p=lyx.git

diff --git a/src/Trans.h b/src/Trans.h
index ceb6536c0f..a0610c4860 100644
--- a/src/Trans.h
+++ b/src/Trans.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Matthias Ettrich
  * \author John Levon
  *
@@ -14,10 +14,9 @@
 #ifndef TRANS_H
 #define TRANS_H
 
-#include "lfuns.h"
-#include "support/docstring.h"
+#include "FuncCode.h"
 
-#include <boost/scoped_ptr.hpp>
+#include "support/docstring.h"
 
 #include <list>
 #include <map>
@@ -72,7 +71,7 @@ enum tex_accent {
 };
 
 
-struct tex_accent_struct {
+struct TeXAccent {
 	///
 	tex_accent accent;
 	/// UCS4 code point of this accent
@@ -80,11 +79,11 @@ struct tex_accent_struct {
 	///
 	char const * name;
 	///
-	kb_action action;
+	FuncCode action;
 };
 
 ///
-extern tex_accent_struct get_accent(kb_action action);
+extern TeXAccent get_accent(FuncCode action);
 
 
 ///
@@ -149,7 +148,7 @@ private:
 	docstring const & match(char_type c);
 	///
 	void insertException(KmodException & exclist, char_type c,
-	                     docstring const & data, bool = false,
+			     docstring const & data, bool = false,
 			     tex_accent = TEX_NOACCENT);
 	///
 	void freeException(KmodException & exclist);
@@ -164,8 +163,7 @@ private:
 
 
 ///
-inline
-docstring const & Trans::match(char_type c)
+inline docstring const & Trans::match(char_type c)
 {
 	std::map<char_type, docstring>::iterator it = keymap_.find(c);
 	if (it != keymap_.end()) {
@@ -305,9 +303,9 @@ private:
 	///
 	Trans * active_;
 	///
-	boost::scoped_ptr<Trans> t1_;
+	Trans t1_;
 	///
-	boost::scoped_ptr<Trans> t2_;
+	Trans t2_;
 	///
 	static Trans default_;
 	///
@@ -316,8 +314,6 @@ public:
 	///
 	TransManager();
 	///
-	~TransManager();
-	///
 	int setPrimary(std::string const &);
 	///
 	int setSecondary(std::string const &);