Point fix, earlier forgotten

[lyx.git] / src / LString.h

diff --git a/src/LString.h b/src/LString.h
index 3d42a39facac3b84e8975952310f3d6468d69c56..64f0242ab64201700e164d20e9e55bf9cacf2f3e 100644 (file)
--- a/src/LString.h
+++ b/src/LString.h
@@ -1,23 +1,39 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- *      
- *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2000 The LyX Team.
+/**
+ * \file LString.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ====================================================== */
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #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