Rewording in GTK document dialog

[lyx.git] / src / trans.C

diff --git a/src/trans.C b/src/trans.C
index 57ba8d0421249c7b657b5628e46689f342b41099..3230fabf1874e2be0f8cf9103d3e9efcbd39360c 100644 (file)
--- a/src/trans.C
+++ b/src/trans.C
@@ -1,20 +1,29 @@
-#include <config.h>
+/**
+ * \file trans.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ * \author Matthias Ettrich
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
-#include "LyXView.h"
 #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 std::map;
+using lyx::support::contains;
+using lyx::support::LibFileSearch;
+
 using std::endl;
+using std::string;
+using std::map;
 
 
 // KmodInfo
@@ -120,11 +129,11 @@ int Trans::Load(LyXLex & lex)
                case KMOD:
                {
                        if (lyxerr.debugging(Debug::KBMAP))
-                               lyxerr << "KMOD:\t" << lex.text() << endl;
+                               lyxerr << "KMOD:\t" << lex.getString() << endl;
                        if (lex.next(true)) {
                                if (lyxerr.debugging(Debug::KBMAP))
-                                       lyxerr << "key\t`" << lex.text()
-                                              << "'" << endl;
+                                       lyxerr << "key\t`" << lex.getString()
+                                              << '\'' << endl;
                        } else
                                return -1;
 
@@ -132,8 +141,8 @@ int Trans::Load(LyXLex & lex)
 
                        if (lex.next(true)) {
                                if (lyxerr.debugging(Debug::KBMAP))
-                                       lyxerr << "accent\t`" << lex.text()
-                                              << "'" << endl;
+                                       lyxerr << "accent\t`" << lex.getString()
+                                              << '\'' << endl;
                        } else
                                return -1;
 
@@ -148,8 +157,8 @@ int Trans::Load(LyXLex & lex)
                        // so that this field is not present anymore.
                        if (lex.next(true)) {
                                if (lyxerr.debugging(Debug::KBMAP))
-                                       lyxerr << "allowed\t`" << lex.text()
-                                              << "'" << endl;
+                                       lyxerr << "allowed\t`" << lex.getString()
+                                              << '\'' << endl;
                        } else
                                return -1;
 
@@ -165,7 +174,7 @@ int Trans::Load(LyXLex & lex)
 
                        lyxerr[Debug::KBMAP] << "KCOMB:" << endl;
                        if (lex.next(true)) {
-                               str= lex.text();
+                               str = lex.getString();
                                lyxerr[Debug::KBMAP] << str << endl;
                        } else
                                return -1;
@@ -174,7 +183,7 @@ int Trans::Load(LyXLex & lex)
                        if (accent_1 == TEX_NOACCENT) return -1;
 
                        if (lex.next(true)) {
-                               str = lex.text();
+                               str = lex.getString();
                                lyxerr[Debug::KBMAP] << str << endl;
                        } else
                                return -1;
@@ -219,20 +228,20 @@ int Trans::Load(LyXLex & lex)
                        unsigned char key_from;
 
                        if (lyxerr.debugging(Debug::KBMAP))
-                               lyxerr << "KMAP:\t" << lex.text() << endl;
+                               lyxerr << "KMAP:\t" << lex.getString() << endl;
                        if (lex.next(true)) {
-                               key_from = lex.text()[0];
+                               key_from = lex.getString()[0];
                                if (lyxerr.debugging(Debug::KBMAP))
-                                       lyxerr << "\t`" << lex.text() << "'"
+                                       lyxerr << "\t`" << lex.getString() << '\''
                                               << endl;
                        } else
                                return -1;
 
                        if (lex.next(true)) {
-                               string string_to = lex.text();
+                               string const string_to = lex.getString();
                                keymap_[key_from] = string_to;
                                if (lyxerr.debugging(Debug::KBMAP))
-                                       lyxerr << "\t`" << string_to << "'"
+                                       lyxerr << "\t`" << string_to << '\''
                                               << endl;
                        } else
                                return -1;
@@ -245,10 +254,10 @@ int Trans::Load(LyXLex & lex)
                        string str;
 
                        if (lyxerr.debugging(Debug::KBMAP))
-                               lyxerr << "KXMOD:\t" << lex.text() << endl;
+                               lyxerr << "KXMOD:\t" << lex.getString() << endl;
                        if (lex.next(true)) {
                                if (lyxerr.debugging(Debug::KBMAP))
-                                       lyxerr << "\t`" << lex.text() << "'"
+                                       lyxerr << "\t`" << lex.getString() << '\''
                                               << endl;
                                accent = getkeymod(lex.getString());
                        } else
@@ -256,17 +265,17 @@ int Trans::Load(LyXLex & lex)
 
                        if (lex.next(true)) {
                                if (lyxerr.debugging(Debug::KBMAP))
-                                       lyxerr << "\t`" << lex.text() << "'"
+                                       lyxerr << "\t`" << lex.getString() << '\''
                                               << endl;
-                               key = lex.text()[0];
+                               key = lex.getString()[0];
                        } else
                                return -1;
 
                        if (lex.next(true)) {
                                if (lyxerr.debugging(Debug::KBMAP))
-                                       lyxerr << "\t`" << lex.text() << "'"
+                                       lyxerr << "\t`" << lex.getString() << '\''
                                               << endl;
-                               str = lex.text();
+                               str = lex.getString();
                        } else
                                return -1;
 
@@ -321,7 +330,7 @@ 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);
@@ -343,7 +352,7 @@ 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)) {