X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftrans.C;h=3aeaf25ca757f03ae71262a9b0bff14db0572498;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=cbc0bc1a9eed8565be1f0b2525523859b84d030c;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/trans.C b/src/trans.C
index cbc0bc1a9e..3aeaf25ca7 100644
--- a/src/trans.C
+++ b/src/trans.C
@@ -14,15 +14,19 @@
 #include "trans.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
-#include "tex-strings.h"
 #include "lyxlex.h"
 #include "debug.h"
 #include "trans_mgr.h"
 
-using namespace lyx::support;
 
-using std::map;
+namespace lyx {
+
+using support::contains;
+using support::libFileSearch;
+
 using std::endl;
+using std::string;
+using std::map;
 
 
 // KmodInfo
@@ -40,11 +44,11 @@ Trans::Trans()
 
 Trans::~Trans()
 {
-	FreeKeymap();
+	freeKeymap();
 }
 
 
-void Trans::InsertException(KmodException & exclist, char c,
+void Trans::insertException(KmodException & exclist, char c,
 			    string const & data, bool flag, tex_accent accent)
 {
 	Keyexc p;
@@ -58,26 +62,26 @@ void Trans::InsertException(KmodException & exclist, char c,
 }
 
 
-void Trans::FreeException(KmodException & exclist)
+void Trans::freeException(KmodException & exclist)
 {
 	exclist.clear();
 }
 
 
-void Trans::FreeKeymap()
+void Trans::freeKeymap()
 {
 	kmod_list_.clear();
 	keymap_.clear();
 }
 
 
-bool Trans::IsDefined() const
+bool Trans::isDefined() const
 {
 	return !name_.empty();
 }
 
 
-string const & Trans::GetName() const
+string const & Trans::getName() const
 {
 	return name_;
 }
@@ -103,7 +107,7 @@ struct keyword_item kmapTags[K_LAST - 1] = {
 tex_accent getkeymod(string const &);
 
 
-void Trans::AddDeadkey(tex_accent accent, string const & keys)
+void Trans::addDeadkey(tex_accent accent, string const & keys)
 {
 	KmodInfo tmp;
 	tmp.data = keys;
@@ -119,7 +123,7 @@ void Trans::AddDeadkey(tex_accent accent, string const & keys)
 }
 
 
-int Trans::Load(LyXLex & lex)
+int Trans::load(LyXLex & lex)
 {
 	bool error = false;
 
@@ -162,9 +166,9 @@ int Trans::Load(LyXLex & lex)
 				return -1;
 
 			/* string const allowed = lex.getString(); */
-			AddDeadkey(accent, keys /*, allowed*/);
+			addDeadkey(accent, keys /*, allowed*/);
 #else
-			AddDeadkey(accent, keys);
+			addDeadkey(accent, keys);
 #endif
 			break;
 		}
@@ -218,7 +222,7 @@ int Trans::Load(LyXLex & lex)
 				return -1;
 			}
 
-			InsertException(kmod_list_[accent_1].exception_list,
+			insertException(kmod_list_[accent_1].exception_list,
 					static_cast<char>(it->first), allowed,
 					true, accent_2);
 		}
@@ -278,7 +282,7 @@ int Trans::Load(LyXLex & lex)
 			} else
 				return -1;
 
-			InsertException(kmod_list_[accent].exception_list,
+			insertException(kmod_list_[accent].exception_list,
 					key, str);
 			break;
 		}
@@ -308,7 +312,7 @@ bool Trans::isAccentDefined(tex_accent accent, KmodInfo & i) const
 
 string const Trans::process(char c, TransManager & k)
 {
-	string const t = Match(static_cast<unsigned char>(c));
+	string const t = match(static_cast<unsigned char>(c));
 
 	if (t.empty() && c != 0) {
 		return k.normalkey(c);
@@ -322,17 +326,17 @@ string const Trans::process(char c, TransManager & k)
 }
 
 
-int Trans::Load(string const & language)
+int Trans::load(string const & language)
 {
-	string const filename = LibFileSearch("kbd", language, "kmap");
+	string const filename = libFileSearch("kbd", language, "kmap");
 	if (filename.empty())
 		return -1;
 
-	FreeKeymap();
+	freeKeymap();
 	LyXLex lex(kmapTags, K_LAST - 1);
 	lex.setFile(filename);
 
-	int const res = Load(lex);
+	int const res = load(lex);
 
 	if (res == 0) {
 		name_ = language;
@@ -361,3 +365,6 @@ tex_accent getkeymod(string const & p)
 	}
 	return TEX_NOACCENT;
 }
+
+
+} // namespace lyx