merge controllers/Makefile.am and controllers/tests/Makefile.am

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

diff --git a/src/frontends/Alert_pimpl.h b/src/frontends/Alert_pimpl.h
index f9c587d5875acdfe3b4bb99761d1bbd9efbadf1d..c95892e3bfac0c4031b1a2dcf1c8c95a9ab21429 100644 (file)
--- a/src/frontends/Alert_pimpl.h
+++ b/src/frontends/Alert_pimpl.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file Alert_pimpl.h
  * This file is part of LyX, the document processor.
@@ -5,21 +6,28 @@
  *
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
-#include "debug.h"
-
 // GUI-specific implementations
 
-void alert_pimpl(string const & s1, string const & s2, string const & s3);
+#include "support/docstring.h"
+
+#include <utility>
+
+
+namespace lyx {
+
+int prompt_pimpl(docstring const & title, docstring const & question,
+                int default_button, int escape_button,
+                docstring const & b1,
+                docstring const & b2,
+                docstring const & b3);
 
-int prompt_pimpl(string const & title, string const & question,
-           int default_button,
-          string const & b1, string const & b2, string const & b3);
+void warning_pimpl(docstring const & title, docstring const & warning);
+void error_pimpl(docstring const & title, docstring const & warning);
+void information_pimpl(docstring const & title, docstring const & warning);
 
-void warning_pimpl(string const & title, string const & warning);
-void error_pimpl(string const & title, string const & warning);
-void information_pimpl(string const & title, string const & warning);
+std::pair<bool, docstring> const askForText_pimpl(docstring const & msg, docstring const & dflt);
 
-std::pair<bool, string> const askForText_pimpl(string const & msg, string const & dflt);
+} // namespace lyx