Replace LString.h with support/std_string.h,

[features.git] / src / support / lstrings.h

diff --git a/src/support/lstrings.h b/src/support/lstrings.h
index 771cba3d6fb3307f29eb412a983330ce9a3b3ac3..0725ff3f490b21d8a17b80a82f6f14d437d02927 100644 (file)
--- a/src/support/lstrings.h
+++ b/src/support/lstrings.h
@@ -7,7 +7,7 @@
  * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  *
  * A collection of string helper functions that works with string.
  * Some of these would certainly benefit from a rewrite/optimization.
@@ -18,7 +18,10 @@
 
 #include <vector>
 
-#include "LString.h"
+#include "support/std_string.h"
+
+namespace lyx {
+namespace support {
 
 ///
 int compare_no_case(string const & s, string const & s2);
@@ -203,6 +206,8 @@ string const getStringFromVector(std::vector<string> const & vec,
 string bformat(string const & fmt, string const & arg1);
 // arguments %1$s and %2$s
 string bformat(string const & fmt, string const & arg1, string const & arg2);
+// arguments %1$d and %2$d
+string bformat(string const & fmt, int arg1, int arg2);
 // arguments %1$s and %2$s and %3$s
 string bformat(string const & fmt, string const & arg1, string const & arg2,
                string const & arg3);
@@ -210,4 +215,7 @@ string bformat(string const & fmt, string const & arg1, string const & arg2,
 string bformat(string const & fmt, string const & arg1, string const & arg2,
                string const & arg3, string const & arg4);
 
+} // namespace support
+} // namespace lyx
+
 #endif