Changes LayoutList from a vector<LayoutPtr> to a vector<Layout>.

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

diff --git a/src/tex2lyx/Context.cpp b/src/tex2lyx/Context.cpp
index ae64f434809d38962696c8b6d534ac52092df109..e07ff92caec374d0acaebdb98d937d174d36a54d 100644 (file)
--- a/src/tex2lyx/Context.cpp
+++ b/src/tex2lyx/Context.cpp
@@ -17,14 +17,11 @@
 
 #include <iostream>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using std::ostream;
-using std::endl;
-using std::string;
-
-
 namespace {
 
 void begin_layout(ostream & os, LayoutPtr const & layout, TeXFont const & font,
@@ -86,7 +83,7 @@ bool Context::empty = true;
 
 
 Context::Context(bool need_layout_,
-                TextClass const & textclass_,
+                TeX2LyXDocClass const & textclass_,
                 LayoutPtr layout_, LayoutPtr parent_layout_,
                 TeXFont font_)
        : need_layout(need_layout_),
@@ -96,18 +93,18 @@ Context::Context(bool need_layout_,
          layout(layout_), parent_layout(parent_layout_),
          font(font_)
 {
-       if (!layout.get())
-               layout = textclass.defaultLayout();
-       if (!parent_layout.get())
-               parent_layout = textclass.defaultLayout();
+       if (!layout)
+               layout = &textclass.defaultLayout();
+       if (!parent_layout)
+               parent_layout = &textclass.defaultLayout();
 }
 
 
 Context::~Context()
 {
        if (!extra_stuff.empty())
-               std::cerr << "Bug: Ignoring extra stuff '" << extra_stuff
-                         << '\'' << std::endl;
+               cerr << "Bug: Ignoring extra stuff '" << extra_stuff
+                         << '\'' << endl;
 }
 
 
@@ -135,7 +132,7 @@ void Context::check_layout(ostream & os)
                                // that this may require a begin_deeper.
                                if (!deeper_paragraph)
                                        begin_deeper(os);
-                               begin_layout(os, textclass.defaultLayout(),
+                               begin_layout(os, &textclass.defaultLayout(),
                                             font, normalfont);
                                deeper_paragraph = true;
                        }
@@ -208,9 +205,9 @@ void Context::new_paragraph(ostream & os)
 }
 
 
-void Context::add_extra_stuff(std::string const & stuff)
+void Context::add_extra_stuff(string const & stuff)
 {
-       if (!lyx::support::contains(extra_stuff, stuff))
+       if (!contains(extra_stuff, stuff))
                extra_stuff += stuff;
 }