X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fvspace.h;h=b358b40621b486b7e94ca6077c973dd59de7a072;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=16a27e3e042e1b5d6598ad3f019967c578a27767;hpb=0f9678630c661df5e3376c16cab3a5b2824871e9;p=lyx.git

diff --git a/src/vspace.h b/src/vspace.h
index 16a27e3e04..b358b40621 100644
--- a/src/vspace.h
+++ b/src/vspace.h
@@ -14,7 +14,9 @@
 
 #include "lyxgluelength.h"
 
-#include "support/std_string.h"
+
+namespace lyx {
+
 
 class BufferParams;
 class BufferView;
@@ -25,7 +27,6 @@ class VSpace {
 public:
 	/// The different kinds of spaces.
 	enum vspace_kind {
-		NONE, ///< no added vertical space
 		DEFSKIP,
 		SMALLSKIP,
 		MEDSKIP,
@@ -43,7 +44,7 @@ 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;
@@ -60,9 +61,11 @@ 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;
 
@@ -75,4 +78,7 @@ private:
 	bool keep_;
 };
 
+
+} // namespace lyx
+
 #endif // VSPACE_H