X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fclient%2FMessages.cpp;h=9f54bc73ed08d2c6b5d33cac65d61f618c028cd9;hb=ab8a290040dc28f39ebb230ab4b8a43467df0906;hp=34ed666c0fd85b9bde498e7665d6a06874f5e99f;hpb=150cf11651ad92090a452bb9e6cb72d7eea886d5;p=lyx.git

diff --git a/src/client/Messages.cpp b/src/client/Messages.cpp
index 34ed666c0f..9f54bc73ed 100644
--- a/src/client/Messages.cpp
+++ b/src/client/Messages.cpp
@@ -2,7 +2,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -10,7 +10,7 @@
 #include <config.h>
 
 #include "Messages.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "support/filetools.h"
 #include "support/Package.h"
 #include "support/unicode.h"
@@ -18,18 +18,14 @@
 #include <cerrno>
 #include <ostream>
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::package;
-
-using std::endl;
-using std::string;
-
 
 #ifdef ENABLE_NLS
 
-
 #if 0
 
 #include <locale>
@@ -38,15 +34,15 @@ using std::string;
 // 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 << ")" << std::endl;
+		//       << ") in dir(" << dir << ")" << endl;
 
 		string const locale_dir = package().locale_dir().toFilesystemEncoding();
 		cat_gl = mssg_gl.open(PACKAGE, loc_gl, locale_dir.c_str());
@@ -66,9 +62,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;
 };
@@ -81,7 +77,7 @@ private:
 #  if HAVE_GETTEXT
 #    include <libintl.h>      // use the header already in the system *EK*
 #  else
-#    include "../intl/libintl.h"
+#    include "intl/libintl.h"
 #  endif
 
 // This is a more traditional variant.
@@ -91,7 +87,7 @@ public:
 		: lang_(l)
 	{
 		//lyxerr << "Messages: language(" << l
-		//       << ") in dir(" << dir << ")" << std::endl;
+		//       << ") in dir(" << dir << ")" << endl;
 
 	}
 
@@ -119,7 +115,7 @@ public:
 			LYXERR(Debug::DEBUG, "Messages::get()" << '\n'
 				<< "Error code: " << errno << '\n'
 				<< "Lang, mess: " << lang_ << " " << m << '\n'
-				<< "Directory : " << package().locale_dir().absFilename() << '\n'
+				<< "Directory : " << package().locale_dir().absFileName() << '\n'
 				<< "Rtn value : " << c);
 		}