X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fconverter.C;h=604e4d70f4048428c34125581fcfeaae90758d22;hb=15271fce0705ea5611647b5b3d1e993362ff5284;hp=cb1b84653b3cf94a665c6a792c077e26d74fb584;hpb=dd19aa6e6336c3cfa22d927170eb14c3c35d1f9e;p=lyx.git

diff --git a/src/converter.C b/src/converter.C
index cb1b84653b..604e4d70f4 100644
--- a/src/converter.C
+++ b/src/converter.C
@@ -25,10 +25,10 @@
 #include "bufferview_funcs.h"
 #include "LaTeX.h"
 #include "LyXView.h"
-#include "minibuffer.h"
 #include "lyx_gui_misc.h"
 #include "lyx_cb.h" // ShowMessage()
 #include "support/lyxfunctional.h"
+#include "gettext.h"
 
 using std::vector;
 using std::queue;
@@ -38,13 +38,15 @@ using std::find_if;
 using std::reverse;
 using std::sort;
 
-static string const token_from("$$i");
-static string const token_base("$$b");
-static string const token_to("$$o");
+namespace {
+
+string const token_from("$$i");
+string const token_base("$$b");
+string const token_to("$$o");
 
 //////////////////////////////////////////////////////////////////////////////
 
-static inline
+inline
 string const add_options(string const & command, string const & options)
 {
 	string head;
@@ -52,6 +54,8 @@ string const add_options(string const & command, string const & options)
 	return head + ' ' + options + ' ' + tail;
 }
 
+} // namespace anon
+
 //////////////////////////////////////////////////////////////////////////////
 
 bool Format::dummy() const
@@ -81,7 +85,7 @@ Format const * Formats::GetFormat(string const & name) const
 {
 	FormatList::const_iterator cit =
 		find_if(formatlist.begin(), formatlist.end(),
-			compare_memfun(&Format::name, name));
+			lyx::compare_memfun(&Format::name, name));
 	if (cit != formatlist.end())
 		return &(*cit);
 	else
@@ -93,7 +97,7 @@ int Formats::GetNumber(string const & name) const
 {
 	FormatList::const_iterator cit =
 		find_if(formatlist.begin(), formatlist.end(),
-			compare_memfun(&Format::name, name));
+			lyx::compare_memfun(&Format::name, name));
 	if (cit != formatlist.end())
 		return cit - formatlist.begin();
 	else
@@ -113,7 +117,7 @@ void Formats::Add(string const & name, string const & extension,
 {
 	FormatList::iterator it = 
 		find_if(formatlist.begin(), formatlist.end(),
-			compare_memfun(&Format::name, name));
+			lyx::compare_memfun(&Format::name, name));
 	if (it == formatlist.end())
 		formatlist.push_back(Format(name, extension, prettyname,
 					    shortcut, ""));
@@ -128,7 +132,7 @@ void Formats::Delete(string const & name)
 {
 	FormatList::iterator it = 
 		find_if(formatlist.begin(), formatlist.end(),
-			compare_memfun(&Format::name, name));
+			lyx::compare_memfun(&Format::name, name));
 	if (it != formatlist.end())
 		formatlist.erase(it);
 }
@@ -145,7 +149,7 @@ void Formats::SetViewer(string const & name, string const & command)
 	Add(name);
 	FormatList::iterator it =
 		find_if(formatlist.begin(), formatlist.end(),
-			compare_memfun(&Format::name, name));
+			lyx::compare_memfun(&Format::name, name));
 	if (it != formatlist.end())
 		it->setViewer(command);
 }
@@ -813,7 +817,7 @@ bool Converters::runLaTeX(Buffer const * buffer, string const & command)
 
 	if (bv) {
 		ProhibitInput(bv);
-		bv->owner()->getMiniBuffer()->Set(_("Running LaTeX..."));
+		bv->owner()->message(_("Running LaTeX..."));
 		// Remove all error insets
 		need_redraw = bv->removeAutoInsets();
 	}
@@ -823,7 +827,7 @@ bool Converters::runLaTeX(Buffer const * buffer, string const & command)
 	TeXErrors terr;
 	LaTeX latex(command, name, buffer->filepath);
 	int result = latex.run(terr,
-			       bv ? bv->owner()->getMiniBuffer() : 0);
+			       bv ? bv->owner()->getLyXFunc() : 0);
 	
 
 	if (bv) {