compile fix;

cosmetics;

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21594 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiAlert.cpp b/src/frontends/qt4/GuiAlert.cpp
index 36bf3eecfbed026accebd77c3e5d3d0c5e7e73e3..57806eb1863689ad2baf74d20625d73f5ad7065e 100644 (file)
--- a/src/frontends/qt4/GuiAlert.cpp
+++ b/src/frontends/qt4/GuiAlert.cpp
@@ -1,5 +1,5 @@
 /**
- * \file qt4/alert_pimpl.cpp
+ * \file qt4/GuiAlert.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -26,16 +26,14 @@
 
 #include <QApplication>
 #include <QMessageBox>
-#include <QLabel>
 #include <QLineEdit>
-#include <QDialog>
 #include <QInputDialog>
 
 using std::endl;
-using std::string;
 
 
 namespace lyx {
+namespace frontend {
 
 using support::bformat;
 
@@ -99,13 +97,28 @@ static docstring const formatted(docstring const & text)
 }
 
 
-int prompt_pimpl(docstring const & tit, docstring const & question,
-                int default_button, int cancel_button,
-                docstring const & b1, docstring const & b2, docstring const & b3)
+namespace Alert {
+
+int prompt(docstring const & title0, docstring const & question,
+                 int default_button, int cancel_button,
+                 docstring const & b1, docstring const & b2, docstring const & b3)
 {
-       docstring const title = bformat(_("LyX: %1$s"), tit);
+       if (!use_gui || lyxerr.debugging()) {
+               lyxerr << to_utf8(title0) << '\n'
+                      << "----------------------------------------\n"
+                      << to_utf8(question) << endl;
+
+               lyxerr << "Assuming answer is ";
+               switch (default_button) {
+               case 0: lyxerr << to_utf8(b1) << endl;
+               case 1: lyxerr << to_utf8(b2) << endl;
+               case 2: lyxerr << to_utf8(b3) << endl;
+               }
+               if (!use_gui)
+                       return default_button;
+       }
 
-       QMessageBox mb;
+       docstring const title = bformat(_("LyX: %1$s"), title0);
 
        // For some reason, sometimes Qt uses an hourglass or watch cursor when
        // displaying the alert. Hence, we ask for the standard cursor shape.
@@ -128,9 +141,16 @@ int prompt_pimpl(docstring const & tit, docstring const & question,
 }
 
 
-void warning_pimpl(docstring const & tit, docstring const & message)
+void warning(docstring const & title0, docstring const & message)
 {
-       docstring const title = bformat(_("LyX: %1$s"), tit);
+       lyxerr << "Warning: " << to_utf8(title0) << '\n'
+              << "----------------------------------------\n"
+              << to_utf8(message) << endl;
+
+       if (!use_gui)
+               return;
+
+       docstring const title = bformat(_("LyX: %1$s"), title0);
 
        if (theApp() == 0) {
                int argc = 1;
@@ -147,9 +167,16 @@ void warning_pimpl(docstring const & tit, docstring const & message)
 }
 
 
-void error_pimpl(docstring const & tit, docstring const & message)
+void error(docstring const & title0, docstring const & message)
 {
-       docstring const title = bformat(_("LyX: %1$s"), tit);
+       lyxerr << "Error: " << to_utf8(title0) << '\n'
+              << "----------------------------------------\n"
+              << to_utf8(message) << endl;
+
+       if (!use_gui)
+               return;
+
+       docstring const title = bformat(_("LyX: %1$s"), title0);
        if (theApp() == 0) {
                int argc = 1;
                char * argv[1];
@@ -165,18 +192,37 @@ void error_pimpl(docstring const & tit, docstring const & message)
 }
 
 
-void information_pimpl(docstring const & tit, docstring const & message)
+void information(docstring const & title0, docstring const & message)
 {
-       docstring const title = bformat(_("LyX: %1$s"), tit);
+       if (!use_gui || lyxerr.debugging())
+               lyxerr << to_utf8(title0) << '\n'
+                      << "----------------------------------------\n"
+                      << to_utf8(message) << endl;
+
+       if (!use_gui)
+               return;
+
+       docstring const title = bformat(_("LyX: %1$s"), title0);
        QMessageBox::information(qApp->focusWidget(),
                                 toqstr(title),
                                 toqstr(formatted(message)));
 }
 
 
-bool askForText_pimpl(docstring & response, docstring const & msg,
+bool askForText(docstring & response, docstring const & msg,
        docstring const & dflt)
 {
+       if (!use_gui || lyxerr.debugging()) {
+               lyxerr << "----------------------------------------\n"
+                      << to_utf8(msg) << '\n'
+                      << "Assuming answer is " << to_utf8(dflt) << '\n'
+                      << "----------------------------------------" << endl;
+               if (!use_gui) {
+                       response = dflt;
+                       return true;
+               }
+       }
+
        docstring const title = bformat(_("LyX: %1$s"), msg);
 
        bool ok;
@@ -195,83 +241,6 @@ bool askForText_pimpl(docstring & response, docstring const & msg,
 }
 
 
-namespace Alert {
-
-int prompt(docstring const & title, docstring const & question,
-                 int default_button, int escape_button,
-                 docstring const & b1, docstring const & b2, docstring const & b3)
-{
-       if (!use_gui || lyxerr.debugging()) {
-               lyxerr << to_utf8(title) << '\n'
-                      << "----------------------------------------\n"
-                      << to_utf8(question) << endl;
-
-               lyxerr << "Assuming answer is ";
-               switch (default_button) {
-               case 0: lyxerr << to_utf8(b1) << endl;
-               case 1: lyxerr << to_utf8(b2) << endl;
-               case 2: lyxerr << to_utf8(b3) << endl;
-               }
-               if (!use_gui)
-                       return default_button;
-       }
-
-       return prompt_pimpl(title, question,
-                           default_button, escape_button, b1, b2, b3);
-
-}
-
-
-void warning(docstring const & title, docstring const & message)
-{
-       lyxerr << "Warning: " << to_utf8(title) << '\n'
-              << "----------------------------------------\n"
-              << to_utf8(message) << endl;
-
-       if (use_gui)
-               warning_pimpl(title, message);
-}
-
-
-void error(docstring const & title, docstring const & message)
-{
-       lyxerr << "Error: " << to_utf8(title) << '\n'
-              << "----------------------------------------\n"
-              << to_utf8(message) << endl;
-
-       if (use_gui)
-               error_pimpl(title, message);
-}
-
-
-void information(docstring const & title, docstring const & message)
-{
-       if (!use_gui || lyxerr.debugging())
-               lyxerr << to_utf8(title) << '\n'
-                      << "----------------------------------------\n"
-                      << to_utf8(message) << endl;
-
-       if (use_gui)
-               information_pimpl(title, message);
-}
-
-
-bool askForText(docstring & response, docstring const & msg,
-       docstring const & dflt)
-{
-       if (!use_gui || lyxerr.debugging()) {
-               lyxerr << "----------------------------------------\n"
-                      << to_utf8(msg) << '\n'
-                      << "Assuming answer is " << to_utf8(dflt) << '\n'
-                      << "----------------------------------------" << endl;
-               if (!use_gui) {
-                       response = dflt;
-                       return true;
-               }
-       }
-
-       return askForText_pimpl(response, msg, dflt);
-}
-
 } // namespace Alert
+} // namespace frontend
 } // namespace lyx