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 76081eccc319d519be9a5135c9517337626bff62..1648c841e01b26fb0307aecac3b5ffdce0995ab4 100644 (file)
--- 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 979381cd8fd95ce832f08118926a5f1814f1d7ad..cf5589c23e06d2e3bcf6f8b91715daf52ae11c3f 100644 (file)
--- 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 45df1f5e14edd92dcb535b5e474b91f593de0989..71ab15cfbad7e265f2cb33015645640a14955c10 100644 (file)
--- 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