X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2Fpreamble.cpp;h=bb47315d43894c359b5715682994131907c022e3;hb=aeeac1512881a53fa8b29a1a52d7a47adb3065be;hp=db16af20815700728b67eef83187232154e6b7dc;hpb=04591a6e34a0ac52632f3a309df9ff375a91b713;p=lyx.git diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp index db16af2081..bb47315d43 100644 --- a/src/tex2lyx/preamble.cpp +++ b/src/tex2lyx/preamble.cpp @@ -14,9 +14,9 @@ #include "tex2lyx.h" -#include "layout.h" -#include "LyXTextClass.h" -#include "LyXLex.h" +#include "Layout.h" +#include "Lexer.h" +#include "TextClass.h" #include "support/filetools.h" #include "support/lstrings.h" @@ -234,7 +234,7 @@ void handle_package(string const & name, string const & opts) -void end_preamble(ostream & os, LyXTextClass const & /*textclass*/) +void end_preamble(ostream & os, TextClass const & /*textclass*/) { os << "#LyX file created by tex2lyx 0.1.2\n" << "\\lyxformat 245\n" @@ -274,7 +274,7 @@ void end_preamble(ostream & os, LyXTextClass const & /*textclass*/) } // anonymous namespace -LyXTextClass const parse_preamble(Parser & p, ostream & os, string const & forceclass) +TextClass const parse_preamble(Parser & p, ostream & os, string const & forceclass) { // initialize fixed types special_columns['D'] = 3; @@ -497,7 +497,7 @@ LyXTextClass const parse_preamble(Parser & p, ostream & os, string const & force cerr << "Error: Could not find layout file for textclass \"" << h_textclass << "\"." << endl; exit(1); } - LyXTextClass textclass; + TextClass textclass; textclass.read(layoutfilename); if (h_papersides.empty()) { ostringstream ss;