X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fintl.h;h=07de268332e114544d1e580e919e05e6202a2feb;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=0180c84b1ee40b22da2e381d341aaf5b5851ed90;hpb=236ea81bc5c0ce7101c9460d1ee97b8f3c9be9df;p=lyx.git

diff --git a/src/intl.h b/src/intl.h
index 0180c84b1e..07de268332 100644
--- a/src/intl.h
+++ b/src/intl.h
@@ -15,10 +15,12 @@
 #ifndef INTL_H
 #define INTL_H
 
-#include "support/std_string.h"
 #include "trans_mgr.h"
 
 
+namespace lyx {
+
+
 /**
  * This class is used for managing keymaps
  * for composing characters in LyX.
@@ -34,19 +36,19 @@ public:
 	Intl();
 
 	/// {en/dis}able the keymap
-	void KeyMapOn(bool on);
+	void keyMapOn(bool on);
 
 	/// set the primary language keymap
-	void KeyMapPrim();
+	void keyMapPrim();
 
 	/// set the secondary language keymap
-	void KeyMapSec();
+	void keyMapSec();
 
 	/// turn on/off key mappings, status in keymapon
-	void ToggleKeyMap();
+	void toggleKeyMap();
 
 	/// initialize key mapper
-	void InitKeyMapper(bool on);
+	void initKeyMapper(bool on);
 
 	// Get the Translation Manager
 	TransManager & getTransManager();
@@ -58,9 +60,9 @@ private:
 	/// is key mapping enabled ?
 	bool keymapon;
 	/// the primary language keymap
-	string & prim_lang;
+	std::string & prim_lang;
 	/// the secondary language keymap
-	string & sec_lang;
+	std::string & sec_lang;
 	/// the translation manager
 	TransManager trans;
 };
@@ -72,4 +74,7 @@ TransManager & Intl::getTransManager()
 	return trans;
 }
 
+
+} // namespace lyx
+
 #endif /* INTL_H */