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 5ccaa6cff846f9218ee4c8b8661965945c3a614b..c95892e3bfac0c4031b1a2dcf1c8c95a9ab21429 100644 (file)
--- a/src/frontends/Alert_pimpl.h
+++ b/src/frontends/Alert_pimpl.h
@@ -11,18 +11,23 @@
 
 // GUI-specific implementations
 
+#include "support/docstring.h"
+
 #include <utility>
-#include <string>
 
 
-int prompt_pimpl(std::string const & title, std::string const & question,
+namespace lyx {
+
+int prompt_pimpl(docstring const & title, docstring const & question,
                 int default_button, int escape_button,
-                std::string const & b1,
-                std::string const & b2,
-                std::string const & b3);
+                docstring const & b1,
+                docstring const & b2,
+                docstring 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(std::string const & title, std::string const & warning);
-void error_pimpl(std::string const & title, std::string const & warning);
-void information_pimpl(std::string const & title, std::string const & warning);
+std::pair<bool, docstring> const askForText_pimpl(docstring const & msg, docstring const & dflt);
 
-std::pair<bool, std::string> const askForText_pimpl(std::string const & msg, std::string const & dflt);
+} // namespace lyx