More 'standard conformant blurb' nonsense.

[lyx.git] / src / vspace.C

diff --git a/src/vspace.C b/src/vspace.C
index 5966cb66af53b48fbedd7295f72ef55ea65b6812..9b35ac7943d9bf0df766418b6e526acc32d40db6 100644 (file)
--- a/src/vspace.C
+++ b/src/vspace.C
@@ -8,21 +8,20 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "vspace.h"
 #include "lengthcommon.h"
 #include "buffer.h"
 #include "lyxrc.h"
 #include "BufferView.h"
+#include "lyxtext.h"
 #include "support/LAssert.h"
 
 #include "support/lstrings.h"
 
 #include <cstdio>
 
+using namespace lyx::support;
+
 #ifndef CXX_GLOBAL_CSTD
 using std::sscanf;
 #endif
@@ -468,10 +467,10 @@ string const VSpace::asLatexCommand(BufferParams const & params) const
 
 
 
-int VSpace::inPixels(BufferView const * bv) const
+int VSpace::inPixels(BufferView const & bv) const
 {
        // Height of a normal line in pixels (zoom factor considered)
-       int const default_height = bv->defaultHeight(); // [pixels]
+       int const default_height = defaultRowHeight(); // [pixels]
 
        int retval = 0;
 
@@ -482,10 +481,10 @@ int VSpace::inPixels(BufferView const * bv) const
                break;
 
        case DEFSKIP:
-               retval = bv->buffer()->params.getDefSkip().inPixels(bv);
+               retval = bv.buffer()->params.getDefSkip().inPixels(bv);
                break;
 
-       // This is how the skips are normally defined by LateX. 
+       // 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;
@@ -505,7 +504,7 @@ int VSpace::inPixels(BufferView const * bv) const
                break;
 
        case LENGTH:
-               retval = len_.len().inPixels(bv->workWidth(), default_height);
+               retval = len_.len().inPixels(bv.workWidth());
                break;
 
        }