X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTrans.cpp;h=266d86765b02fe185767a3a8854e885237fd001d;hb=1ab314f8e6e145dc73d0a26b7e82a280b497ea3c;hp=9d061d15eccc162032bc7284221e4bec51dbc81a;hpb=9383f4c3c6f9cfab2d658701ba66e2b54cd68bea;p=lyx.git diff --git a/src/Trans.cpp b/src/Trans.cpp index 9d061d15ec..266d86765b 100644 --- a/src/Trans.cpp +++ b/src/Trans.cpp @@ -17,25 +17,22 @@ #include "BufferView.h" #include "Cursor.h" #include "CutAndPaste.h" -#include "support/debug.h" #include "Lexer.h" #include "LyXRC.h" #include "Text.h" -#include "support/filetools.h" -#include "support/lstrings.h" #include "support/convert.h" +#include "support/debug.h" #include "support/docstream.h" +#include "support/FileName.h" +#include "support/filetools.h" +#include "support/lstrings.h" using namespace std; +using namespace lyx::support; namespace lyx { -using support::split; -using support::contains; -using support::libFileSearch; - - ///////////////////////////////////////////////////////////////////// // // TeXAccents @@ -118,7 +115,7 @@ static docstring const doAccent(docstring const & s, tex_accent accent) if (s.length() > 1) { if (accent != TEX_TIE || s.length() > 2) lyxerr << "Warning: Too many characters given for accent " - << lyx_accent_table[accent].name << '.' << std::endl; + << lyx_accent_table[accent].name << '.' << endl; os << s.substr(1); } return normalize_c(os.str()); @@ -390,7 +387,7 @@ docstring const Trans::process(char_type c, TransManager & k) int Trans::load(string const & language) { - support::FileName const filename = libFileSearch("kbd", language, "kmap"); + FileName const filename = libFileSearch("kbd", language, "kmap"); if (filename.empty()) return -1;