X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Falert.h;h=8770053fbaa3c77dd812e602e6a97abfdcf2e1e6;hb=c0a1893008bd13650d470afff16f56720b65c87c;hp=b4e123731c0878cfb4d303578fbf20bb1c2a422d;hpb=de7c7ea3605ae51a92e9aaded2e52c22ebffc484;p=lyx.git

diff --git a/src/frontends/alert.h b/src/frontends/alert.h
index b4e123731c..8770053fba 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 {
@@ -32,19 +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 & b1, docstring const & b2,
+	   docstring const & b3 = empty_docstring(),
+	   docstring const & b4 = 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);
+void warning(docstring const & title, docstring const & message,
+	     bool const & 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
@@ -59,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