X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftrans.h;h=ce529a2b9f991c2d58bf850373d2e52e35dcdd86;hb=969ab85d985485f503790cb13f98a582d4e1cdb5;hp=a233ace5cdb7a9cc6dde7c75c34363adec2c7628;hpb=99d1627a471b92f403598d03dfc861ddc3c11be0;p=lyx.git

diff --git a/src/trans.h b/src/trans.h
index a233ace5cd..ce529a2b9f 100644
--- a/src/trans.h
+++ b/src/trans.h
@@ -1,20 +1,26 @@
 // -*- C++ -*-
 /**
  * \file trans.h
- * Copyright 2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author unknown
+ * \author Lars Gullik Bjønnes
+ * \author Matthias Ettrich
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef TRANS_H
 #define TRANS_H
 
+#include "trans_decl.h"
+
 #include <map>
 
-#include "tex-accent.h"
-#include "LString.h"
-#include "trans_decl.h"
+
+namespace lyx {
+
 
 class LyXLex;
 
@@ -31,36 +37,36 @@ public:
 	~Trans();
 
 	///
-	int Load(string const & language);
+	int load(std::string const & language);
 	///
-	bool IsDefined() const;
+	bool isDefined() const;
 	///
-	string const & GetName() const;
+	std::string const & getName() const;
 	///
-	string const process(char, TransManager &);
+	std::string const process(char, TransManager &);
 	///
 	bool isAccentDefined(tex_accent, KmodInfo &) const;
 
 private:
 	///
-	void AddDeadkey(tex_accent, string const &);
+	void addDeadkey(tex_accent, std::string const &);
 	///
-	void FreeKeymap();
+	void freeKeymap();
 	///
-	int Load(LyXLex &);
+	int load(LyXLex &);
 	///
-	string const & Match(unsigned char c);
+	std::string const & match(unsigned char c);
 	///
-	void InsertException(KmodException & exclist, char c,
-			     string const & data, bool = false,
+	void insertException(KmodException & exclist, char c,
+			     std::string const & data, bool = false,
 			     tex_accent = TEX_NOACCENT);
 	///
-	void FreeException(KmodException & exclist);
+	void freeException(KmodException & exclist);
 
 	///
-	string name_;
+	std::string name_;
 	///
-	std::map<int, string> keymap_;
+	std::map<int, std::string> keymap_;
 	///
 	std::map<int, KmodInfo> kmod_list_;
 };
@@ -68,14 +74,17 @@ private:
 
 ///
 inline
-string const & Trans::Match(unsigned char c)
+std::string const & Trans::match(unsigned char c)
 {
-	std::map<int, string>::iterator it = keymap_.find(c);
+	std::map<int, std::string>::iterator it = keymap_.find(c);
 	if (it != keymap_.end()) {
 		return it->second;
 	}
-	static string dummy;
+	static std::string dummy;
 	return dummy;
 }
 
+
+} // namespace lyx
+
 #endif // TRANS_H