X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSpacing.C;h=0987e337bd6638280578d0b169ae1558dbaefbd5;hb=78046794ccfce3a20751e00b35295c290853afd6;hp=b80f55ffb13c554ac0c93cb5d9cb57fe198d2f47;hpb=adaef99e60e28eba8c413a3472cc71e234718af0;p=lyx.git

diff --git a/src/Spacing.C b/src/Spacing.C
index b80f55ffb1..0987e337bd 100644
--- a/src/Spacing.C
+++ b/src/Spacing.C
@@ -1,32 +1,30 @@
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- *        
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+/**
+ * \file Spacing.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ====================================================== */
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "Spacing.h"
-#include "LString.h"
 
 using std::ios;
+using std::istringstream;
 using std::ostream;
+using std::ostringstream;
+using std::string;
 
-/// how can I put this inside of Spacing (class)
-static
-char const * spacing_string[] = {"single", "onehalf", "double", "other"};
 
+string const Spacing::spacing_string[]
+	= {"single", "onehalf", "double", "other"};
 
-float Spacing::getValue() const 
+float Spacing::getValue() const
 {
 	switch (space) {
 	case Default: // nothing special should happen with this...
@@ -55,8 +53,8 @@ void Spacing::set(Spacing::Space sp, float val)
 
 void Spacing::set(Spacing::Space sp, string const & val)
 {
-	float fval;
-	istringstream istr(val);
+	float fval = 0.0;
+	istringstream istr(val.c_str());
 	istr >> fval;
 	set(sp, fval);
 }
@@ -65,17 +63,17 @@ void Spacing::set(Spacing::Space sp, string const & val)
 void Spacing::writeFile(ostream & os, bool para) const
 {
 	if (space == Default) return;
-	
+
 	string cmd = para ? "\\paragraph_spacing " : "\\spacing ";
-	
+
 	if (getSpace() == Spacing::Other) {
 		os.setf(ios::showpoint|ios::fixed);
 		os.precision(2);
 		os << cmd << spacing_string[getSpace()]
-		   << " " << getValue() << " \n";
+		   << ' ' << getValue() << " \n";
 	} else {
 		os << cmd << spacing_string[getSpace()] << " \n";
-	}	
+	}
 }
 
 
@@ -93,8 +91,8 @@ string const Spacing::writeEnvirBegin() const
 	{
 		ostringstream ost;
 		ost << "\\begin{spacing}{"
-		    << getValue() << "}";
-		return ost.str().c_str();
+		    << getValue() << '}';
+		return ost.str();
 	}
 	}
 	return string();