X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2FAlert.C;h=4ac7f9a4783b1022eb3213104e8d5f8820ffc873;hb=31334d39348282d4586eb82b9bb5e91f03018542;hp=3cad674292c9b18aad57890a98dec86bcee506bb;hpb=9501a5d1308ec782f77c8f6c46f3896ec04c80a8;p=lyx.git

diff --git a/src/frontends/Alert.C b/src/frontends/Alert.C
index 3cad674292..4ac7f9a478 100644
--- a/src/frontends/Alert.C
+++ b/src/frontends/Alert.C
@@ -1,5 +1,5 @@
 /**
- * \file Alert.C
+ * \file Alert.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -14,7 +14,7 @@
 #include "Alert_pimpl.h"
 
 #include "debug.h"
-#include "lyx_gui.h"
+#include "lyx_main.h" // for lyx::use_gui
 
 using std::endl;
 using std::make_pair;
@@ -22,22 +22,26 @@ using std::pair;
 using std::string;
 
 
-int Alert::prompt(string const & title, string const & question,
-           int default_button, int escape_button,
-	   string const & b1, string const & b2, string const & b3)
+namespace lyx {
+
+namespace frontend {
+
+int Alert::prompt(docstring const & title, docstring const & question,
+		  int default_button, int escape_button,
+		  docstring const & b1, docstring const & b2, docstring const & b3)
 {
-	if (!lyx_gui::use_gui || lyxerr.debugging()) {
-		lyxerr << title << '\n'
+	if (!use_gui || lyxerr.debugging()) {
+		lyxerr << to_utf8(title) << '\n'
 		       << "----------------------------------------\n"
-		       << question << endl;
+		       << to_utf8(question) << endl;
 
 		lyxerr << "Assuming answer is ";
 		switch (default_button) {
-		case 0: lyxerr << b1 << endl;
-		case 1: lyxerr << b2 << endl;
-		case 2: lyxerr << b3 << endl;
+		case 0: lyxerr << to_utf8(b1) << endl;
+		case 1: lyxerr << to_utf8(b2) << endl;
+		case 2: lyxerr << to_utf8(b3) << endl;
 		}
-		if (!lyx_gui::use_gui)
+		if (!use_gui)
 			return default_button;
 	}
 
@@ -47,52 +51,54 @@ int Alert::prompt(string const & title, string const & question,
 }
 
 
-void Alert::warning(string const & title, string const & message)
+void Alert::warning(docstring const & title, docstring const & message)
 {
-	if (!lyx_gui::use_gui || lyxerr.debugging())
-		lyxerr << "Warning: " << title << '\n'
-		       << "----------------------------------------\n"
-		       << message << endl;
-	if (lyx_gui::use_gui)
+	lyxerr << "Warning: " << to_utf8(title) << '\n'
+	       << "----------------------------------------\n"
+	       << to_utf8(message) << endl;
+
+	if (use_gui)
 		warning_pimpl(title, message);
 }
 
 
-void Alert::error(string const & title, string const & message)
+void Alert::error(docstring const & title, docstring const & message)
 {
-	if (!lyx_gui::use_gui || lyxerr.debugging())
-		lyxerr << "Error: " << title << '\n'
-		       << "----------------------------------------\n"
-		       << message << endl;
+	lyxerr << "Error: " << to_utf8(title) << '\n'
+	       << "----------------------------------------\n"
+	       << to_utf8(message) << endl;
 
-	if (lyx_gui::use_gui)
+	if (use_gui)
 		error_pimpl(title, message);
 }
 
 
-void Alert::information(string const & title, string const & message)
+void Alert::information(docstring const & title, docstring const & message)
 {
-	if (!lyx_gui::use_gui || lyxerr.debugging())
-		lyxerr << title << '\n'
+	if (!use_gui || lyxerr.debugging())
+		lyxerr << to_utf8(title) << '\n'
 		       << "----------------------------------------\n"
-		       << message << endl;
+		       << to_utf8(message) << endl;
 
-	if (lyx_gui::use_gui)
+	if (use_gui)
 		information_pimpl(title, message);
 }
 
 
-pair<bool, string> const Alert::askForText(string const & msg,
-					   string const & dflt)
+pair<bool, docstring> const Alert::askForText(docstring const & msg,
+					   docstring const & dflt)
 {
-	if (!lyx_gui::use_gui || lyxerr.debugging()) {
+	if (!use_gui || lyxerr.debugging()) {
 		lyxerr << "----------------------------------------\n"
-		       << msg << '\n'
-		       << "Assuming answer is " << dflt << '\n'
+		       << to_utf8(msg) << '\n'
+		       << "Assuming answer is " << to_utf8(dflt) << '\n'
 		       << "----------------------------------------" << endl;
-		if (!lyx_gui::use_gui)
-			return make_pair<bool, string>(true, dflt);
+		if (!use_gui)
+			return make_pair<bool, docstring>(true, dflt);
 	}
 
 	return askForText_pimpl(msg, dflt);
 }
+
+} // namespace frontend
+} // namespace lyx