X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fvspace.h;h=fdbc7760f0847e0ad21f9a048b1e2cd7701e1132;hb=6c300f72a217722652dc27db9108e1050028979c;hp=99a92d341763e924aa9aed01e472c2ed5958f1bb;hpb=236ea81bc5c0ce7101c9460d1ee97b8f3c9be9df;p=lyx.git

diff --git a/src/vspace.h b/src/vspace.h
index 99a92d3417..fdbc7760f0 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,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;
@@ -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
+	std::string 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