X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxgluelength.C;h=c7c90432293f931ee3363c06b256f65244ee42bb;hb=fe390e9da1538e20eabbc98977d845295f8e563d;hp=fd1cf48565f725efdeec5451932037970a615681;hpb=0b95bed2953cf7d9dcdf950851fea08a12f21af6;p=lyx.git

diff --git a/src/lyxgluelength.C b/src/lyxgluelength.C
index fd1cf48565..c7c9043229 100644
--- a/src/lyxgluelength.C
+++ b/src/lyxgluelength.C
@@ -10,10 +10,6 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "lyxgluelength.h"
 #include "lengthcommon.h"
 
@@ -45,45 +41,45 @@ string const LyXGlueLength::asString() const
 
 	if (plus_.zero() && minus_.zero()) {
 		buffer << unit_name[len_.unit()];
-		return buffer.str().c_str();
+		return STRCONV(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 buffer.str().c_str();
+		return STRCONV(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 buffer.str().c_str();
+		return STRCONV(buffer.str());
 	}
 
 	// ok, len, plus AND minus
- 
+
 	// len+-
 	if (minus_ == plus_) {
 		if (len_.unit() != minus_.unit())
 			buffer << unit_name[len_.unit()];
 		buffer << "+-" << minus_.value();
 		buffer << unit_name[minus_.unit()];
-		return buffer.str().c_str();
+		return STRCONV(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()];
- 
-	return buffer.str().c_str();
+	buffer << '+' << plus_.value() << unit_name[plus_.unit()];
+	buffer << '-' << minus_.value() << unit_name[minus_.unit()];
+
+	return STRCONV(buffer.str());
 }
 
 
@@ -92,12 +88,12 @@ string const LyXGlueLength::asLatexString() const
 	ostringstream buffer;
 
 	buffer << len_.value() << unit_name[len_.unit()];
- 
+
 	if (!plus_.zero())
 		buffer << " plus " << plus_.value() << unit_name[plus_.unit()];
 	if (!minus_.zero())
 		buffer << " minus " << minus_.value() << unit_name[minus_.unit()];
-	return buffer.str().c_str();
+	return STRCONV(buffer.str());
 }