X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Falert.h;h=20da43656a52596678a131d3990c7ddcd0cac9cd;hb=713264ae2b82f23e80ed6369b19ae6c9b030b6e4;hp=433369d1b9bdecd73ee0e9bdd4837182ae59839f;hpb=605f6bebf2b0403e82700f5e692eedf6bfc78390;p=lyx.git

diff --git a/src/frontends/alert.h b/src/frontends/alert.h
index 433369d1b9..20da43656a 100644
--- a/src/frontends/alert.h
+++ b/src/frontends/alert.h
@@ -12,7 +12,7 @@
 #ifndef LYX_ALERT_H
 #define LYX_ALERT_H
 
-#include "support/docstring.h"
+#include "support/strfwd.h"
 
 
 namespace lyx {
@@ -20,7 +20,7 @@ namespace frontend {
 namespace Alert {
 
 /**
- * Prompt for a question. Returns 0-2 for the chosen button.
+ * Prompt for a question. Returns 0-3 for the chosen button.
  * Set default_button and cancel_button to reasonable values. b1-b3
  * should have accelerators marked with an '&'. title should be
  * a short summary. Strings should be gettextised.
@@ -32,22 +32,29 @@ namespace Alert {
  */
 int prompt(docstring const & title, docstring const & question,
 	   int default_button, int cancel_button,
-	   docstring const & b1, docstring const & b2, docstring const & b3 = docstring());
+	   docstring const & b0, docstring const & b1,
+	   docstring const & b2 = empty_docstring(),
+	   docstring const & b3 = empty_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.
  * \p askshowagain will display a check box where the user can turn off the
  * warning for future cases. Ponder carefully if this is feasible.
+ *
+ * The console output takes care of converting any Qt html to plain text.
  */
 void warning(docstring const & title, docstring const & message,
-	     bool const & askshowagain = false);
+	     bool askshowagain = false);
 
 /**
  * Display a warning to the user. Title should be a short (general) summary.
  * Only use this if the user cannot perform some remedial action.
+ * On some systems it is possible to show a backtrace.
+ *
+ * The console output takes care of converting any Qt html to plain text.
  */
-void error(docstring const & title, docstring const & message);
+void error(docstring const & title, docstring const & message, bool backtrace = false);
 
 /**
  * Informational message. Use very very sparingly. That is, you must
@@ -62,7 +69,7 @@ void information(docstring const & title, docstring const & message);
  * (even empty string). dflt stands for default message in the dialog.
  */
 bool askForText(docstring & response, docstring const & msg,
-	docstring const & dflt = docstring());
+	docstring const & dflt = empty_docstring());
 
 } // namespace Alert
 } // namespace frontend