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

[lyx.git] / src / LString.h

diff --git a/src/LString.h b/src/LString.h
index cc9df47947332242c7603f6af14be18f4fb9598e..95d20bdae05df9e7b85d90f1364e6844e0abac1d 100644 (file)
--- a/src/LString.h
+++ b/src/LString.h
@@ -1,32 +1,38 @@
 // -*- C++ -*-
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
- *      
+ *
  *         Copyright 1995 Matthias Ettrich
  *          Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #ifndef LSTRING_H
-#define LSTRING_H 
+#define LSTRING_H
 
+#if 0
 #ifndef _CONFIG_H
 #error The <config.h> header should always be included before LString.h
 #endif
+#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