X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FSpacing.C;h=832fe8f1e3d1897884a731aadfdb63e5e21ba08d;hb=c90c5e6386ce69c34c99b3594d6fa452e6a13161;hp=746ee33f43838c5d42e5b6c2ae57014935c586c8;hpb=d0950acedaa91320340af398bb06d790486a2207;p=lyx.git

diff --git a/src/Spacing.C b/src/Spacing.C
index 746ee33f43..832fe8f1e3 100644
--- a/src/Spacing.C
+++ b/src/Spacing.C
@@ -1,14 +1,20 @@
-#include <config.h>
+/* This file is part of
+ * ====================================================== 
+ * 
+ *           LyX, The Document Processor
+ *        
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2000 The LyX Team.
+ *
+ * ====================================================== */
 
+#include <config.h>
 
-#ifdef HAVE_SSTREAM
-#include <sstream>
-using std::istringstream;
-using std::ostringstream;
-#else
-#include <strstream>
+#ifdef __GNUG__
+#pragma implementation
 #endif
 
+#include "Lsstream.h"
 #include "Spacing.h"
 #include "LString.h"
 
@@ -16,13 +22,16 @@ using std::ios;
 using std::ostream;
 
 /// how can I put this inside of Spacing (class)
-static
-char const * spacing_string[] = {"single", "onehalf", "double", "other"};
+namespace {
+
+char const * const spacing_string[] = {"single", "onehalf", "double", "other"};
+
+} // namespace anon
 
 
 float Spacing::getValue() const 
 {
-	switch(space) {
+	switch (space) {
 	case Default: // nothing special should happen with this...
 	case Single: return 1.0;
 	case Onehalf: return 1.25;
@@ -37,7 +46,7 @@ void Spacing::set(Spacing::Space sp, float val)
 {
 	space = sp;
 	if (sp == Other) {
-		switch(int(val * 1000 + 0.5)) {
+		switch (int(val * 1000 + 0.5)) {
 		case 1000: space = Single; break;
 		case 1250: space = Onehalf; break;
 		case 1667: space = Double; break;
@@ -47,14 +56,10 @@ void Spacing::set(Spacing::Space sp, float val)
 }
 
 
-void Spacing::set(Spacing::Space sp, char const * val)
+void Spacing::set(Spacing::Space sp, string const & val)
 {
 	float fval;
-#ifdef HAVE_SSTREAM
-	istringstream istr(val);
-#else
-	istrstream istr(val);
-#endif
+	istringstream istr(val.c_str());
 	istr >> fval;
 	set(sp, fval);
 }
@@ -77,56 +82,40 @@ void Spacing::writeFile(ostream & os, bool para) const
 }
 
 
-string Spacing::writeEnvirBegin() const
+string const Spacing::writeEnvirBegin() const
 {
-	switch(space) {
+	switch (space) {
 	case Default: break; // do nothing
 	case Single:
 		return "\\begin{singlespace}";
-		break;
 	case Onehalf:
 		return "\\begin{onehalfspace}";
-		break;
 	case Double:
 		return "\\begin{doublespace}";
-		break;
 	case Other:
-#ifdef HAVE_SSTREAM
+	{
 		ostringstream ost;
 		ost << "\\begin{spacing}{"
 		    << getValue() << "}";
 		return ost.str().c_str();
-#else
-		{
-			char tmp[512];
-			ostrstream ost(tmp, 512);
-			ost << "\\begin{spacing}{"
-			    << getValue() << "}";
-			return ost.str();
-		}
-#endif
-		break;
+	}
 	}
 	return string();
 }
 
 
-string Spacing::writeEnvirEnd() const
+string const Spacing::writeEnvirEnd() const
 {
-	switch(space) {
+	switch (space) {
 	case Default: break; // do nothing
 	case Single:
 		return "\\end{singlespace}";
-		break;
 	case Onehalf:
 		return "\\end{onehalfspace}";
-		break;
 	case Double:
 		return "\\end{doublespace}";
-		break;
 	case Other:
 		return "\\end{spacing}";
-		break;
 	}
 	return string();
 }