X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fvspace.h;h=b358b40621b486b7e94ca6077c973dd59de7a072;hb=52eb91c94fb70d58dceef430659c8781de2eccda;hp=5164c20d22d761e08e6c20d0a0c87d5d7ccf712c;hpb=7072a496e2dd83ce0d665ca61c69b779188df8d5;p=lyx.git

diff --git a/src/vspace.h b/src/vspace.h
index 5164c20d22..b358b40621 100644
--- a/src/vspace.h
+++ b/src/vspace.h
@@ -1,22 +1,22 @@
 // -*- C++ -*-
 /**
  * \file vspace.h
- * Copyright 1995-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author Matthias Ettrich
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef VSPACE_H
 #define VSPACE_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "lyxgluelength.h"
 
-#include "LString.h"
+
+namespace lyx {
+
 
 class BufferParams;
 class BufferView;
@@ -27,7 +27,6 @@ class VSpace {
 public:
 	/// The different kinds of spaces.
 	enum vspace_kind {
-		NONE, ///< no added vertical space
 		DEFSKIP,
 		SMALLSKIP,
 		MEDSKIP,
@@ -45,12 +44,12 @@ public:
 	explicit VSpace(LyXGlueLength const & l);
 
 	/// Constructor for reading from a .lyx file
-	explicit VSpace(string const & data);
+	explicit VSpace(std::string const & data);
 
 	/// return the type of vertical space
 	vspace_kind kind() const;
 	/// return the length of this space
-	LyXGlueLength length() const;
+	LyXGlueLength const & length() const;
 
 	// a flag that switches between \vspace and \vspace*
 	bool keep() const;
@@ -62,11 +61,14 @@ public:
 	// conversion
 
 	/// how it goes into the LyX file
-	string const asLyXCommand() const;
+	std::string const asLyXCommand() const;
 	/// the latex representation
-	string const asLatexCommand(BufferParams const & params) const;
+	std::string const asLatexCommand(BufferParams const & params) const;
+	/// how it is seen in the LyX window
+	docstring const asGUIName() const;
 	/// the size of the space on-screen
-	int inPixels(BufferView const * bv) const;
+	int inPixels(BufferView const & bv) const;
+
 private:
 	/// This VSpace kind
 	vspace_kind kind_;
@@ -76,4 +78,7 @@ private:
 	bool keep_;
 };
 
+
+} // namespace lyx
+
 #endif // VSPACE_H