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

diff --git a/src/trans.C b/src/trans.C
index d9a9529279..683869db62 100644
--- a/src/trans.C
+++ b/src/trans.C
@@ -1,10 +1,5 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "LyXView.h"
 #include "trans.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
@@ -13,6 +8,7 @@
 #include "debug.h"
 #include "trans_mgr.h"
 
+using std::map;
 using std::endl;
 
 
@@ -110,7 +106,7 @@ void Trans::AddDeadkey(tex_accent accent, string const & keys)
 }
 
 
-int Trans::Load(LyXLex & lex) 
+int Trans::Load(LyXLex & lex)
 {
 	bool error = false;
 
@@ -123,16 +119,16 @@ int Trans::Load(LyXLex & lex)
 			if (lex.next(true)) {
 				if (lyxerr.debugging(Debug::KBMAP))
 					lyxerr << "key\t`" << lex.text()
-					       << "'" << endl;
+					       << '\'' << endl;
 			} else
 				return -1;
-			
+
 			string const keys = lex.getString();
 
 			if (lex.next(true)) {
 				if (lyxerr.debugging(Debug::KBMAP))
 					lyxerr << "accent\t`" << lex.text()
-					       << "'" << endl;
+					       << '\'' << endl;
 			} else
 				return -1;
 
@@ -148,17 +144,17 @@ int Trans::Load(LyXLex & lex)
 			if (lex.next(true)) {
 				if (lyxerr.debugging(Debug::KBMAP))
 					lyxerr << "allowed\t`" << lex.text()
-					       << "'" << endl;
+					       << '\'' << endl;
 			} 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 +164,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 +177,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 +188,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 +204,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);
@@ -222,7 +218,7 @@ int Trans::Load(LyXLex & lex)
 			if (lex.next(true)) {
 				key_from = lex.text()[0];
 				if (lyxerr.debugging(Debug::KBMAP))
-					lyxerr << "\t`" << lex.text() << "'"
+					lyxerr << "\t`" << lex.text() << '\''
 					       << endl;
 			} else
 				return -1;
@@ -231,7 +227,7 @@ int Trans::Load(LyXLex & lex)
 				string string_to = lex.text();
 				keymap_[key_from] = string_to;
 				if (lyxerr.debugging(Debug::KBMAP))
-					lyxerr << "\t`" << string_to << "'"
+					lyxerr << "\t`" << string_to << '\''
 					       << endl;
 			} else
 				return -1;
@@ -247,7 +243,7 @@ int Trans::Load(LyXLex & lex)
 				lyxerr << "KXMOD:\t" << lex.text() << endl;
 			if (lex.next(true)) {
 				if (lyxerr.debugging(Debug::KBMAP))
-					lyxerr << "\t`" << lex.text() << "'"
+					lyxerr << "\t`" << lex.text() << '\''
 					       << endl;
 				accent = getkeymod(lex.getString());
 			} else
@@ -255,7 +251,7 @@ int Trans::Load(LyXLex & lex)
 
 			if (lex.next(true)) {
 				if (lyxerr.debugging(Debug::KBMAP))
-					lyxerr << "\t`" << lex.text() << "'"
+					lyxerr << "\t`" << lex.text() << '\''
 					       << endl;
 				key = lex.text()[0];
 			} else
@@ -263,7 +259,7 @@ int Trans::Load(LyXLex & lex)
 
 			if (lex.next(true)) {
 				if (lyxerr.debugging(Debug::KBMAP))
-					lyxerr << "\t`" << lex.text() << "'"
+					lyxerr << "\t`" << lex.text() << '\''
 					       << endl;
 				str = lex.text();
 			} else
@@ -288,7 +284,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 +316,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) {
@@ -342,8 +338,8 @@ tex_accent getkeymod(string const & p)
 			lyxerr << "p = " << p
 			       << ", lyx_accent_table[" << i
 			       << "].name = `" << lyx_accent_table[i].name
-			       << "'" << endl;
-		
+			       << '\'' << endl;
+
 		if (lyx_accent_table[i].name
 		     && contains(p, lyx_accent_table[i].name)) {
 			lyxerr[Debug::KBMAP] << "Found it!" << endl;