X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftrans.C;h=afa2e9b7e73308e3fed69b900c52c895ba0e4034;hb=29f01faa17495e3d80c08f234c8f049c7d699ac1;hp=81c4b71dfedf32388f4103d18e97ee8cf0eb2275;hpb=3b7dd942e6640660759b1a21cc23dc8cb09f0f6d;p=lyx.git

diff --git a/src/trans.C b/src/trans.C
index 81c4b71dfe..afa2e9b7e7 100644
--- a/src/trans.C
+++ b/src/trans.C
@@ -4,7 +4,6 @@
 #pragma implementation
 #endif
 
-#include "LyXView.h"
 #include "trans.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
@@ -13,6 +12,7 @@
 #include "debug.h"
 #include "trans_mgr.h"
 
+using std::map;
 using std::endl;
 
 
@@ -110,7 +110,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 +126,7 @@ int Trans::Load(LyXLex & lex)
 					       << "'" << endl;
 			} else
 				return -1;
-			
+
 			string const keys = lex.getString();
 
 			if (lex.next(true)) {
@@ -158,7 +158,7 @@ int Trans::Load(LyXLex & lex)
 			AddDeadkey(accent, keys);
 #endif
 			break;
-		}	
+		}
 		case KCOMB: {
 			string str;
 
@@ -168,7 +168,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 +181,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 +192,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 +208,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 +288,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;
@@ -320,9 +320,9 @@ int Trans::Load(string const & language)
 		return -1;
 
 	FreeKeymap();
-	LyXLex lex(kmapTags, K_LAST-1);
+	LyXLex lex(kmapTags, K_LAST - 1);
 	lex.setFile(filename);
-	
+
 	int const res = Load(lex);
 
 	if (res == 0) {
@@ -343,7 +343,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;