X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSpacing.h;h=03c5db72318e79b7c6329a289d35bcc5d12516f8;hb=33243f70037b067f90d1574b74b34f90a2ef2aa1;hp=d164e8eb76e580d05cc11004dd62ecb26e5b9b66;hpb=83acbbd5237373926c629855379e1df9a04209b2;p=lyx.git

diff --git a/src/Spacing.h b/src/Spacing.h
index d164e8eb76..03c5db7231 100644
--- a/src/Spacing.h
+++ b/src/Spacing.h
@@ -1,24 +1,19 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- *        
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+/**
+ * \file src/Spacing.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ====================================================== */
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef SPACING_H
 #define SPACING_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include <iosfwd>
 
-#include "LString.h"
 
 ///
 class Spacing {
@@ -37,12 +32,12 @@ public:
 		Default
 	};
 	///
-	Spacing() : space(Single), value(1.0) {}
+	Spacing() : space(Default), value(1.0) {}
 	///
 	Spacing(Spacing::Space sp, float val = 1.0) {
 		set(sp, val);
 	}
-	Spacing(Spacing::Space sp, string const & val) {
+	Spacing(Spacing::Space sp, std::string const & val) {
 		set(sp, val);
 	}
 	///
@@ -56,18 +51,21 @@ public:
 	///
 	void set(Spacing::Space sp, float val = 1.0);
 	///
-	void set(Spacing::Space sp, string const & val) ;
+	void set(Spacing::Space sp, std::string const & val) ;
 	///
 	void writeFile(std::ostream &, bool para = false) const;
 	///
-	string const writeEnvirBegin() const;
+	std::string const writeEnvirBegin() const;
 	///
-	string const writeEnvirEnd() const;
+	std::string const writeEnvirEnd() const;
+
 private:
 	///
 	Space space;
 	///
 	float value;
+	/// names of line spacing
+	static std::string const spacing_string[];
 };