Transfer tempName() implementation to FileName.

[lyx.git] / src / support / Messages.cpp

diff --git a/src/support/Messages.cpp b/src/support/Messages.cpp
index 7c57b92cd2acc2cd08ebaab38cc7c35ec2c22ab7..5d2a554d83917cc0ae1b8a226e28d98e9acc2fc2 100644 (file)
--- a/src/support/Messages.cpp
+++ b/src/support/Messages.cpp
@@ -21,8 +21,7 @@
 
 #include <cerrno>
 
-using std::map;
-using std::string;
+using namespace std;
 
 namespace {
 
@@ -64,12 +63,9 @@ void cleanTranslation(docstring & trans)
 #    include "../intl/libintl.h"
 #  endif
 
-namespace lyx {
-
-using support::package;
-using support::getEnv;
-using support::setEnv;
+using namespace lyx::support;
 
+namespace lyx {
 
 // This version use the traditional gettext.
 Messages::Messages(string const & l)
@@ -159,8 +155,8 @@ docstring const Messages::get(string const & m) const
 #endif
        }
 
-       std::pair<TranslationCache::iterator, bool> result =
-               cache_.insert(std::make_pair(m, trans));
+       pair<TranslationCache::iterator, bool> result =
+               cache_.insert(make_pair(m, trans));
 
        BOOST_ASSERT(result.second);
 
@@ -202,12 +198,12 @@ namespace lyx {
 // libstdc++ that is distributed with GNU G++.
 class Messages::Pimpl {
 public:
-       typedef std::messages<char>::catalog catalog;
+       typedef messages<char>::catalog catalog;
 
        Pimpl(string const & l)
                : lang_(l),
                  loc_gl(lang_.c_str()),
-                 mssg_gl(std::use_facet<std::messages<char> >(loc_gl))
+                 mssg_gl(use_facet<messages<char> >(loc_gl))
        {
                //LYXERR("Messages: language(" << l << ") in dir(" << dir << ")");
 
@@ -229,9 +225,9 @@ private:
        ///
        string lang_;
        ///
-       std::locale loc_gl;
+       locale loc_gl;
        ///
-       std::messages<char> const & mssg_gl;
+       messages<char> const & mssg_gl;
        ///
        catalog cat_gl;
 };