Rename namespace Alert to lyx::frontend::Alert.

This prevents a name clash with Qt 4.2.0 on OS X.

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

diff --git a/src/BufferView.C b/src/BufferView.C
index c91a92ddfb736e553099210eab56e8e005eafacb..0a393c0f618428f4503ea6778b05328726856bdc 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -103,6 +103,8 @@ using std::mem_fun_ref;
 using std::string;
 using std::vector;
 
+namespace Alert = lyx::frontend::Alert;
+
 
 namespace {
 

diff --git a/src/buffer.C b/src/buffer.C
index df4cddcdedc6d98dc435733953f8df5b00c514df..59677959ca2ce303b5485882597e182a63b4d436 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -123,6 +123,7 @@ using lyx::support::subst;
 using lyx::support::tempName;
 using lyx::support::trim;
 
+namespace Alert = lyx::frontend::Alert;
 namespace os = lyx::support::os;
 namespace fs = boost::filesystem;
 

diff --git a/src/buffer_funcs.C b/src/buffer_funcs.C
index f4d7726555a54fdbced7801ed55ecb9b131b5f1e..ce0f60c7d1871c6031705ac770603eb6ea4ef86f 100644 (file)
--- a/src/buffer_funcs.C
+++ b/src/buffer_funcs.C
@@ -63,6 +63,7 @@ using lyx::support::unlink;
 using std::min;
 using std::string;
 
+namespace Alert = lyx::frontend::Alert;
 namespace fs = boost::filesystem;
 
 namespace {

diff --git a/src/bufferlist.C b/src/bufferlist.C
index ed749a031284e62eb2d6d8e9d5427ab4c3ed870e..7ee22c652f07677b17417820512a245210bab9c3 100644 (file)
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -57,6 +57,8 @@ using std::vector;
 using std::back_inserter;
 using std::transform;
 
+namespace Alert = lyx::frontend::Alert;
+
 
 BufferList::BufferList()
 {}

diff --git a/src/bufferparams.C b/src/bufferparams.C
index 61d1088e46c1eb3a342b445e484e8d80cfa3b390..d45bbe0c0d4cf770b340a642bb89358c1dd141eb 100644 (file)
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -60,6 +60,7 @@ using std::ostream;
 using std::ostringstream;
 using std::pair;
 
+namespace Alert = lyx::frontend::Alert;
 namespace biblio = lyx::biblio;
 
 

diff --git a/src/converter.C b/src/converter.C
index f6d226f83bed535a07c6d21374f301ef70c0eae6..1463e6e79274daf3833dd13596d62415f4c5593e 100644 (file)
--- a/src/converter.C
+++ b/src/converter.C
@@ -58,6 +58,8 @@ using std::string;
 using std::vector;
 using std::distance;
 
+namespace Alert = lyx::frontend::Alert;
+
 
 namespace {
 
@@ -449,9 +451,9 @@ bool Converters::convert(Buffer const * buffer,
                                } else {
 // FIXME: this should go out of here. For example, here we cannot say if
 // it is a document (.lyx) or something else. Same goes for elsewhere.
-                               Alert::error(_("Cannot convert file"),
-                                       bformat(_("An error occurred whilst running %1$s"),
-                                       lyx::from_ascii(command.substr(0, 50))));
+                                       Alert::error(_("Cannot convert file"),
+                                               bformat(_("An error occurred whilst running %1$s"),
+                                               lyx::from_ascii(command.substr(0, 50))));
                                }
                                return false;
                        }

diff --git a/src/exporter.C b/src/exporter.C
index 5e6b2aad6ab240a18c3e2dc3dc47d134d6ce7ca3..70f90317a74bb3692d608861b09a9b5e858260a8 100644 (file)
--- a/src/exporter.C
+++ b/src/exporter.C
@@ -53,6 +53,7 @@ using std::find;
 using std::string;
 using std::vector;
 
+namespace Alert = lyx::frontend::Alert;
 namespace fs = boost::filesystem;
 
 namespace {

diff --git a/src/format.C b/src/format.C
index 58d0e38f4a7d0c5fba64753946275c83cf687bc4..8ab1755954eca97a6eb1d95d4a44909efdc21039 100644 (file)
--- a/src/format.C
+++ b/src/format.C
@@ -44,6 +44,7 @@ using lyx::support::token;
 using std::string;
 using std::distance;
 
+namespace Alert = lyx::frontend::Alert;
 namespace fs = boost::filesystem;
 namespace os = lyx::support::os;
 

diff --git a/src/frontends/Alert.C b/src/frontends/Alert.C
index 3bae1126f40bc1bee8ae48f52e3de225448c702f..98c971c37a210d46451a59309a1ed9507511febd 100644 (file)
--- a/src/frontends/Alert.C
+++ b/src/frontends/Alert.C
@@ -24,6 +24,9 @@ using std::pair;
 using std::string;
 
 
+namespace lyx {
+namespace frontend {
+
 int Alert::prompt(docstring const & title, docstring const & question,
                  int default_button, int escape_button,
                  docstring const & b1, docstring const & b2, docstring const & b3)
@@ -98,3 +101,6 @@ pair<bool, docstring> const Alert::askForText(docstring const & msg,
 
        return askForText_pimpl(msg, dflt);
 }
+
+}
+}

diff --git a/src/frontends/Alert.h b/src/frontends/Alert.h
index 716b1a700b867b15becd46879c1e6c5f18cc7943..cb3a0a8e4fa31b2ddab1c83b82992558c69904dd 100644 (file)
--- a/src/frontends/Alert.h
+++ b/src/frontends/Alert.h
@@ -15,6 +15,8 @@
 #include "support/lstrings.h"
 
 
+namespace lyx {
+namespace frontend {
 namespace Alert {
 
 /**
@@ -58,5 +60,7 @@ askForText(lyx::docstring const & msg,
           lyx::docstring const & dflt = lyx::docstring());
 
 }
+}
+}
 
 #endif // LYX_ALERT_H

diff --git a/src/frontends/qt3/validators.C b/src/frontends/qt3/validators.C
index 5f536bf3ac8ecec275eedef44805c5d05074e55c..c9240bd00cc224221ae203e3dbdaf86a02007ec0 100644 (file)
--- a/src/frontends/qt3/validators.C
+++ b/src/frontends/qt3/validators.C
@@ -138,7 +138,7 @@ QValidator::State PathValidator::validate(QString & qtext, int &) const
 
                static int counter = 0;
                if (counter == 0) {
-                       Alert::error(_("Invalid filename"),
+                       lyx::frontend::Alert::error(_("Invalid filename"),
                                     _("LyX does not provide LateX support for file names containing any of these characters:\n") +
                                     lyx::from_utf8(printable_list(invalid_chars)));
                }

diff --git a/src/frontends/qt4/validators.C b/src/frontends/qt4/validators.C
index 74ccd4274659af131393a47b25366d77e59916a3..0f388d58f7ace8dd9c57e0335c523d90d40a0d8f 100644 (file)
--- a/src/frontends/qt4/validators.C
+++ b/src/frontends/qt4/validators.C
@@ -138,7 +138,7 @@ QValidator::State PathValidator::validate(QString & qtext, int &) const
 
                static int counter = 0;
                if (counter == 0) {
-                       Alert::error(_("Invalid filename"),
+                       lyx::frontend::Alert::error(_("Invalid filename"),
                                     _("LyX does not provide LateX support for file names containing any of these characters:\n") +
                                         lyx::from_utf8(printable_list(invalid_chars)));
                }

diff --git a/src/importer.C b/src/importer.C
index f9f9f7843fe2d1240a7e7bb4c952cd33f24f8112..6d4801249a00754d9f1bc6d111d6093c459debc6 100644 (file)
--- a/src/importer.C
+++ b/src/importer.C
@@ -59,7 +59,7 @@ bool Importer::Import(LyXView * lv, string const & filename,
                        }
                }
                if (loader_format.empty()) {
-                       Alert::error(_("Couldn't import file"),
+                       lyx::frontend::Alert::error(_("Couldn't import file"),
                                     bformat(_("No information for importing the format %1$s."),
                                         formats.prettyName(format)));
                        return false;

diff --git a/src/insets/insetbibtex.C b/src/insets/insetbibtex.C
index 91647a2a04712ef1820f5bfda7e26ba2b9ddbf3f..7f5e2dc84c4fd5925cf6395b3f7bf1e5c068f7c0 100644 (file)
--- a/src/insets/insetbibtex.C
+++ b/src/insets/insetbibtex.C
@@ -57,6 +57,7 @@ using lyx::support::subst;
 using lyx::support::tokenPos;
 using lyx::support::trim;
 
+namespace Alert = lyx::frontend::Alert;
 namespace os = lyx::support::os;
 
 using std::endl;

diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index 6a964f97df6f3b89d89049e6709c325739d27143..daa2a436783e5f0e9fc2ee4b84ac2cf5c889d678 100644 (file)
--- a/src/insets/insetinclude.C
+++ b/src/insets/insetinclude.C
@@ -81,6 +81,7 @@ using std::istringstream;
 using std::ostream;
 using std::ostringstream;
 
+namespace Alert = lyx::frontend::Alert;
 namespace fs = boost::filesystem;
 
 

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index bbe11a42fd02b9da8b5337ed8fe831a36e77c115..95fc6310a5a8280d85f414ac5bf095d610243178 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -71,6 +71,8 @@ using std::ostringstream;
 using std::swap;
 using std::vector;
 
+namespace Alert = lyx::frontend::Alert;
+
 
 namespace {
 

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 455136b3dfeda597a1ccb7049eb50d26f98a946d..af2f31c90f97b57b7d87a7a7a00fabe5956dba7a 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -78,6 +78,7 @@ using lyx::support::unlink;
 
 using boost::shared_ptr;
 
+namespace Alert = lyx::frontend::Alert;
 namespace fs = boost::filesystem;
 
 using std::back_inserter;

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 958f2fdd39a9bc4fe48183b28ad16976cfc56bbc..6e2b8ba530539714a37736d93eb57faa68d52c5f 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -77,6 +77,7 @@ using lyx::support::Systemcall;
 
 using lyx::docstring;
 
+namespace Alert = lyx::frontend::Alert;
 namespace os = lyx::support::os;
 namespace fs = boost::filesystem;
 

diff --git a/src/lyxfind.C b/src/lyxfind.C
index 0aec2206be12e9550f524f81cc1408d828ad7de2..f69b4249b4e9988cdf75fb879f89ce909c8a44b1 100644 (file)
--- a/src/lyxfind.C
+++ b/src/lyxfind.C
@@ -137,7 +137,8 @@ bool findChange(DocIterator & cur)
 bool searchAllowed(BufferView * bv, string const & str)
 {
        if (str.empty()) {
-               Alert::error(_("Search error"), _("Search string is empty"));
+               lyx::frontend::Alert::error(_("Search error"),
+                                           _("Search string is empty"));
                return false;
        }
        return bv->buffer();

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 44855227549b8c53c85657df3ca6e50cd58d2bfd..38506515454bbd94d1f5c810a9783130395e6f75 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -136,6 +136,7 @@ using std::string;
 using std::istringstream;
 using std::ostringstream;
 
+namespace Alert = lyx::frontend::Alert;
 namespace biblio = lyx::biblio;
 namespace fs = boost::filesystem;
 

diff --git a/src/lyxvc.C b/src/lyxvc.C
index 49b69ad94c3fe7f35630250b028e02f3a0947ed8..607950c46d5246bffbb2efb39dbb917b8ea6db00 100644 (file)
--- a/src/lyxvc.C
+++ b/src/lyxvc.C
@@ -37,6 +37,8 @@ using std::endl;
 using std::string;
 using std::pair;
 
+namespace Alert = lyx::frontend::Alert;
+
 
 LyXVC::LyXVC()
 {

diff --git a/src/output.C b/src/output.C
index e45640df36684daf5f246de69fce3f7eeb83c80f..fbdef6bbbb60579bbd40dd4c19e32429ad5a88e0 100644 (file)
--- a/src/output.C
+++ b/src/output.C
@@ -35,7 +35,7 @@ bool openFileWrite(ofstream & ofs, string const & fname)
                docstring const file = makeDisplayPath(fname, 50);
                docstring text = bformat(_("Could not open the specified "
                                                     "document\n%1$s."), file);
-               Alert::error(_("Could not open file"), text);
+               lyx::frontend::Alert::error(_("Could not open file"), text);
                return false;
        }
        return true;