Spaces menu for math dialog

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

diff --git a/src/frontends/Alert.C b/src/frontends/Alert.C
index 474d5367599a10953bba93b90644f42b5d2d7851..708ebf2c8a60154d2a19f0a44e42cffa7db15a92 100644 (file)
--- a/src/frontends/Alert.C
+++ b/src/frontends/Alert.C
@@ -1,88 +1,108 @@
 /**
  * \file Alert.C
- * Copyright 2001 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author John Levon <moz@compsoc.man.ac.uk>
+ * \author John Levon 
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #include <config.h>
- 
-#include <cerrno>
- 
+
+#include "Alert.h"
+
 #include "debug.h"
-#include "lyxrc.h" 
- 
+#include "lyxrc.h"
+
 #include "Alert_pimpl.h"
 
+#include <cerrno>
+
+#ifndef CXX_GLOBAL_CSTD
+using std::strerror;
+#endif
+
 using std::endl;
+using std::pair;
+using std::make_pair;
 
-namespace Alert {
- 
-       void 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);
-               }
-       }
 
-       void err_alert(string const & s1, string const & s2) {
-               alert(s1, s2, strerror(errno));
+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);
        }
+}
 
-       bool askQuestion(string const & s1, string const & s2, string const & s3, bool default_value) {
-               if (!lyxrc.use_gui) {
-                               lyxerr << "----------------------------------------" << endl
-                                      << s1 << endl;
-                               if (!s2.empty())
-                                       lyxerr << s2 << endl;
-                               if (!s3.empty())
-                                       lyxerr << s3 << endl;
-                       lyxerr << "Assuming answer is "
-                              << (default_value ? "yes" : "no")
-                              << endl
-                              << "----------------------------------------" << endl;
-                       return default_value;
-               } else {
-                       return askQuestion_pimpl(s1, s2, s3);
-               }
+
+void Alert::err_alert(string const & s1, string const & s2)
+{
+       alert(s1, s2, strerror(errno));
+}
+
+
+bool Alert::askQuestion(string const & s1, string const & s2,
+                       string const & s3, bool default_value)
+{
+       if (!lyxrc.use_gui) {
+               lyxerr << "----------------------------------------" << endl
+                      << s1 << endl;
+               if (!s2.empty())
+                       lyxerr << s2 << endl;
+               if (!s3.empty())
+                       lyxerr << s3 << endl;
+               lyxerr << "Assuming answer is "
+                      << (default_value ? "yes" : "no")
+                      << endl
+                      << "----------------------------------------" << endl;
+               return default_value;
+       } else {
+               return askQuestion_pimpl(s1, s2, s3);
        }
+}
 
-       int askConfirmation(string const & s1, string const & s2, string const & s3, int default_value) {
-               if (!lyxrc.use_gui) {
-                       lyxerr << "----------------------------------------" << endl
-                              << s1 << endl;
-                       if (!s2.empty())
-                                       lyxerr << s2 << endl;
-                       if (!s3.empty())
-                               lyxerr << s3 << endl;
-                       lyxerr << "Assuming answer is ";
-                       if (default_value == 1)
-                               lyxerr << "yes";
-                       else if (default_value == 2)
-                               lyxerr << "no";
-                       else
-                               lyxerr << "cancel";
-                       lyxerr << endl
-                              << "----------------------------------------" << endl;
-                       return default_value;
-               } else {
-                       return askConfirmation_pimpl(s1, s2, s3);
-               }
+
+int Alert::askConfirmation(string const & s1, string const & s2,
+                          string const & s3, int default_value)
+{
+       if (!lyxrc.use_gui) {
+               lyxerr << "----------------------------------------" << endl
+                      << s1 << endl;
+               if (!s2.empty())
+                       lyxerr << s2 << endl;
+               if (!s3.empty())
+                       lyxerr << s3 << endl;
+               lyxerr << "Assuming answer is ";
+               if (default_value == 1)
+                       lyxerr << "yes";
+               else if (default_value == 2)
+                       lyxerr << "no";
+               else
+                       lyxerr << "cancel";
+               lyxerr << endl
+                      << "----------------------------------------" << endl;
+               return default_value;
+       } else {
+               return askConfirmation_pimpl(s1, s2, s3);
        }
- 
-       std::pair<bool, string> const askForText(string const & msg, string const & dflt) {
-               if (!lyxrc.use_gui) {
-                       lyxerr << "----------------------------------------" << endl
-                              << msg << endl
-                              << "Assuming answer is " << dflt
-                              << "----------------------------------------" << endl;
-                       return std::make_pair<bool, string>(true, dflt);
-               } else {
-                       return askForText_pimpl(msg, dflt);
-               }
+}
+
+
+pair<bool, string> const Alert::askForText(string const & msg,
+                                          string const & dflt)
+{
+       if (!lyxrc.use_gui) {
+               lyxerr << "----------------------------------------" << endl
+                      << msg << endl
+                      << "Assuming answer is " << dflt
+                      << "----------------------------------------" << endl;
+               return make_pair<bool, string>(true, dflt);
+       } else {
+               return askForText_pimpl(msg, dflt);
        }
 }