X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsgml.C;h=6e3f732ef78235cd135feb7598db658bd019d73c;hb=e7fc677261bd14fdf159e594fcf422e985c72664;hp=9d159f4d7a32981ef4fca6601b0c522275a9ea4e;hpb=68b0cca2e701e4959ffb4754184b9b28110b8e7f;p=lyx.git

diff --git a/src/sgml.C b/src/sgml.C
index 9d159f4d7a..6e3f732ef7 100644
--- a/src/sgml.C
+++ b/src/sgml.C
@@ -22,7 +22,7 @@
 
 #include "support/lstrings.h"
 #include "support/std_ostream.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <boost/tuple/tuple.hpp>
 
@@ -117,7 +117,7 @@ string escapeString(string const & raw)
 string const uniqueID(string const label)
 {
 	static unsigned int seed = 1000;
-	return label + tostr(++seed);
+	return label + convert<string>(++seed);
 }
 
 
@@ -172,9 +172,9 @@ string cleanID(Buffer const & buf, OutputParams const & runparams, std::string c
 		}
 	}
 	if (mangle) {
-		content += "-" + tostr(mangleID++);
+		content += "-" + convert<string>(mangleID++);
 	}
-	else if (isdigit(content[content.size()-1])) {
+	else if (isdigit(content[content.size() - 1])) {
 		content += ".";
 	}
 
@@ -220,7 +220,7 @@ void openTag(Buffer const & buf, ostream & os, OutputParams const & runparams, P
 		if (param.find('#') != string::npos) {
 			string::size_type pos = param.find("id=<");
 			string::size_type end = param.find(">");
-			if( pos != string::npos and end != string::npos)
+			if( pos != string::npos && end != string::npos)
 				param.erase(pos, end-pos + 1);
 		}
 		attribute = id + ' ' + param;
@@ -231,7 +231,7 @@ void openTag(Buffer const & buf, ostream & os, OutputParams const & runparams, P
 			else
 				counters.step(style->latexname());
 			int i = counters.value(name);
-			attribute = subst(param, "#", tostr(i));
+			attribute = subst(param, "#", convert<string>(i));
 		} else {
 			attribute = param;
 		}