Fix footnote output in description item

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

diff --git a/src/frontends/alert.h b/src/frontends/alert.h
index e10a73a5f84a72d1f3ac9860e0dd7a8bb1f063b0..8770053fbaa3c77dd812e602e6a97abfdcf2e1e6 100644 (file)
--- a/src/frontends/alert.h
+++ b/src/frontends/alert.h
@@ -12,7 +12,7 @@
 #ifndef LYX_ALERT_H
 #define LYX_ALERT_H
 
-#include "support/lstrings.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
@@ -54,9 +64,12 @@ void error(docstring const & title, docstring const & message);
  */
 void information(docstring const & title, docstring const & message);
 
-/// Asks for a text. DO NOT USE !!
+/**
+ * Asks for a text. Returns true for OK. Obtained message is in response
+ * (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