ws changes only

[lyx.git] / src / messages.C

diff --git a/src/messages.C b/src/messages.C
index 4302f41e658e3a24c7095d0612ff4ed3238b2a35..0fcf097708f33bccf4eca75225e2270050aa5e56 100644 (file)
--- a/src/messages.C
+++ b/src/messages.C
@@ -4,16 +4,19 @@
  *
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "messages.h"
-#include "debug.h"
 #include "support/filetools.h"
+#include "support/path_defines.h"
 
-using namespace lyx::support;
+using lyx::support::GetEnvPath;
+using lyx::support::lyx_localedir;
+
+using std::string;
 
 
 #ifdef ENABLE_NLS
@@ -27,7 +30,7 @@ string const & getLocaleDir()
        if (locale_dir.empty()) {
                locale_dir = GetEnvPath("LYX_LOCALEDIR");
                if (locale_dir.empty())
-                       locale_dir = LOCALEDIR;
+                       locale_dir = lyx_localedir();
        }
        return locale_dir;
 }
@@ -36,7 +39,7 @@ string const & getLocaleDir()
 
 #if 0
 
-#include <locale>
+-#include <locale>
 
 // This version of the Pimpl utilizes the message capability of
 // libstdc++ that is distributed with GNU G++.