X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftrans.C;h=57ba8d0421249c7b657b5628e46689f342b41099;hb=539d0d16648f3ceabcc4d4b8f2300ebdcbb8369c;hp=d9a9529279460b785e5715e305a47a976d2c98d2;hpb=c80187fbfcefa7972bd9602a2205521aca236349;p=lyx.git

diff --git a/src/trans.C b/src/trans.C
index d9a9529279..57ba8d0421 100644
--- a/src/trans.C
+++ b/src/trans.C
@@ -13,6 +13,7 @@
 #include "debug.h"
 #include "trans_mgr.h"
 
+using std::map;
 using std::endl;
 
 
@@ -110,7 +111,7 @@ void Trans::AddDeadkey(tex_accent accent, string const & keys)
 }
 
 
-int Trans::Load(LyXLex & lex) 
+int Trans::Load(LyXLex & lex)
 {
 	bool error = false;
 
@@ -126,7 +127,7 @@ int Trans::Load(LyXLex & lex)
 					       << "'" << endl;
 			} else
 				return -1;
-			
+
 			string const keys = lex.getString();
 
 			if (lex.next(true)) {
@@ -152,13 +153,13 @@ int Trans::Load(LyXLex & lex)
 			} else
 				return -1;
 
-			string const allowed = lex.getString();
+			/* string const allowed = lex.getString(); */
 			AddDeadkey(accent, keys /*, allowed*/);
 #else
 			AddDeadkey(accent, keys);
 #endif
 			break;
-		}	
+		}
 		case KCOMB: {
 			string str;
 
@@ -168,7 +169,7 @@ int Trans::Load(LyXLex & lex)
 				lyxerr[Debug::KBMAP] << str << endl;
 			} else
 				return -1;
-			
+
 			tex_accent accent_1 = getkeymod(str);
 			if (accent_1 == TEX_NOACCENT) return -1;
 
@@ -181,9 +182,9 @@ int Trans::Load(LyXLex & lex)
 			tex_accent accent_2= getkeymod(str);
 			if (accent_2 == TEX_NOACCENT) return -1;
 
-			std::map<int, KmodInfo>::iterator it1 =
+			map<int, KmodInfo>::iterator it1 =
 				kmod_list_.find(accent_1);
-			std::map<int, KmodInfo>::iterator it2 =
+			map<int, KmodInfo>::iterator it2 =
 				kmod_list_.find(accent_2);
 			if (it1 == kmod_list_.end()
 			    || it2 == kmod_list_.end()) {
@@ -192,8 +193,8 @@ int Trans::Load(LyXLex & lex)
 
 			// Find what key accent_2 is on - should
 			// check about accent_1 also
-			std::map<int, string>::iterator it = keymap_.begin();
-			std::map<int, string>::iterator end = keymap_.end();
+			map<int, string>::iterator it = keymap_.begin();
+			map<int, string>::iterator end = keymap_.end();
 			for (; it != end; ++it) {
 				if (!it->second.empty()
 				    && it->second[0] == 0
@@ -208,7 +209,7 @@ int Trans::Load(LyXLex & lex)
 			} else {
 				return -1;
 			}
-			
+
 			InsertException(kmod_list_[accent_1].exception_list,
 					static_cast<char>(it->first), allowed,
 					true, accent_2);
@@ -288,7 +289,7 @@ int Trans::Load(LyXLex & lex)
 
 bool Trans::isAccentDefined(tex_accent accent, KmodInfo & i) const
 {
-	std::map<int, KmodInfo>::const_iterator cit = kmod_list_.find(accent);
+	map<int, KmodInfo>::const_iterator cit = kmod_list_.find(accent);
 	if (cit != kmod_list_.end()) {
 		i = cit->second;
 		return true;
@@ -322,7 +323,7 @@ int Trans::Load(string const & language)
 	FreeKeymap();
 	LyXLex lex(kmapTags, K_LAST-1);
 	lex.setFile(filename);
-	
+
 	int const res = Load(lex);
 
 	if (res == 0) {
@@ -343,7 +344,7 @@ tex_accent getkeymod(string const & p)
 			       << ", lyx_accent_table[" << i
 			       << "].name = `" << lyx_accent_table[i].name
 			       << "'" << endl;
-		
+
 		if (lyx_accent_table[i].name
 		     && contains(p, lyx_accent_table[i].name)) {
 			lyxerr[Debug::KBMAP] << "Found it!" << endl;