last Friday's text*.C -> text_func shuffle

[lyx.git] / src / LString.h

diff --git a/src/LString.h b/src/LString.h
index ac5c6b878a92cc2b53868f9facb53a69e7a4938a..95d20bdae05df9e7b85d90f1364e6844e0abac1d 100644 (file)
--- a/src/LString.h
+++ b/src/LString.h
@@ -19,16 +19,20 @@
 #endif
 
 #ifndef USE_INCLUDED_STRING
+
 #include <string>
 using std::string;
+#define STRCONV(STR) STR
 #else
+
 #ifdef __STRING__
 #error The <string> header has been included before LString.h
 #else
 #define __STRING__
 #endif
 #include "support/lyxstring.h"
-// using lyx::string;
-typedef lyxstring string;
+using lyx::string;
+#define STRCONV(STR) STR.c_str()
 #endif
+
 #endif