This commit saves the need to check for lyx::use_gui in a number of places.

[lyx.git] / src / frontends / Alert.C

diff --git a/src/frontends/Alert.C b/src/frontends/Alert.C
index 83e6d33610bab1a1eba21275f4f948ba4a0743f4..0bb83d181af560a00d488e5a3c426cb3794d2491 100644 (file)
--- a/src/frontends/Alert.C
+++ b/src/frontends/Alert.C
@@ -14,7 +14,9 @@
 #include "Alert_pimpl.h"
 
 #include "debug.h"
-#include "lyx_gui.h"
+#include "lyx_main.h" // for lyx::use_gui
+
+using lyx::docstring;
 
 using std::endl;
 using std::make_pair;
@@ -22,22 +24,26 @@ using std::pair;
 using std::string;
 
 
-int Alert::prompt(string const & title, string const & question,
+namespace lyx {
+
+namespace frontend {
+
+int Alert::prompt(docstring const & title, docstring const & question,
                  int default_button, int escape_button,
-                 string const & b1, string const & b2, string const & b3)
+                 docstring const & b1, docstring const & b2, docstring const & b3)
 {
-       if (!lyx_gui::use_gui || lyxerr.debugging()) {
-               lyxerr << title << '\n'
+       if (!lyx::use_gui || lyxerr.debugging()) {
+               lyxerr << lyx::to_utf8(title) << '\n'
                       << "----------------------------------------\n"
-                      << question << endl;
+                      << lyx::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 << lyx::to_utf8(b1) << endl;
+               case 1: lyxerr << lyx::to_utf8(b2) << endl;
+               case 2: lyxerr << lyx::to_utf8(b3) << endl;
                }
-               if (!lyx_gui::use_gui)
+               if (!lyx::use_gui)
                        return default_button;
        }
 
@@ -47,52 +53,55 @@ 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'
+       if (!lyx::use_gui || lyxerr.debugging())
+               lyxerr << "Warning: " << lyx::to_utf8(title) << '\n'
                       << "----------------------------------------\n"
-                      << message << endl;
-       if (lyx_gui::use_gui)
+                      << lyx::to_utf8(message) << endl;
+       if (lyx::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'
+       if (!lyx::use_gui || lyxerr.debugging())
+               lyxerr << "Error: " << lyx::to_utf8(title) << '\n'
                       << "----------------------------------------\n"
-                      << message << endl;
+                      << lyx::to_utf8(message) << endl;
 
-       if (lyx_gui::use_gui)
+       if (lyx::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 (!lyx::use_gui || lyxerr.debugging())
+               lyxerr << lyx::to_utf8(title) << '\n'
                       << "----------------------------------------\n"
-                      << message << endl;
+                      << lyx::to_utf8(message) << endl;
 
-       if (lyx_gui::use_gui)
+       if (lyx::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 (!lyx::use_gui || lyxerr.debugging()) {
                lyxerr << "----------------------------------------\n"
-                      << msg << '\n'
-                      << "Assuming answer is " << dflt << '\n'
+                      << lyx::to_utf8(msg) << '\n'
+                      << "Assuming answer is " << lyx::to_utf8(dflt) << '\n'
                       << "----------------------------------------" << endl;
-               if (!lyx_gui::use_gui)
-                       return make_pair<bool, string>(true, dflt);
+               if (!lyx::use_gui)
+                       return make_pair<bool, docstring>(true, dflt);
        }
 
        return askForText_pimpl(msg, dflt);
 }
+
+}
+}