X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxgluelength.C;h=fbea55bbd0354fa397088258e4eaed6a6ab2f0ed;hb=e7f4618bcce770369cf46335c2c7f0164b4b8857;hp=ae56a832689dc1a2902fd1f503d45d6615fe9e1b;hpb=6a1167adab9c33e0800cf1e7b314344a21cf93fe;p=lyx.git

diff --git a/src/lyxgluelength.C b/src/lyxgluelength.C
index ae56a83268..fbea55bbd0 100644
--- a/src/lyxgluelength.C
+++ b/src/lyxgluelength.C
@@ -1,23 +1,27 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file lyxgluelength.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
+ * \author Matthias Ettrich
+ * \author John Levon
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "lyxgluelength.h"
 #include "lengthcommon.h"
 
-#include "Lsstream.h"
+#include <sstream>
+
+
+namespace lyx {
+
+using std::ostringstream;
+using std::string;
 
 
 LyXGlueLength::LyXGlueLength(LyXLength const & len)
@@ -45,25 +49,25 @@ string const LyXGlueLength::asString() const
 
 	if (plus_.zero() && minus_.zero()) {
 		buffer << unit_name[len_.unit()];
-		return STRCONV(buffer.str());
+		return buffer.str();
 	}
 
 	// just len and plus
 	if (minus_.zero()) {
 		if (len_.unit() != plus_.unit())
 			buffer << unit_name[len_.unit()];
-		buffer << "+" << plus_.value();
+		buffer << '+' << plus_.value();
 		buffer << unit_name[plus_.unit()];
-		return STRCONV(buffer.str());
+		return buffer.str();
 	}
 
 	// just len and minus
 	if (plus_.zero()) {
 		if (len_.unit() != minus_.unit())
 			buffer << unit_name[len_.unit()];
-		buffer << "-" << minus_.value();
+		buffer << '-' << minus_.value();
 		buffer << unit_name[minus_.unit()];
-		return STRCONV(buffer.str());
+		return buffer.str();
 	}
 
 	// ok, len, plus AND minus
@@ -74,16 +78,16 @@ string const LyXGlueLength::asString() const
 			buffer << unit_name[len_.unit()];
 		buffer << "+-" << minus_.value();
 		buffer << unit_name[minus_.unit()];
-		return STRCONV(buffer.str());
+		return buffer.str();
 	}
 
 	// this is so rare a case, why bother minimising units ?
 
 	buffer << unit_name[len_.unit()];
-	buffer << "+" << plus_.value() << unit_name[plus_.unit()];
-	buffer << "-" << minus_.value() << unit_name[minus_.unit()];
+	buffer << '+' << plus_.value() << unit_name[plus_.unit()];
+	buffer << '-' << minus_.value() << unit_name[minus_.unit()];
 
-	return STRCONV(buffer.str());
+	return buffer.str();
 }
 
 
@@ -97,7 +101,7 @@ string const LyXGlueLength::asLatexString() const
 		buffer << " plus " << plus_.value() << unit_name[plus_.unit()];
 	if (!minus_.zero())
 		buffer << " minus " << minus_.value() << unit_name[minus_.unit()];
-	return STRCONV(buffer.str());
+	return buffer.str();
 }
 
 
@@ -131,3 +135,6 @@ bool operator!=(LyXGlueLength const & l1, LyXGlueLength const & l2)
 {
 	return !(l1 == l2);
 }
+
+
+} // namespace lyx