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 3bae1126f40bc1bee8ae48f52e3de225448c702f..0bb83d181af560a00d488e5a3c426cb3794d2491 100644 (file)
--- a/src/frontends/Alert.C
+++ b/src/frontends/Alert.C
@@ -14,7 +14,7 @@
 #include "Alert_pimpl.h"
 
 #include "debug.h"
-#include "lyx_gui.h"
+#include "lyx_main.h" // for lyx::use_gui
 
 using lyx::docstring;
 
@@ -24,11 +24,15 @@ using std::pair;
 using std::string;
 
 
+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()) {
+       if (!lyx::use_gui || lyxerr.debugging()) {
                lyxerr << lyx::to_utf8(title) << '\n'
                       << "----------------------------------------\n"
                       << lyx::to_utf8(question) << endl;
@@ -39,7 +43,7 @@ int Alert::prompt(docstring const & title, docstring const & question,
                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;
        }
 
@@ -51,35 +55,35 @@ int Alert::prompt(docstring const & title, docstring const & question,
 
 void Alert::warning(docstring const & title, docstring const & message)
 {
-       if (!lyx_gui::use_gui || lyxerr.debugging())
+       if (!lyx::use_gui || lyxerr.debugging())
                lyxerr << "Warning: " << lyx::to_utf8(title) << '\n'
                       << "----------------------------------------\n"
                       << lyx::to_utf8(message) << endl;
-       if (lyx_gui::use_gui)
+       if (lyx::use_gui)
                warning_pimpl(title, message);
 }
 
 
 void Alert::error(docstring const & title, docstring const & message)
 {
-       if (!lyx_gui::use_gui || lyxerr.debugging())
+       if (!lyx::use_gui || lyxerr.debugging())
                lyxerr << "Error: " << lyx::to_utf8(title) << '\n'
                       << "----------------------------------------\n"
                       << lyx::to_utf8(message) << endl;
 
-       if (lyx_gui::use_gui)
+       if (lyx::use_gui)
                error_pimpl(title, message);
 }
 
 
 void Alert::information(docstring const & title, docstring const & message)
 {
-       if (!lyx_gui::use_gui || lyxerr.debugging())
+       if (!lyx::use_gui || lyxerr.debugging())
                lyxerr << lyx::to_utf8(title) << '\n'
                       << "----------------------------------------\n"
                       << lyx::to_utf8(message) << endl;
 
-       if (lyx_gui::use_gui)
+       if (lyx::use_gui)
                information_pimpl(title, message);
 }
 
@@ -87,14 +91,17 @@ void Alert::information(docstring const & title, docstring const & message)
 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"
                       << lyx::to_utf8(msg) << '\n'
                       << "Assuming answer is " << lyx::to_utf8(dflt) << '\n'
                       << "----------------------------------------" << endl;
-               if (!lyx_gui::use_gui)
+               if (!lyx::use_gui)
                        return make_pair<bool, docstring>(true, dflt);
        }
 
        return askForText_pimpl(msg, dflt);
 }
+
+}
+}