X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxgluelength.C;h=fbea55bbd0354fa397088258e4eaed6a6ab2f0ed;hb=ba62665f966508db5a4de6864f4aa7374c5a5356;hp=c7c90432293f931ee3363c06b256f65244ee42bb;hpb=99d1627a471b92f403598d03dfc861ddc3c11be0;p=lyx.git

diff --git a/src/lyxgluelength.C b/src/lyxgluelength.C
index c7c9043229..fbea55bbd0 100644
--- a/src/lyxgluelength.C
+++ b/src/lyxgluelength.C
@@ -1,19 +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>
 
 #include "lyxgluelength.h"
 #include "lengthcommon.h"
 
-#include "Lsstream.h"
+#include <sstream>
+
+
+namespace lyx {
+
+using std::ostringstream;
+using std::string;
 
 
 LyXGlueLength::LyXGlueLength(LyXLength const & len)
@@ -41,7 +49,7 @@ 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
@@ -50,7 +58,7 @@ string const LyXGlueLength::asString() const
 			buffer << unit_name[len_.unit()];
 		buffer << '+' << plus_.value();
 		buffer << unit_name[plus_.unit()];
-		return STRCONV(buffer.str());
+		return buffer.str();
 	}
 
 	// just len and minus
@@ -59,7 +67,7 @@ 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();
 	}
 
 	// ok, len, plus AND minus
@@ -70,7 +78,7 @@ 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 ?
@@ -79,7 +87,7 @@ string const LyXGlueLength::asString() const
 	buffer << '+' << plus_.value() << unit_name[plus_.unit()];
 	buffer << '-' << minus_.value() << unit_name[minus_.unit()];
 
-	return STRCONV(buffer.str());
+	return buffer.str();
 }
 
 
@@ -93,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();
 }
 
 
@@ -127,3 +135,6 @@ bool operator!=(LyXGlueLength const & l1, LyXGlueLength const & l2)
 {
 	return !(l1 == l2);
 }
+
+
+} // namespace lyx