rename tostr.[Ch] to convert.[Ch]

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

src/BufferView_pimpl.C

@@ -68,7 +68,7 @@
 #include "support/filetools.h"
 #include "support/forkedcontr.h"
 #include "support/path_defines.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/types.h"
 
 #include <boost/bind.hpp>

src/ChangeLog

@@ -1,7 +1,9 @@
 2005-01-06  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
+	* everywhere: change support/tostr.h -> support/convert.h
+
 	* tabular.C: make all write_attributes templates, tostr -> convert
-	
+
 	* paragraph.C (simpleLinuxDocOnePar): fix type for ret from getChar
 	(emptyTag): and -> &&, and fix type for ret from getChar
 	(getFirstWord): fix type for ret from getChar

src/LaTeX.C

@@ -22,7 +22,7 @@
 #include "DepTable.h"
 #include "support/filetools.h"
 #include "support/FileInfo.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "support/systemcall.h"

src/MenuBackend.C

@@ -41,7 +41,7 @@
 
 #include "support/filetools.h"
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <boost/bind.hpp>
 

src/Spacing.C

@@ -13,7 +13,7 @@
 
 #include "Spacing.h"
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <sstream>
 #include <string>

src/buffer.C

@@ -70,7 +70,7 @@
 #include "support/os.h"
 #include "support/path.h"
 #include "support/textutils.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <boost/bind.hpp>
 

src/bufferparams.C

@@ -38,7 +38,7 @@
 #include "frontends/Alert.h"
 
 #include "support/lyxalgo.h" // for lyx::count
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/translator.h"
 
 #include <boost/array.hpp>

src/bufferview_funcs.C

@@ -35,7 +35,7 @@
 
 #include "insets/insettext.h"
 
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <sstream>
 

src/counters.C

@@ -16,7 +16,7 @@
 #include "debug.h"
 
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <boost/assert.hpp>
 

src/frontends/controllers/ControlExternal.C

@@ -29,7 +29,7 @@
 
 #include "support/filefilterlist.h"
 #include "support/filetools.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 using std::advance;
 using std::vector;

src/frontends/controllers/ControlGraphics.C

@@ -29,7 +29,7 @@
 #include "support/filefilterlist.h"
 #include "support/filetools.h"
 #include "support/path_defines.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/types.h"
 
 using std::make_pair;

src/frontends/controllers/ControlPrint.C

@@ -21,7 +21,7 @@
 #include "gettext.h"
 #include "PrinterParams.h"
 
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/filefilterlist.h"
 #include "support/filetools.h"
 

src/frontends/controllers/ControlSpellchecker.C

@@ -33,7 +33,7 @@
 #endif
 
 #include "support/textutils.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include "frontends/Alert.h"
 

src/frontends/controllers/ControlTabularCreate.C

@@ -13,7 +13,7 @@
 #include "ControlTabularCreate.h"
 #include "funcrequest.h"
 
-#include "support/tostr.h"
+#include "support/convert.h"
 
 
 using std::string;
@@ -43,7 +43,7 @@ void ControlTabularCreate::clearParams()
 
 void ControlTabularCreate::dispatchParams()
 {
-	string data = convert<string>(params().first) + ' ' + convert<string>(params().second);
+	string const data = convert<string>(params().first) + ' ' + convert<string>(params().second);
 	kernel().dispatch(FuncRequest(LFUN_TABULAR_INSERT, data));
 }
 

src/frontends/xforms/ColorHandler.C

@@ -17,7 +17,7 @@
 #include "LColor.h"
 
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include "lyx_forms.h"
 

src/frontends/xforms/FontInfo.C

@@ -20,7 +20,7 @@
 
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include "lyx_forms.h"
 

src/frontends/xforms/FormBox.C

@@ -17,7 +17,7 @@
 #include "controllers/ButtonPolicies.h"
 #include "controllers/helper_funcs.h"
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include "Tooltips.h"
 #include "xforms_helpers.h"

src/frontends/xforms/FormColorpicker.C

@@ -20,7 +20,7 @@
 #include "lyxrc.h"
 
 #include "support/filetools.h" //  LibFileSearch
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include "lyx_forms.h"
 

src/frontends/xforms/FormDocument.C

@@ -40,7 +40,7 @@
 #include "tex-strings.h"
 #include "vspace.h"
 
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/lstrings.h" // contains, getStringFromVector
 #include "support/filetools.h" // LibFileSearch
 

src/frontends/xforms/FormExternal.C

@@ -31,7 +31,7 @@
 
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include "lyx_forms.h"
 

src/frontends/xforms/FormFiledialog.C

@@ -26,7 +26,7 @@
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "support/os.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include "lyx_forms.h"
 

src/frontends/xforms/FormGraphics.C

@@ -31,7 +31,7 @@
 #include "frontends/Alert.h"
 
 #include "support/lyxlib.h"  // for float_equal
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include "lyx_forms.h"
 

src/frontends/xforms/FormParagraph.C

@@ -28,7 +28,7 @@
 #include "Spacing.h"
 
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include "lyx_forms.h"
 

src/frontends/xforms/FormPrint.C

@@ -23,7 +23,7 @@
 #include "PrinterParams.h"
 
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include "lyx_forms.h"
 

src/frontends/xforms/FormSpellchecker.C

@@ -19,7 +19,7 @@
 #include "xforms_helpers.h"
 #include "xformsBC.h"
 
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include "lyx_forms.h"
 

src/frontends/xforms/FormVSpace.C

@@ -29,7 +29,7 @@
 #include "vspace.h"
 
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include "lyx_forms.h"
 

src/frontends/xforms/FormWrap.C

@@ -23,7 +23,7 @@
 #include "insets/insetwrap.h"
 #include "support/lstrings.h"
 #include "lyx_forms.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 using std::string;
 

src/frontends/xforms/XFormsMenubar.C

@@ -21,7 +21,7 @@
 #include "MenuBackend.h"
 
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <boost/bind.hpp>
 

src/frontends/xforms/xforms_helpers.C

@@ -21,7 +21,7 @@
 #include "support/FileInfo.h"
 #include "support/filetools.h"
 #include "support/lstrings.h" // frontStrip, strip
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include "lyx_forms.h"
 #include "combox.h"

src/graphics/GraphicsConverter.C

@@ -18,7 +18,7 @@
 
 #include "support/filetools.h"
 #include "support/forkedcallqueue.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 

src/graphics/PreviewLoader.C

@@ -33,7 +33,7 @@
 #include "support/forkedcontr.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <boost/bind.hpp>
 

src/insets/ExternalTransforms.C

@@ -16,7 +16,7 @@
 
 #include "support/lstrings.h"
 #include "support/lyxlib.h" // float_equal
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/translator.h"
 
 #include <boost/regex.hpp>

src/insets/insetbibitem.C

@@ -25,7 +25,7 @@
 
 #include "support/lstrings.h"
 #include "support/std_ostream.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 using lyx::support::prefixIs;
 using lyx::support::strToInt;

src/insets/insetexternal.C

@@ -41,7 +41,7 @@
 #include "support/filetools.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/translator.h"
 
 #include <boost/bind.hpp>

src/insets/insetfloat.C

@@ -31,7 +31,7 @@
 #include "pariterator.h"
 
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <sstream>
 

src/insets/insetinclude.C

@@ -44,7 +44,7 @@
 #include "support/filetools.h"
 #include "support/lstrings.h" // contains
 #include "support/lyxlib.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <boost/bind.hpp>
 

src/insets/insetwrap.C

@@ -28,7 +28,7 @@
 #include "outputparams.h"
 #include "paragraph.h"
 
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <sstream>
 

src/lyxfind.C

@@ -30,7 +30,7 @@
 #include "frontends/Alert.h"
 #include "frontends/LyXView.h"
 
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <sstream>
 

src/lyxfunc.C

@@ -86,7 +86,7 @@
 #include "support/path.h"
 #include "support/path_defines.h"
 #include "support/systemcall.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/os.h"
 
 #include <sstream>

src/lyxrc.C

@@ -35,7 +35,7 @@
 
 #include "support/filetools.h"
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/userinfo.h"
 
 using lyx::support::ascii_lowercase;

src/output_docbook.C

@@ -27,7 +27,7 @@
 
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/types.h"
 
 #ifdef HAVE_LOCALE

src/paragraph.C

@@ -42,7 +42,7 @@
 
 #include "support/lstrings.h"
 #include "support/textutils.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <boost/tuple/tuple.hpp>
 #include <boost/bind.hpp>

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>
 

src/support/ChangeLog

@@ -1,9 +1,13 @@
+2005-01-06  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+	* tostr.[Ch]: renamed to convert[ch]
+
 2005-01-06  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
 	* lstrings.[Ch]: change bformat to be a template
-	
+
 	* tostr.[Ch]: tostr -> convert, convert is a template
-	
+
 	* tempname.C:
 	* filetools.C (createBufferTmpDir): tostr -> convert
 

src/support/Makefile.am

@@ -22,6 +22,8 @@ libsupport_la_SOURCES = \
 	abort.C \
 	atoi.C \
 	chdir.C \
+	convert.C \
+	convert.h \
 	copy.C \
 	copied_ptr.h \
 	cow_ptr.h \
@@ -71,8 +73,6 @@ libsupport_la_SOURCES = \
 	systemcall.h \
 	tempname.C \
 	textutils.h \
-	tostr.h \
-	tostr.C \
 	translator.h \
 	types.h \
 	userinfo.C \

src/support/convert.C

@@ -11,7 +11,7 @@
 
 #include <config.h>
 
-#include "tostr.h"
+#include "convert.h"
 
 #include <boost/lexical_cast.hpp>
 

src/support/filetools.C

@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/systemcall.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"

src/support/lstrings.C

@@ -13,7 +13,7 @@
 
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include "debug.h"
 

src/support/tempname.C

@@ -12,7 +12,7 @@
 
 #include "support/lyxlib.h"
 #include "support/filetools.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/os.h"
 
 #include "debug.h"

src/tabular.C

@@ -30,7 +30,7 @@
 #include "insets/insettabular.h"
 
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <sstream>
 

src/tex-accent.C

@@ -12,7 +12,7 @@
 #include <config.h>
 
 #include "tex-accent.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 using std::string;
 

src/tex2lyx/text.C

@@ -19,7 +19,7 @@
 #include "lengthcommon.h"
 #include "support/FileInfo.h"
 #include "support/lstrings.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/filetools.h"
 
 #include <boost/tuple/tuple.hpp>

src/text.C

@@ -67,7 +67,7 @@
 
 #include "support/lstrings.h"
 #include "support/textutils.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <sstream>
 

src/text2.C

@@ -58,7 +58,7 @@
 
 #include "support/lstrings.h"
 #include "support/textutils.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <sstream>
 

src/text3.C

@@ -54,7 +54,7 @@
 
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include "mathed/math_hullinset.h"
 #include "mathed/math_macrotemplate.h"

src/toc.C

@@ -25,7 +25,7 @@
 #include "insets/insetfloat.h"
 #include "insets/insetwrap.h"
 
-#include "support/tostr.h"
+#include "support/convert.h"
 
 using std::vector;
 using std::max;