hopefully fix tex2lyx linking.

[lyx.git] / src / insets / insetnewline.C

diff --git a/src/insets/insetnewline.C b/src/insets/insetnewline.C
index e9fa97b89ecfb26249e3c65a64366a217399b386..c71d84eb28e2043b0603638538fd35051e92e0c6 100644 (file)
--- a/src/insets/insetnewline.C
+++ b/src/insets/insetnewline.C
@@ -19,11 +19,12 @@
 #include "paragraph.h"
 #include "paragraph_funcs.h"
 
-#include "frontends/Application.h"
-#include "frontends/FontLoader.h"
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+
+namespace lyx {
+
 using std::endl;
 using std::ostream;
 
@@ -42,8 +43,7 @@ void InsetNewline::write(Buffer const &, ostream & os) const
 
 void InsetNewline::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       lyx::frontend::FontMetrics const & fm =
-               theApp->fontLoader().metrics(mi.base.font);
+       frontend::FontMetrics const & fm = theFontMetrics(mi.base.font);
        dim.asc = fm.maxAscent();
        dim.des = fm.maxDescent();
        dim.wid = fm.width('n');
@@ -51,7 +51,7 @@ void InsetNewline::metrics(MetricsInfo & mi, Dimension & dim) const
 }
 
 
-int InsetNewline::latex(Buffer const &, ostream &,
+int InsetNewline::latex(Buffer const &, odocstream &,
                        OutputParams const &) const
 {
        lyxerr << "Eek, calling InsetNewline::latex !" << endl;
@@ -59,7 +59,7 @@ int InsetNewline::latex(Buffer const &, ostream &,
 }
 
 
-int InsetNewline::plaintext(Buffer const &, ostream & os,
+int InsetNewline::plaintext(Buffer const &, odocstream & os,
                        OutputParams const &) const
 {
        os << '\n';
@@ -67,7 +67,7 @@ int InsetNewline::plaintext(Buffer const &, ostream & os,
 }
 
 
-int InsetNewline::docbook(Buffer const &, std::ostream & os,
+int InsetNewline::docbook(Buffer const &, odocstream & os,
                          OutputParams const &) const
 {
        os << '\n';
@@ -77,8 +77,7 @@ int InsetNewline::docbook(Buffer const &, std::ostream & os,
 
 void InsetNewline::draw(PainterInfo & pi, int x, int y) const
 {
-       lyx::frontend::FontMetrics const & fm =
-               theApp->fontLoader().metrics(pi.base.font);
+       frontend::FontMetrics const & fm = theFontMetrics(pi.base.font);
        int const wid = fm.width('n');
        int const asc = fm.maxAscent();
 
@@ -123,3 +122,6 @@ bool InsetNewline::isSpace() const
 {
        return true;
 }
+
+
+} // namespace lyx