* src/frontends/qt4/GuiSelection.C

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

diff --git a/src/frontends/Alert.h b/src/frontends/Alert.h
index 12847b2dc1a388c01f7d3a688e682657e23815be..7bd81ebe4c590d0282e7131ddab6b53120d1db1b 100644 (file)
--- a/src/frontends/Alert.h
+++ b/src/frontends/Alert.h
@@ -6,7 +6,7 @@
  *
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef LYX_ALERT_H
@@ -14,8 +14,9 @@
 
 #include "support/lstrings.h"
 
-#include <algorithm>
 
+namespace lyx {
+namespace frontend {
 namespace Alert {
 
 /**
@@ -29,21 +30,21 @@ namespace Alert {
  * "Yes" or "No", I will personally come around to your house and
  * slap you with fish, and not in an enjoyable way either.
  */
-int prompt(string const & title, string const & question,
-           int default_button, int cancel_button,
-          string const & b1, string const & b2, string const & b3 = string());
+int prompt(docstring const & title, docstring const & question,
+          int default_button, int cancel_button,
+          docstring const & b1, docstring const & b2, docstring const & b3 = docstring());
 
 /**
  * Display a warning to the user. Title should be a short (general) summary.
  * Only use this if the user cannot perform some remedial action.
  */
-void warning(string const & title, string const & message);
+void warning(docstring const & title, docstring const & message);
 
 /**
  * Display a warning to the user. Title should be a short (general) summary.
  * Only use this if the user cannot perform some remedial action.
  */
-void error(string const & title, string const & message);
+void error(docstring const & title, docstring const & message);
 
 /**
  * Informational message. Use very very sparingly. That is, you must
@@ -51,13 +52,14 @@ void error(string const & title, string const & message);
  * and reciting the Nicene Creed, whilst running uphill and also
  * eating.
  */
-void information(string const & title, string const & message);
+void information(docstring const & title, docstring const & message);
 
 /// Asks for a text. DO NOT USE !!
-std::pair<bool, string> const
-askForText(string const & msg,
-          string const & dflt = string());
+std::pair<bool, docstring> const
+askForText(docstring const & msg, docstring const & dflt = docstring());
 
-}
+} // namespace Alert
+} // namespace frontend
+} // namespace lyx
 
 #endif // LYX_ALERT_H