pimpl not needed here

[lyx.git] / src / tex2lyx / preamble.cpp

diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp
index db16af20815700728b67eef83187232154e6b7dc..b39c8c123f4416c877152aca081bab134449e713 100644 (file)
--- 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"
 
@@ -37,6 +37,7 @@ using std::string;
 using std::vector;
 using std::cerr;
 using std::endl;
+using std::find;
 
 using support::FileName;
 using support::libFileSearch;
@@ -99,7 +100,7 @@ void handle_opt(vector<string> & opts, char const * const * what, string & targe
        if (opts.empty())
                return;
 
-       for ( ; *what; ++what) {
+       for (; *what; ++what) {
                vector<string>::iterator it = find(opts.begin(), opts.end(), *what);
                if (it != opts.end()) {
                        //cerr << "### found option '" << *what << "'\n";
@@ -234,7 +235,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 +275,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 +498,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;