clean up a bit

[lyx.git] / src / vspace.C

diff --git a/src/vspace.C b/src/vspace.C
index 18772db249f60ddd00b40ff97ef4997cd63c1464..507ade8b9bddc755ff9faccfb007fc89e0a10930 100644 (file)
--- a/src/vspace.C
+++ b/src/vspace.C
@@ -14,10 +14,8 @@
 
 #include "vspace.h"
 #include "lengthcommon.h"
-#include "lyx_main.h"
 #include "buffer.h"
 #include "lyxrc.h"
-#include "lyxtext.h"
 #include "BufferView.h"
 #include "support/LAssert.h"
 
@@ -55,7 +53,7 @@ void lyx_advance(string & data, string::size_type n)
 inline
 bool isEndOfData(string const & data)
 {
-       return frontStrip(data).empty();
+       return ltrim(data).empty();
 }
 
 /**
@@ -72,7 +70,7 @@ bool isEndOfData(string const & data)
  */
 char nextToken(string & data)
 {
-       data = frontStrip(data);
+       data = ltrim(data);
        if (data.empty())
                return '\0';
        else if (data[0] == '+') {
@@ -202,7 +200,7 @@ bool isValidGlueLength(string const & data, LyXGlueLength * result)
 
        if (data.empty())
                return true;
-       string buffer = frontStrip(data);
+       string buffer = ltrim(data);
 
        // To make isValidGlueLength recognize negative values as
        // the first number this little hack is needed:
@@ -346,11 +344,11 @@ VSpace::VSpace(string const & data)
        if (data.empty())
                return;
        double value;
-       string input  = strip(data);
+       string input  = rtrim(data);
 
        string::size_type const length = input.length();
 
-       if (length > 1 && input[length-1] == '*') {
+       if (length > 1 && input[length - 1] == '*') {
                keep_ = true;
                input.erase(length - 1);
        }
@@ -470,24 +468,25 @@ string const VSpace::asLatexCommand(BufferParams const & params) const
 
 
 
-int VSpace::inPixels(BufferView * bv) const
+int VSpace::inPixels(BufferView const * bv) const
 {
        // Height of a normal line in pixels (zoom factor considered)
-       int const default_height = bv->text->defaultHeight(); // [pixels]
+       int const default_height = bv->defaultHeight(); // [pixels]
 
        int retval = 0;
 
        switch (kind_) {
+
        case NONE:
-               // Value for this is already set
+               // value for this is already set
                break;
+
        case DEFSKIP:
                retval = bv->buffer()->params.getDefSkip().inPixels(bv);
                break;
 
-               // This is how the skips are normally defined by
-               // LateX.  But there should be some way to change
-               // this per document.
+       // This is how the skips are normally defined by LateX.
+       // But there should be some way to change this per document.
        case SMALLSKIP:
                retval = default_height / 4;
                break;
@@ -505,11 +504,9 @@ int VSpace::inPixels(BufferView * bv) const
                retval = 3 * default_height;
                break;
 
-       case LENGTH: {
-               int const default_width  = bv->workWidth();
-               retval = len_.len().inPixels(default_width, default_height);
+       case LENGTH:
+               retval = len_.len().inPixels(bv->workWidth());
                break;
-       }
 
        }
        return retval;