cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / gettext.C

diff --git a/src/gettext.C b/src/gettext.C
index ea38cc88e9e2ade06473572ddb741e7a6259eb25..6c79a241d184d72990d9e3aba9e76f102a8fc2da 100644 (file)
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -20,8 +20,10 @@
 #  include <locale.h>
 #endif
 
-using std::string;
 using lyx::support::setEnv;
+using lyx::docstring;
+
+using std::string;
 
 
 namespace {
@@ -36,9 +38,15 @@ Messages & getLyXMessages()
 } // anon namespace
 
 
-string const _(string const & str)
+docstring const _(string const & str)
+{
+       return getLyXMessages().get(str);
+}
+
+
+docstring const _(docstring const & str)
 {
-       return lyx::to_utf8(getLyXMessages().get(str));
+       return getLyXMessages().get(lyx::to_utf8(str));
 }