insetcharstyle drawing cosmetics

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

diff --git a/src/insets/insetspace.C b/src/insets/insetspace.C
index 0d22a6ad4f7092e21318942246ba1f528cc8c707..11cc7925e14f87bf62556a4b40e53632059deaa0 100644 (file)
--- a/src/insets/insetspace.C
+++ b/src/insets/insetspace.C
@@ -16,10 +16,10 @@
 #include "insetspace.h"
 
 #include "debug.h"
-#include "latexrunparams.h"
 #include "LColor.h"
 #include "lyxlex.h"
 #include "metricsinfo.h"
+#include "outputparams.h"
 
 #include "frontends/font_metrics.h"
 #include "frontends/Painter.h"
@@ -137,7 +137,7 @@ void InsetSpace::write(Buffer const &, ostream & os) const
 // This function will not be necessary when lyx3
 void InsetSpace::read(Buffer const &, LyXLex & lex)
 {
-       lex.nextToken();
+       lex.next();
        string const command = lex.getString();
 
        if (command == "\\space")
@@ -162,7 +162,7 @@ void InsetSpace::read(Buffer const &, LyXLex & lex)
 
 
 int InsetSpace::latex(Buffer const &, ostream & os,
-                     LatexRunParams const & runparams) const
+                     OutputParams const & runparams) const
 {
        switch (kind_) {
        case NORMAL:
@@ -194,8 +194,8 @@ int InsetSpace::latex(Buffer const &, ostream & os,
 }
 
 
-int InsetSpace::ascii(Buffer const &, ostream & os,
-                     LatexRunParams const &) const
+int InsetSpace::plaintext(Buffer const &, ostream & os,
+                     OutputParams const &) const
 {
        switch (kind_) {
        case NORMAL:
@@ -214,7 +214,7 @@ int InsetSpace::ascii(Buffer const &, ostream & os,
 
 
 int InsetSpace::linuxdoc(Buffer const &, ostream & os,
-                        LatexRunParams const &) const
+                        OutputParams const &) const
 {
        switch (kind_) {
        case NORMAL:
@@ -235,7 +235,7 @@ int InsetSpace::linuxdoc(Buffer const &, ostream & os,
 
 
 int InsetSpace::docbook(Buffer const &, ostream & os,
-                       LatexRunParams const &) const
+                       OutputParams const &) const
 {
        switch (kind_) {
        case NORMAL:
@@ -275,8 +275,3 @@ bool InsetSpace::isSpace() const
 {
        return true;
 }
-
-bool InsetSpace::isLineSeparator() const
-{
-       return false;
-}