namespace grfx -> lyx::graphics

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

diff --git a/src/frontends/Alert.C b/src/frontends/Alert.C
index 5b39e2e5bcfeea29e3a460972a05fea8b237a11f..f11661a8aaa2a6dfacb1e6e87ddb090ba0f627c6 100644 (file)
--- a/src/frontends/Alert.C
+++ b/src/frontends/Alert.C
@@ -13,7 +13,7 @@
 #include "Alert.h"
 
 #include "debug.h"
-#include "lyxrc.h"
+#include "lyx_gui.h"
 
 #include "Alert_pimpl.h"
 
@@ -21,24 +21,13 @@ using std::endl;
 using std::pair;
 using std::make_pair;
 
-void Alert::alert(string const & s1, string const & s2, string const & s3)
-{
-       if (!lyxrc.use_gui) {
-               lyxerr << "------------------------------" << endl
-                      << s1 << endl << s2 << endl << s3 << endl
-                      << "------------------------------" << endl;
-       } else {
-               alert_pimpl(s1, s2, s3);
-       }
-}
-
-
 int Alert::prompt(string const & title, string const & question,
-           int default_button,
+           int default_button, int escape_button,
           string const & b1, string const & b2, string const & b3)
 {
-       if (lyxrc.use_gui)
-               return prompt_pimpl(title, question, default_button, b1, b2, b3);
+       if (lyx_gui::use_gui)
+               return prompt_pimpl(title, question,
+                       default_button, escape_button, b1, b2, b3);
 
        lyxerr << title << endl;
        lyxerr << "----------------------------------------" << endl;
@@ -55,7 +44,7 @@ int Alert::prompt(string const & title, string const & question,
 
 void Alert::warning(string const & title, string const & message)
 {
-       if (lyxrc.use_gui)
+       if (lyx_gui::use_gui)
                return warning_pimpl(title, message);
 
        lyxerr << "Warning: " << title << endl;
@@ -66,7 +55,7 @@ void Alert::warning(string const & title, string const & message)
 
 void Alert::error(string const & title, string const & message)
 {
-       if (lyxrc.use_gui)
+       if (lyx_gui::use_gui)
                return error_pimpl(title, message);
 
        lyxerr << "Error: " << title << endl;
@@ -77,7 +66,7 @@ void Alert::error(string const & title, string const & message)
 
 void Alert::information(string const & title, string const & message)
 {
-       if (lyxrc.use_gui)
+       if (lyx_gui::use_gui)
                return information_pimpl(title, message);
 
        lyxerr << title << endl;
@@ -89,7 +78,7 @@ void Alert::information(string const & title, string const & message)
 pair<bool, string> const Alert::askForText(string const & msg,
                                           string const & dflt)
 {
-       if (!lyxrc.use_gui) {
+       if (!lyx_gui::use_gui) {
                lyxerr << "----------------------------------------" << endl
                       << msg << endl
                       << "Assuming answer is " << dflt