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

[lyx.git] / src / importer.C

diff --git a/src/importer.C b/src/importer.C
index 7f627f092bfdd021fd0cf668fc2f09d1d4158dc0..6d4801249a00754d9f1bc6d111d6093c459debc6 100644 (file)
--- a/src/importer.C
+++ b/src/importer.C
@@ -19,13 +19,15 @@
 #include "funcrequest.h"
 #include "lyx_cb.h"
 
-#include "bufferlist.h"
 #include "support/filetools.h"
+
 #include "frontends/Alert.h"
+
 #include "gettext.h"
 #include "BufferView.h"
 #include "buffer_funcs.h"
 
+using lyx::docstring;
 using lyx::support::bformat;
 using lyx::support::changeExtension;
 using lyx::support::makeDisplayPath;
@@ -35,14 +37,11 @@ using std::string;
 using std::vector;
 
 
-extern BufferList bufferlist;
-
-
 bool Importer::Import(LyXView * lv, string const & filename,
                      string const & format, ErrorList & errorList)
 {
-       string const displaypath = makeDisplayPath(filename);
-       lv->message(bformat(lyx::to_utf8(_("Importing %1$s...")), displaypath));
+       docstring const displaypath = makeDisplayPath(filename);
+       lv->message(bformat(_("Importing %1$s..."), displaypath));
 
        string const lyxfile = changeExtension(filename, ".lyx");
 
@@ -60,8 +59,8 @@ bool Importer::Import(LyXView * lv, string const & filename,
                        }
                }
                if (loader_format.empty()) {
-                       Alert::error(lyx::to_utf8(_("Couldn't import file")),
-                                    bformat(lyx::to_utf8(_("No information for importing the format %1$s.")),
+                       lyx::frontend::Alert::error(_("Couldn't import file"),
+                                    bformat(_("No information for importing the format %1$s."),
                                         formats.prettyName(format)));
                        return false;
                }
@@ -86,7 +85,7 @@ bool Importer::Import(LyXView * lv, string const & filename,
        }
 
        // we are done
-       lv->message(lyx::to_utf8(_("imported.")));
+       lv->message(_("imported."));
        return true;
 }