From: André Pönitz <poenitz@gmx.net>
Date: Fri, 16 May 2003 14:59:48 +0000 (+0000)
Subject: lstrings.[Ch]: use string const & instead of char const * for format
X-Git-Tag: 1.6.10~16815
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a9d83a85838a87660b49ec2b8e7b6a5f52488ea4;p=features.git

lstrings.[Ch]: use string const & instead of char const * for format
 more in line with the other args whcih are already string


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6974 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 76081eccc3..1648c841e0 100644
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,4 +1,8 @@
 
+2003-05-15  André Pönitz  <poenitz@gmx.net>
+
+	* lstrings.[Ch]: use string const & instead of char const * for format
+
 2003-05-12  André Pönitz  <poenitz@gmx.net>
 
 	* tostr.[Ch]: add long int overload
diff --git a/src/support/lstrings.C b/src/support/lstrings.C
index 979381cd8f..cf5589c23e 100644
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -676,18 +676,18 @@ string const getStringFromVector(vector<string> const & vec,
 
 #if USE_BOOST_FORMAT
 
-string bformat(char const * fmt, string const & arg1)
+string bformat(string const & fmt, string const & arg1)
 {
 	return STRCONV((boost::format(fmt) % STRCONV(arg1)).str());
 }
 
 
-string bformat(char const * fmt, string const & arg1, string const & arg2)
+string bformat(string const & fmt, string const & arg1, string const & arg2)
 {
 	return STRCONV((boost::format(fmt) % STRCONV(arg1) % STRCONV(arg2)).str());
 }
 
-string bformat(char 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)
 {
 	return STRCONV((boost::format(fmt) % STRCONV(arg1) % STRCONV(arg2)
@@ -696,7 +696,7 @@ string bformat(char const * fmt, string const & arg1, string const & arg2,
 
 #else 
 
-string bformat(char const * fmt, string const & arg1)
+string bformat(string const & fmt, string const & arg1)
 {
 	lyx::Assert(contains(fmt, "%1$s"));
 	string const str = subst(fmt, "%1$s", arg1);
@@ -704,7 +704,7 @@ string bformat(char const * fmt, string const & arg1)
 }
 
 
-string bformat(char const * fmt, string const & arg1, string const & arg2)
+string bformat(string const & fmt, string const & arg1, string const & arg2)
 {
 	lyx::Assert(contains(fmt, "%1$s"));
 	lyx::Assert(contains(fmt, "%2$s"));
diff --git a/src/support/lstrings.h b/src/support/lstrings.h
index 45df1f5e14..71ab15cfba 100644
--- a/src/support/lstrings.h
+++ b/src/support/lstrings.h
@@ -210,14 +210,14 @@ string const getStringFromVector(std::vector<string> const & vec,
 				 string const & delim = ",");
 
 // wrapper around boost::format using one argument %1$s
-string bformat(char const * fmt, string const & arg1);
+string bformat(string const & fmt, string const & arg1);
 // arguments %1$s and %2$s
-string bformat(char const * fmt, string const & arg1, string const & arg2);
+string bformat(string const & fmt, string const & arg1, string const & arg2);
 // arguments %1$s and %2$s and %3$s
-string bformat(char const * fmt, string const & arg1, string const & arg2,
+string bformat(string const & fmt, string const & arg1, string const & arg2,
                string const & arg3);
 // arguments %1$s and %2$s and %3$s and %4$s
-string bformat(char 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);
 
 #endif