Replace LString.h with support/std_string.h,

Lsstream.h with support/std_sstream.h,
support/LIstream.h with support/std_istream.h,
support/LOstream.h with support/std_ostream.h.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7685 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BranchList.h b/src/BranchList.h
index 3b6b2554fe63d4e64a04eee89fa28f1c4f82f569..e284aa43d0c0d2c0a59eb9d8c4d99094833991a1 100644 (file)
--- a/src/BranchList.h
+++ b/src/BranchList.h
@@ -30,7 +30,7 @@
 #ifndef BRANCHES_H
 #define BRANCHES_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <list>
 
 class Branch {

diff --git a/src/BufferView.h b/src/BufferView.h
index 029c139c38cc37b8269e1b1284d7847f2219c8de..2172c101caab8fbc6bff7ded800b08be23fda5ed 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -15,7 +15,7 @@
 #ifndef BUFFER_VIEW_H
 #define BUFFER_VIEW_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include "insets/inset.h"
 

diff --git a/src/Bullet.h b/src/Bullet.h
index a0ac36c773caa8c77053847e1ad8c36cc3cf675c..184e8e976440896f03c87db7167f8912481fee3a 100644 (file)
--- a/src/Bullet.h
+++ b/src/Bullet.h
@@ -13,7 +13,7 @@
 #ifndef BULLET_H
 #define BULLET_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 ///
 class Bullet {

diff --git a/src/ChangeLog b/src/ChangeLog
index 7ebb15724581ef1293f0edc477fc209a69a8e312..39c67316b1b296715b2321f5333465ddda3d71ff 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2003-09-05  Angus Leeming  <leeming@lyx.org>
+
+       Replace LString.h with support/std_string.h,
+       Lsstream.h with support/std_sstream.h,
+       support/LIstream.h with support/std_istream.h,
+       support/LOstream.h with support/std_ostream.h.
+
+       Changes resulting throughout the tree.
+
 2003-09-05  Angus Leeming  <leeming@lyx.org>
 
        * sgml.h: ensure that the header file can be compiled stand-alone.

diff --git a/src/Chktex.h b/src/Chktex.h
index a73478974f52c9126f1d7fa88db32bfb5829ffac..aa8311501dfdb1ac3f602cea8822c9bca0ef8641 100644 (file)
--- a/src/Chktex.h
+++ b/src/Chktex.h
@@ -12,7 +12,7 @@
 #ifndef CHKTEX_H
 #define CHKTEX_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class LyXLex;
 class TeXErrors;

diff --git a/src/DepTable.h b/src/DepTable.h
index f8507797264239a9db339986821c9765335fad27..94cc3abd916e487920103974eb95bba521aafd8d 100644 (file)
--- a/src/DepTable.h
+++ b/src/DepTable.h
@@ -13,7 +13,7 @@
 #ifndef DEP_TABLE_H
 #define DEP_TABLE_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <map>
 
 ///

diff --git a/src/FloatList.h b/src/FloatList.h
index ac9d832c61d366cf2e47ec217f652c09cb6aaa50..2b6082d24016ad28bc2815f26933137cfea84b67 100644 (file)
--- a/src/FloatList.h
+++ b/src/FloatList.h
@@ -14,7 +14,7 @@
 
 #include <map>
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class Floating;
 

diff --git a/src/Floating.h b/src/Floating.h
index 372bda9774f14000fcb92dafc9118dd5051507ba..e3687e83ac14652ee9b44bafdf3ae556f169cb2f 100644 (file)
--- a/src/Floating.h
+++ b/src/Floating.h
@@ -12,7 +12,7 @@
 #ifndef FLOATING_H
 #define FLOATING_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 /** This is a "float layout" object. It contains the parameters for how to
     handle the different kinds of floats, default ones and user created ones.

diff --git a/src/LColor.h b/src/LColor.h
index 99e8c90efd3aa8012fbd2565e50f738a40c8b237..3d267e3f9115cc09b7632694af9730cfd7215c0b 100644 (file)
--- a/src/LColor.h
+++ b/src/LColor.h
@@ -19,7 +19,7 @@
 #ifndef LCOLOR_H
 #define LCOLOR_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <boost/scoped_ptr.hpp>
 
 /**

diff --git a/src/LString.h b/src/LString.h
deleted file mode 100644 (file)
index 64f0242..0000000
--- a/src/LString.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// -*- C++ -*-
-/**
- * \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
-
-#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;
-#define STRCONV(STR) STR.c_str()
-#endif
-
-#endif

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 751d01e98c047d9be8f3a146a434602d2f3f0f33..148f700088a6a36daf14973543597832e16174e3 100644 (file)
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -15,7 +15,7 @@
 #define LATEX_H
 
 #include "latexrunparams.h"
-#include "LString.h"
+#include "support/std_string.h"
 #include <vector>
 #include <set>
 

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 5cb855eb7ec2e308f61c101c9a2a2c47a3529e60..61dd5ea3b3263b29ffdeda5b6eb80ab348128121 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -22,7 +22,7 @@
 #include "FloatList.h"
 #include "language.h"
 #include "encoding.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 #include "support/filetools.h"
 

diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h
index 0f05c6f178ec7a346b2fc7694a42da7c2c0031c3..d882bc4013fd127a33eab82a6b621fd614e1b99a 100644 (file)
--- a/src/LaTeXFeatures.h
+++ b/src/LaTeXFeatures.h
@@ -15,7 +15,7 @@
 
 #include "support/types.h"
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <set>
 #include <list>

diff --git a/src/Lsstream.h b/src/Lsstream.h
deleted file mode 100644 (file)
index bac4ce5..0000000
--- a/src/Lsstream.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// -*- C++ -*-
-/**
- * \file Lsstream.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 LSSTREAM_H
-#define LSSTREAM_H
-
-// Since we will include a string header anyway, we'd better do it
-// right now so that <string> is not loaded before lyxstring.h. (JMarc)
-#include "LString.h"
-
-#ifdef HAVE_SSTREAM
-#include <sstream>
-#else
-#include "support/sstream.h"
-#endif
-
-using std::istringstream;
-using std::ostringstream;
-using std::stringstream;
-
-#endif

diff --git a/src/LyXAction.h b/src/LyXAction.h
index 5d7c88ede6d6af1903223fb681c14e4f22edbbd3..d1892d8737f42c5c8c48fbc2a32048dc4bf813cd 100644 (file)
--- a/src/LyXAction.h
+++ b/src/LyXAction.h
@@ -15,7 +15,7 @@
 
 #include "lfuns.h"
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <boost/utility.hpp>
 #include <map>
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 649144df958c3f4a2d4dd9619fe11382edfbf00f..cae0980625e1b95f8847ff32beb1198eaac9f25f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -81,13 +81,11 @@ lyx_SOURCES = \
        InsetList.h \
        LColor.C \
        LColor.h \
-       LString.h \
        LaTeX.C \
        LaTeX.h \
        LaTeXFeatures.C \
        LaTeXFeatures.h \
        latexrunparams.h \
-       Lsstream.h \
        LyXAction.C \
        LyXAction.h \
        MenuBackend.C \

diff --git a/src/MenuBackend.h b/src/MenuBackend.h
index 4bb8fd0e728a2119ad3c550ac2bb02cc1f344f1b..f6746e08bbe2a80222d81790a45e0b37aa045bb0 100644 (file)
--- a/src/MenuBackend.h
+++ b/src/MenuBackend.h
@@ -13,7 +13,7 @@
 #ifndef MENUBACKEND_H
 #define MENUBACKEND_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <boost/shared_ptr.hpp>
 

diff --git a/src/ParagraphParameters.C b/src/ParagraphParameters.C
index fef6980389989f149bda23dc5f7189f4a81de411..a3ef977cb497a1902d61cced413fefa708ad5d7f 100644 (file)
--- a/src/ParagraphParameters.C
+++ b/src/ParagraphParameters.C
@@ -20,7 +20,7 @@
 
 #include "buffer.h"
 #include "BufferView.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "gettext.h"
 #include "lyxtext.h"
 

diff --git a/src/ParagraphParameters.h b/src/ParagraphParameters.h
index aef9e38e7be2d9c45fb4a7c9603eedcc93f4ce52..fcf25eb66d0cbc3bda50a1fceeb6170c410e0716 100644 (file)
--- a/src/ParagraphParameters.h
+++ b/src/ParagraphParameters.h
@@ -14,7 +14,7 @@
 #ifndef PARAGRAPHPARAMETERS_H
 #define PARAGRAPHPARAMETERS_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "ShareContainer.h"
 #include "layout.h"
 

diff --git a/src/Sectioning.h b/src/Sectioning.h
index b3bdd63c97c7eb2aecbda3d2162310b99d4f7e33..3e89caa85f4c111ad2ed1b223f2dba48f1d0bc44 100644 (file)
--- a/src/Sectioning.h
+++ b/src/Sectioning.h
@@ -14,7 +14,7 @@
 
 #include <map>
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "lyxfont.h"
 
 ///

diff --git a/src/Spacing.C b/src/Spacing.C
index 10d45e1382b03c0ad9ed598a3c1208d365cddd3e..91172a457621b2d3f5e1e5255cc112366b2793f5 100644 (file)
--- a/src/Spacing.C
+++ b/src/Spacing.C
@@ -11,7 +11,7 @@
 
 #include <config.h>
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "Spacing.h"
 
 using std::ios;

diff --git a/src/Spacing.h b/src/Spacing.h
index cab426973203cb9e25f1b47719a885107aab96e4..5c51bb49f43e779c3cd266533e8cff3b091972cd 100644 (file)
--- a/src/Spacing.h
+++ b/src/Spacing.h
@@ -14,7 +14,7 @@
 
 #include <iosfwd>
 
-#include "LString.h"
+#include "support/std_string.h"
 
 ///
 class Spacing {

diff --git a/src/SpellBase.h b/src/SpellBase.h
index 4fdb68a80aad5f06a5b5570f2a20e2c8470c36db..c0b6508f20a4eab8567ca0d30503b36678f853da 100644 (file)
--- a/src/SpellBase.h
+++ b/src/SpellBase.h
@@ -13,7 +13,7 @@
 #ifndef SPELL_BASE_H
 #define SPELL_BASE_H
 
-#include "LString.h" // can't forward declare...
+#include "support/std_string.h" // can't forward declare...
 
 class BufferParams;
 class WordLangTuple;

diff --git a/src/TextCache.h b/src/TextCache.h
index fcb6caebf27f3f9061a1b5c8fa8671ba74c8e4cf..eea20a7ffa091d763556e2d7d39ced455e019179 100644 (file)
--- a/src/TextCache.h
+++ b/src/TextCache.h
@@ -12,7 +12,7 @@
 #ifndef TEXT_CACHE_H
 #define TEXT_CACHE_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <iosfwd>
 #include <map>

diff --git a/src/Thesaurus.h b/src/Thesaurus.h
index c8a9afb521fd885ddcbf1a5aec7e2a33e1b504ac..f92f2e2510d9c1a2c54661490681caf1ab8ac75f 100644 (file)
--- a/src/Thesaurus.h
+++ b/src/Thesaurus.h
@@ -15,7 +15,7 @@
 #include <vector>
 #include <map>
 
-#include "LString.h"
+#include "support/std_string.h"
 #ifdef HAVE_LIBAIKSAURUS
 #include AIKSAURUS_H_LOCATION
 #endif

diff --git a/src/ToolbarBackend.h b/src/ToolbarBackend.h
index 946cf0fb91c0bcddc5b204eb0250a66cb52a04fe..b202b94930517df6ae068d38dfb54b6b30507520 100644 (file)
--- a/src/ToolbarBackend.h
+++ b/src/ToolbarBackend.h
@@ -16,7 +16,7 @@
 #include <vector>
 #include <algorithm>
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class LyXLex;
 

diff --git a/src/Variables.h b/src/Variables.h
index d8fa99086f2f01062f38c9f792d7fd4478fd964b..b73b63a15605124192945e2f8197b09487c9599b 100644 (file)
--- a/src/Variables.h
+++ b/src/Variables.h
@@ -13,7 +13,7 @@
 #ifndef VARIABLES_H
 #define VARIABLES_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <map>
 
 

diff --git a/src/WordLangTuple.h b/src/WordLangTuple.h
index 22ac67aec2deb4fec75069010c6142f4c600cedd..e0a1d8eed4c3670afc93e449dfeeb81e236a5ef8 100644 (file)
--- a/src/WordLangTuple.h
+++ b/src/WordLangTuple.h
@@ -12,7 +12,7 @@
 #ifndef WORD_LANG_TUPLE_H
 #define WORD_LANG_TUPLE_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 /**
  * A word and its given language code ("en_US").

diff --git a/src/author.C b/src/author.C
index 41dbd65770f93d2307ad79eba76758add4216b37..a8eae33e0d1db3875cac42b0426eb018ac65d789 100644 (file)
--- a/src/author.C
+++ b/src/author.C
@@ -13,7 +13,7 @@
 #include "author.h"
 
 #include "support/LAssert.h"
-#include "support/LIstream.h"
+#include "support/std_istream.h"
 #include "support/lstrings.h"
 
 using namespace lyx::support;

diff --git a/src/author.h b/src/author.h
index b06b9611e9b66f1bdc5b69853d93d9ad14647eac..a928bc8d1a907ec9130d506a595c5cddafb5b2dc 100644 (file)
--- a/src/author.h
+++ b/src/author.h
@@ -15,7 +15,7 @@
 #include <map>
 #include <iosfwd>
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class Author {
 public:

diff --git a/src/box.C b/src/box.C
index af520569dcc7d47d9988a99eb85e9ea55a78077a..eda92d751a962821aa371bfaceeeeceab8b9a527 100644 (file)
--- a/src/box.C
+++ b/src/box.C
@@ -14,7 +14,7 @@
 
 #include "box.h"
 
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 using std::ostream;
 

diff --git a/src/buffer.C b/src/buffer.C
index 3fc6db9729e4f24516640ebb5a70e4137d32d895..748c7be27e3bd99c86dfed1d7510ad82a3a3ee65 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -24,7 +24,7 @@
 #include "gettext.h"
 #include "language.h"
 #include "exporter.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "format.h"
 #include "ParagraphParameters.h"
 #include "iterators.h"

diff --git a/src/buffer.h b/src/buffer.h
index dd668983e4c52b3b877f84eb684c8d606bbd70dc..5676fb23c2120bcc1d6582cd983b7e402f3edf59 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -12,7 +12,7 @@
 #ifndef BUFFER_H
 #define BUFFER_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "undo.h"
 #include "support/limited_stack.h"
 

diff --git a/src/buffer_funcs.h b/src/buffer_funcs.h
index e6fb52dc711ec40e26cbc204e429acdfd6d55a77..a09c44684eace457c0b1a3160afb9d828e9a30a0 100644 (file)
--- a/src/buffer_funcs.h
+++ b/src/buffer_funcs.h
@@ -12,7 +12,7 @@
 #ifndef BUFFER_FUNCS_H
 #define BUFFER_FUNCS_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class Buffer;
 class TeXErrors;

diff --git a/src/bufferlist.h b/src/bufferlist.h
index 798ae9d4ad5129969790c9d1a7ef1b4e14ca380c..b7ca0cf59e490d0dcc476c6902db479c08772bbe 100644 (file)
--- a/src/bufferlist.h
+++ b/src/bufferlist.h
@@ -12,7 +12,7 @@
 #ifndef BUFFER_LIST_H
 #define BUFFER_LIST_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <boost/utility.hpp>
 

diff --git a/src/bufferparams.C b/src/bufferparams.C
index 12414719e8ca47e767530a8e562e58eedf8ffa0b..d2b1ab5846a1b6c5f2f271aa2721b87cef4da3a5 100644 (file)
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -21,7 +21,7 @@
 #include "gettext.h"
 #include "language.h"
 #include "LaTeXFeatures.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "lyxlex.h"
 #include "lyxtextclasslist.h"
 #include "tex-strings.h"

diff --git a/src/bufferparams.h b/src/bufferparams.h
index aafc6c56e630e1f2c7dae637be420e26eee2fcf7..83e62ffb8e27df6bb9d1629b00cf5efd87e299b9 100644 (file)
--- a/src/bufferparams.h
+++ b/src/bufferparams.h
@@ -15,7 +15,7 @@
 #ifndef BUFFERPARAMS_H
 #define BUFFERPARAMS_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "vspace.h"
 #include "Spacing.h"
 #include "Bullet.h"

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index bda1550be6b5c2e9a8ab404648fd1ef18c4c2db9..d2a945e8fb5fa6be06e26d22e14c76f30ccf137d 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -26,7 +26,7 @@
 #include "mathed/math_cursor.h"
 
 #include "support/tostr.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 #include "insets/insettext.h"
 

diff --git a/src/bufferview_funcs.h b/src/bufferview_funcs.h
index 9e67bf69f156a59f669b3af4836c1376c0952332..1bf167bd9be74e5d3f0d60130c62d7662ae36a6b 100644 (file)
--- a/src/bufferview_funcs.h
+++ b/src/bufferview_funcs.h
@@ -14,7 +14,7 @@
 #ifndef BUFFERVIEW_FUNCS_H
 #define BUFFERVIEW_FUNCS_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class BufferView;
 class LyXFont;

diff --git a/src/chset.h b/src/chset.h
index ebdbdbfe601daed4221546cdd74db1ef61ec8411..550139236e11ed4313144d59a21abea6a1c722b8 100644 (file)
--- a/src/chset.h
+++ b/src/chset.h
@@ -16,7 +16,7 @@
 #include <map>
 #include <utility>
 
-#include "LString.h"
+#include "support/std_string.h"
 
 /// a class for mapping char strings such as "\^{A}" to the integer value
 class CharacterSet {

diff --git a/src/counters.C b/src/counters.C
index b0d99cbe154b673788dc09b0fd5726fde23018f3..3d6341c65230210a3d45f79256918a81d42adf38 100644 (file)
--- a/src/counters.C
+++ b/src/counters.C
@@ -13,7 +13,7 @@
 
 #include "counters.h"
 #include "debug.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 #include "support/lstrings.h"
 #include "support/LAssert.h"

diff --git a/src/counters.h b/src/counters.h
index d7bf25654f164bc87e40e82696d7ef754677f64e..5b9d5323d20aa92a5abf9fe5d1b5dec2cbea9993 100644 (file)
--- a/src/counters.h
+++ b/src/counters.h
@@ -15,7 +15,7 @@
 #ifndef COUNTERS_H
 #define COUNTERS_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <map>
 
 

diff --git a/src/debug.h b/src/debug.h
index 7d8ee4b8b2bf0a83bdba142293ba1e643e1198c7..edfabb5f167c39014d87405fef361a091117c680 100644 (file)
--- a/src/debug.h
+++ b/src/debug.h
@@ -15,7 +15,7 @@
 
 #include <iosfwd>
 
-#include "LString.h"
+#include "support/std_string.h"
 
 /** Ideally this should have been a namespace, but since we try to be
     compilable on older C++ compilators too, we use a struct instead.

diff --git a/src/encoding.h b/src/encoding.h
index 51d105ca258bf1b93448f0ace406f31f36d11e70..9bfd8948c1d9d6a4e338f9aac597a2955d0add9a 100644 (file)
--- a/src/encoding.h
+++ b/src/encoding.h
@@ -13,7 +13,7 @@
 #ifndef ENCODING_H
 #define ENCODING_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "lyxrc.h"
 
 #include <map>

diff --git a/src/errorlist.h b/src/errorlist.h
index e9023f2203f213355181a2208ff51272f7840f3f..33e57c4b3aa3a58045ca205a2228ba805b5742cb 100644 (file)
--- a/src/errorlist.h
+++ b/src/errorlist.h
@@ -12,7 +12,7 @@
 #ifndef ERRORLIST_H
 #define ERRORLIST_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <vector>
 

diff --git a/src/exporter.h b/src/exporter.h
index 629d7f473f6e783603a428300363b4ba6ea5b5da..02afbfcfca96849ad364c45a9b8dd799b1a81c61 100644 (file)
--- a/src/exporter.h
+++ b/src/exporter.h
@@ -14,7 +14,7 @@
 #define EXPORTER_H
 
 #include <vector>
-#include "LString.h"
+#include "support/std_string.h"
 
 class Buffer;
 class Format;

diff --git a/src/format.h b/src/format.h
index f95224bab422e33192b37c8c23054786229ae498..e960f602a940f3c22ee4d996d723d9b74474b911 100644 (file)
--- a/src/format.h
+++ b/src/format.h
@@ -13,7 +13,7 @@
 #define FORMAT_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <vector>
 

diff --git a/src/frontends/Alert_pimpl.h b/src/frontends/Alert_pimpl.h
index d53cb93bcf7f1f6993f8905995c2b5864f3dcb48..8be61575f2892f431daff8f71973dcdda7b326f9 100644 (file)
--- a/src/frontends/Alert_pimpl.h
+++ b/src/frontends/Alert_pimpl.h
@@ -11,7 +11,7 @@
 
 // GUI-specific implementations
 
-#include "LString.h"
+#include "support/std_string.h"
 
 
 int prompt_pimpl(string const & title, string const & question,

diff --git a/src/frontends/Dialogs.h b/src/frontends/Dialogs.h
index 4febef832c4ad42d249093054a8050a7b4727b63..988e606e0324f4719ba059d23049a100ab725ce5 100644 (file)
--- a/src/frontends/Dialogs.h
+++ b/src/frontends/Dialogs.h
@@ -12,7 +12,7 @@
 #define DIALOGS_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>

diff --git a/src/frontends/FileDialog.h b/src/frontends/FileDialog.h
index 4ee3aa68f0f4a0c4995990a98b2463e1f79d45f3..bc2ce49d3e46718e438d506c61aa8dea32f34b5b 100644 (file)
--- a/src/frontends/FileDialog.h
+++ b/src/frontends/FileDialog.h
@@ -18,7 +18,7 @@
 
 #include "lfuns.h"
 
-#include "LString.h"
+#include "support/std_string.h"
 
 /**
  * \class FileDialog

diff --git a/src/frontends/LyXKeySym.h b/src/frontends/LyXKeySym.h
index e9e3eac1c0a58c795bb0765a82fcad2bb8ef447e..5a8b1b867aa51e152e5ff30d4fb29687f30be2fc 100644 (file)
--- a/src/frontends/LyXKeySym.h
+++ b/src/frontends/LyXKeySym.h
@@ -12,7 +12,7 @@
 #ifndef LYXKEYSYM_H
 #define LYXKEYSYM_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <boost/shared_ptr.hpp>
 
 /**

diff --git a/src/frontends/LyXView.h b/src/frontends/LyXView.h
index 1db93a3772a6b11950602e132ae77e43bc7bf97a..4c9ee9051a960611e28a880868a7b8baa27cfdcf 100644 (file)
--- a/src/frontends/LyXView.h
+++ b/src/frontends/LyXView.h
@@ -14,7 +14,7 @@
 #define LYXVIEW_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>

diff --git a/src/frontends/Menubar.h b/src/frontends/Menubar.h
index 9e6df7f8eee8ec94d35f90c28f33da75b988c61e..996ae1ed8e4e86b5194b5590df94c67e44cfd973 100644 (file)
--- a/src/frontends/Menubar.h
+++ b/src/frontends/Menubar.h
@@ -14,7 +14,7 @@
 #define MENUBAR_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 
 /**
  * The LyX GUI independent menubar class

diff --git a/src/frontends/Painter.h b/src/frontends/Painter.h
index 3b3f7e153f82adc2df2e97d7a0c8129858fa3096..95abeb23fa6d85b6366c3bf5c064ece7a7c3e5b1 100644 (file)
--- a/src/frontends/Painter.h
+++ b/src/frontends/Painter.h
@@ -14,7 +14,7 @@
 #define PAINTER_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "LColor.h"
 
 class LyXFont;

diff --git a/src/frontends/Toolbar.h b/src/frontends/Toolbar.h
index c698dd8a28fde6246f07e42933270285d50cb607..2b12c88465a4aba4c021fa96c7b669b14dc21b67 100644 (file)
--- a/src/frontends/Toolbar.h
+++ b/src/frontends/Toolbar.h
@@ -13,7 +13,7 @@
 #define TOOLBAR_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "ToolbarBackend.h"
 
 class LyXView;

diff --git a/src/frontends/controllers/BCView.h b/src/frontends/controllers/BCView.h
index 33ae12be6bb3b9ea2ea7641dc5e04e30a63b8178..4b63c73392aed21f7a589a13dcc0ceac01c76a94 100644 (file)
--- a/src/frontends/controllers/BCView.h
+++ b/src/frontends/controllers/BCView.h
@@ -15,7 +15,7 @@
 #define BCVIEW_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <boost/shared_ptr.hpp>
 #include <list>
 

diff --git a/src/frontends/controllers/ButtonController.h b/src/frontends/controllers/ButtonController.h
index b85386b86c652782d75a7b7445fedad8d20adf64..3c0e96f4b81e5ee025d5a6c1841cce174a05e5e8 100644 (file)
--- a/src/frontends/controllers/ButtonController.h
+++ b/src/frontends/controllers/ButtonController.h
@@ -15,7 +15,7 @@
 
 #include "ButtonPolicies.h"
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <boost/scoped_ptr.hpp>
 
 

diff --git a/src/frontends/controllers/ButtonPolicies.h b/src/frontends/controllers/ButtonPolicies.h
index fb34463e7e49a87eb2b35e867dbfa943f4f62d3b..564f4d7de48390077c9aa82e1957c6910531c803 100644 (file)
--- a/src/frontends/controllers/ButtonPolicies.h
+++ b/src/frontends/controllers/ButtonPolicies.h
@@ -19,7 +19,7 @@
 #include <vector>
 #include <boost/utility.hpp>
 
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 /** An abstract base class for button policies.
     A state machine implementation of the various button policies used by the

diff --git a/src/frontends/controllers/ControlAboutlyx.C b/src/frontends/controllers/ControlAboutlyx.C
index b75e72406497be51afc0908d365c6f1f505bb9c9..179f12c647657e4e1e0589e3ca03c556cc9738a4 100644 (file)
--- a/src/frontends/controllers/ControlAboutlyx.C
+++ b/src/frontends/controllers/ControlAboutlyx.C
@@ -15,7 +15,7 @@
 #include "ControlAboutlyx.h"
 #include "gettext.h"
 #include "version.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 #include "support/filetools.h" // FileSearch
 #include "support/path_defines.h"

diff --git a/src/frontends/controllers/ControlCommandBuffer.h b/src/frontends/controllers/ControlCommandBuffer.h
index b7ca16dd39f39eafb72e8f9a5d0538aedcdfd22b..4cbf30721e505ae7851a47bf2452dc5a5b28e95d 100644 (file)
--- a/src/frontends/controllers/ControlCommandBuffer.h
+++ b/src/frontends/controllers/ControlCommandBuffer.h
@@ -14,7 +14,7 @@
 #ifndef CONTROLCOMMANDBUFFER_H
 #define CONTROLCOMMANDBUFFER_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <vector>
 

diff --git a/src/frontends/controllers/ControlDocument.h b/src/frontends/controllers/ControlDocument.h
index 4cac6307f23365014674faa46253764cbef194b4..6b2e3ac592e0550ed24fe8029a1b366f2192d7e3 100644 (file)
--- a/src/frontends/controllers/ControlDocument.h
+++ b/src/frontends/controllers/ControlDocument.h
@@ -15,7 +15,7 @@
 
 #include <boost/scoped_ptr.hpp>
 #include "ControlDialog_impl.h"
-#include "LString.h"
+#include "support/std_string.h"
 #include "bufferparams.h"
 
 #include <vector>

diff --git a/src/frontends/controllers/ControlForks.h b/src/frontends/controllers/ControlForks.h
index 6fe57c03e2b02d243483994fef7a73892b392344..0752a062042cb039dc9ca02c2d1ebddffbabf226 100644 (file)
--- a/src/frontends/controllers/ControlForks.h
+++ b/src/frontends/controllers/ControlForks.h
@@ -14,7 +14,7 @@
 
 
 #include "ControlDialog_impl.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <boost/signals/connection.hpp>
 

diff --git a/src/frontends/controllers/ControlParagraph.C b/src/frontends/controllers/ControlParagraph.C
index 901b768511f9ffd57d85c85e6dcb77372fc9b004..512c6fef3521fbe6a1c6c14942d8a5659e220cc4 100644 (file)
--- a/src/frontends/controllers/ControlParagraph.C
+++ b/src/frontends/controllers/ControlParagraph.C
@@ -17,7 +17,7 @@
 #include "lyxlex.h"
 #include "ParagraphParameters.h"
 #include "support/LAssert.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 using namespace lyx::support;
 

diff --git a/src/frontends/controllers/ControlPreamble.h b/src/frontends/controllers/ControlPreamble.h
index 20d3e1f9661ee833372a2db475861a9519d00529..97f822a744d33705655fbdf904a6db431a01cf8b 100644 (file)
--- a/src/frontends/controllers/ControlPreamble.h
+++ b/src/frontends/controllers/ControlPreamble.h
@@ -15,7 +15,7 @@
 
 #include "ControlDialog_impl.h"
 
-#include "LString.h"
+#include "support/std_string.h"
 
 /** A controller for Preamble dialogs.
  */

diff --git a/src/frontends/controllers/ControlPrefs.h b/src/frontends/controllers/ControlPrefs.h
index bd5bf94d5c8efa482a071d63dd8f7429689a7af4..581a81bdb292236023f1edf7f349c636b57c9916 100644 (file)
--- a/src/frontends/controllers/ControlPrefs.h
+++ b/src/frontends/controllers/ControlPrefs.h
@@ -14,7 +14,7 @@
 
 
 #include "ControlDialog_impl.h"
-#include "LString.h"
+#include "support/std_string.h"
 #include "funcrequest.h"
 #include "lyxrc.h"
 #include "LColor.h"

diff --git a/src/frontends/controllers/ControlPrint.h b/src/frontends/controllers/ControlPrint.h
index 738bbdb389cd1eaa69c3222cb03f03ead9cf966e..e6119c68a939b98515bede26c38ba923964036c2 100644 (file)
--- a/src/frontends/controllers/ControlPrint.h
+++ b/src/frontends/controllers/ControlPrint.h
@@ -16,7 +16,7 @@
 
 #include "ControlDialog_impl.h"
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class PrinterParams;
 

diff --git a/src/frontends/controllers/ControlSearch.h b/src/frontends/controllers/ControlSearch.h
index 0bbcd8f53df09f9c201133c110bc34938fae003d..595b8ce359aad0d6cbff105a1f8ea27bd451e37a 100644 (file)
--- a/src/frontends/controllers/ControlSearch.h
+++ b/src/frontends/controllers/ControlSearch.h
@@ -14,7 +14,7 @@
 
 
 #include "ControlDialog_impl.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 /** A controller for Search dialogs.
  */

diff --git a/src/frontends/controllers/ControlSendto.h b/src/frontends/controllers/ControlSendto.h
index 13d58eed1dddfacd4011ff1cc452aecbd48e2da8..6f4cc60bb07d5ca7e2153f5701e8c55bcd219753 100644 (file)
--- a/src/frontends/controllers/ControlSendto.h
+++ b/src/frontends/controllers/ControlSendto.h
@@ -14,7 +14,7 @@
 
 
 #include "ControlDialog_impl.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <vector>
 

diff --git a/src/frontends/controllers/ControlSpellchecker.h b/src/frontends/controllers/ControlSpellchecker.h
index 67446820e3a76c9d2da9d3b00a726de16ace0b8f..4e87d437b181096ad63b24fd9876115c7c0f1af4 100644 (file)
--- a/src/frontends/controllers/ControlSpellchecker.h
+++ b/src/frontends/controllers/ControlSpellchecker.h
@@ -15,7 +15,7 @@
 #include <boost/scoped_ptr.hpp>
 
 #include "ControlDialog_impl.h"
-#include "LString.h"
+#include "support/std_string.h"
 #include "WordLangTuple.h"
 
 class SpellBase;

diff --git a/src/frontends/controllers/Dialog.h b/src/frontends/controllers/Dialog.h
index 8b7b256f1e83733772cbd59552dbf56f1775713c..84b40f65ca6681fc1a829d44ef12bc106cd6aa83 100644 (file)
--- a/src/frontends/controllers/Dialog.h
+++ b/src/frontends/controllers/Dialog.h
@@ -14,7 +14,7 @@
 
 
 #include "Kernel.h"
-#include "LString.h"
+#include "support/std_string.h"
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
 

diff --git a/src/frontends/controllers/Kernel.h b/src/frontends/controllers/Kernel.h
index 9e35603ef218a0dc0d0cb74a6e32ff2b21432d48..6022e390bf0547de8ef30e714ea5fc081bbb5d26 100644 (file)
--- a/src/frontends/controllers/Kernel.h
+++ b/src/frontends/controllers/Kernel.h
@@ -13,7 +13,7 @@
 #define KERNEL_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 
 
 class Buffer;

diff --git a/src/frontends/controllers/ViewBase.h b/src/frontends/controllers/ViewBase.h
index 1a111908c7256f02369db2930909a802fd08f001..203f88e98c0b769dd14ecf767fc42141caeb8016 100644 (file)
--- a/src/frontends/controllers/ViewBase.h
+++ b/src/frontends/controllers/ViewBase.h
@@ -15,7 +15,7 @@
 class ControlButtons;
 class ButtonController;
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <boost/utility.hpp>
 

diff --git a/src/frontends/controllers/biblio.C b/src/frontends/controllers/biblio.C
index b700805e5b570e89b964ba506dc83a745026eff6..f541cfd053918768cb94f5b6dc33044de7d07bd1 100644 (file)
--- a/src/frontends/controllers/biblio.C
+++ b/src/frontends/controllers/biblio.C
@@ -13,7 +13,7 @@
 
 #include "biblio.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "gettext.h" // for _()
 
 #include "support/lstrings.h"

diff --git a/src/frontends/controllers/biblio.h b/src/frontends/controllers/biblio.h
index 0f04cc47ca7f61ba27a3c7a2a6b5b9ace2f7b007..1694ab93a51e0506ecb006a37f5ac27c9569a8a6 100644 (file)
--- a/src/frontends/controllers/biblio.h
+++ b/src/frontends/controllers/biblio.h
@@ -13,7 +13,7 @@
 #define BIBLIOHELPERS_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <map>
 #include <vector>
 

diff --git a/src/frontends/controllers/frnt_lang.h b/src/frontends/controllers/frnt_lang.h
index b0b5faf9f3ddc026752b9592ef9659ef82449b75..ffff790236cc3d92791bb2e14ae2fa9dc5a6adb4 100644 (file)
--- a/src/frontends/controllers/frnt_lang.h
+++ b/src/frontends/controllers/frnt_lang.h
@@ -13,7 +13,7 @@
 #define FRNT_LANG_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <utility>
 #include <vector>
 

diff --git a/src/frontends/controllers/helper_funcs.h b/src/frontends/controllers/helper_funcs.h
index fc63f6248543cc51690cd13a4988bae31193843a..c20fa8a635073b81605e01df282092f6a20bbe8b 100644 (file)
--- a/src/frontends/controllers/helper_funcs.h
+++ b/src/frontends/controllers/helper_funcs.h
@@ -13,7 +13,7 @@
 #define HELPERFUNCS_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <utility> // pair
 #include <vector> // pair

diff --git a/src/frontends/controllers/tex_helpers.h b/src/frontends/controllers/tex_helpers.h
index 0e97bda2adca656042821e9d26c7f034b054c342..3132a7da4ac4ed4123f33e291ebd88f7d4fdf344 100644 (file)
--- a/src/frontends/controllers/tex_helpers.h
+++ b/src/frontends/controllers/tex_helpers.h
@@ -13,7 +13,7 @@
 #define TEX_HELPERS_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <utility>
 #include <vector>
 

diff --git a/src/frontends/font_metrics.h b/src/frontends/font_metrics.h
index d873b02b513025c654537e216e3236c6b62a0675..ffd0c17378d84beb3a3f5f47e1ae411b135f95bb 100644 (file)
--- a/src/frontends/font_metrics.h
+++ b/src/frontends/font_metrics.h
@@ -13,7 +13,7 @@
 #ifndef FONT_METRICS_H
 #define FONT_METRICS_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class LyXFont;
 

diff --git a/src/frontends/gnome/GAbout.C b/src/frontends/gnome/GAbout.C
index 24bdb27f0cc69ed77cf72f642bfd602f87f6d529..9c69961fc43f0572b7b9e1eb45f91f46befbb28b 100644 (file)
--- a/src/frontends/gnome/GAbout.C
+++ b/src/frontends/gnome/GAbout.C
@@ -12,7 +12,7 @@
 #include <config.h>
 
 #include "support/lstrings.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 #include "gnome_helpers.h"
 #include "gnomeBC.h"

diff --git a/src/frontends/gnome/lyx_gui.C b/src/frontends/gnome/lyx_gui.C
index 0bed070c9f7ae4b25022b75df9259cec6c5c4b5e..556e883d2689bb008603424fd0257ad4a1a207c1 100644 (file)
--- a/src/frontends/gnome/lyx_gui.C
+++ b/src/frontends/gnome/lyx_gui.C
@@ -38,7 +38,7 @@
 #include "xfont_loader.h"
 #include "xformsImage.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include <iomanip>
 #include <fcntl.h>
 #include <boost/bind.hpp>

diff --git a/src/frontends/gtk/FileDialogPrivate.C b/src/frontends/gtk/FileDialogPrivate.C
index 7dc3479f62a8071cd80d73526c02e3602e701479..b473fcf389371a764d1fe4aa55dfe73e31dfa107 100644 (file)
--- a/src/frontends/gtk/FileDialogPrivate.C
+++ b/src/frontends/gtk/FileDialogPrivate.C
@@ -11,7 +11,7 @@
 #include <config.h>
 #include <gtkmm.h>
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include "FileDialogPrivate.h"
 

diff --git a/src/frontends/gtk/GBC.h b/src/frontends/gtk/GBC.h
index feb99c9f38273fb3521714278ba66ee10e708c61..51a1071f72e54105af19419f4be3339aada27ea8 100644 (file)
--- a/src/frontends/gtk/GBC.h
+++ b/src/frontends/gtk/GBC.h
@@ -16,7 +16,7 @@
 
 #include "ButtonController.h"
 #include "BCView.h"
-#include "LString.h"
+#include "support/std_string.h"
 #include "gettext.h"
 
 class GBC : public GuiBC<Gtk::Button, Gtk::Widget>

diff --git a/src/frontends/gtk/GLyXKeySym.h b/src/frontends/gtk/GLyXKeySym.h
index 3d11aa90f07917d32425e6f8ca53f1f699f6760a..980a40d6d5ed6074c4be25808fde179a5b232e99 100644 (file)
--- a/src/frontends/gtk/GLyXKeySym.h
+++ b/src/frontends/gtk/GLyXKeySym.h
@@ -12,7 +12,7 @@
 #ifndef GLYX_KEYSYM_H
 #define GLYX_KEYSYM_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "frontends/LyXKeySym.h"
 
 class GLyXKeySym : public LyXKeySym

diff --git a/src/frontends/gtk/GMiniBuffer.h b/src/frontends/gtk/GMiniBuffer.h
index 33f8cae01506b026ba894c453b8c77873bc22d27..baf978c1a14b0f535d213bc86e82670ab4e97b40 100644 (file)
--- a/src/frontends/gtk/GMiniBuffer.h
+++ b/src/frontends/gtk/GMiniBuffer.h
@@ -14,7 +14,7 @@
 #define GMINI_BUFFER_H
 
 #include "frontends/Timeout.h"
-#include "LString.h"
+#include "support/std_string.h"
 class ControlCommandBuffer;
 
 class GMiniBuffer : public SigC::Object

diff --git a/src/frontends/gtk/GPainter.C b/src/frontends/gtk/GPainter.C
index 8b621c0b9b757fd2fe42b03bee5b7305565815f4..7d580fcaca5634b8bc5eeb4037b5eafc595039cf 100644 (file)
--- a/src/frontends/gtk/GPainter.C
+++ b/src/frontends/gtk/GPainter.C
@@ -12,7 +12,7 @@
 #include <gtkmm.h>
 
 #include "GPainter.h"
-#include "LString.h"
+#include "support/std_string.h"
 #include "debug.h"
 #include "GWorkArea.h"
 #include "lyxrc.h"

diff --git a/src/frontends/gtk/GPainter.h b/src/frontends/gtk/GPainter.h
index 073f124f3931019132ef942c34bf02aa4c0d14d6..0dcffe51b5bdcccdb74218997bd7003026a7ca4e 100644 (file)
--- a/src/frontends/gtk/GPainter.h
+++ b/src/frontends/gtk/GPainter.h
@@ -17,7 +17,7 @@
 
 #include <map>
 #include "frontends/Painter.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 class LyXFont;
 class GWorkArea;

diff --git a/src/frontends/gtk/GPrint.h b/src/frontends/gtk/GPrint.h
index 9b32c1ffb431be96e22ee17cc61fee5985fab872..de78f03e578ffcf4470bcf9fff69085c9549e4cb 100644 (file)
--- a/src/frontends/gtk/GPrint.h
+++ b/src/frontends/gtk/GPrint.h
@@ -12,7 +12,7 @@
 #ifndef GPRINT_H
 #define GPRINT_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "GViewBase.h"
 
 class ControlPrint;

diff --git a/src/frontends/gtk/GText.h b/src/frontends/gtk/GText.h
index 4b525a18b1e38eb5d60f06d98ac231433ff996cf..b236bdce0c22b95cf8ad56e4662990c7a6ebdc34 100644 (file)
--- a/src/frontends/gtk/GText.h
+++ b/src/frontends/gtk/GText.h
@@ -13,7 +13,7 @@
 #define GTEXT_H
 
 #include "GViewBase.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 class ControlCommand;
 

diff --git a/src/frontends/gtk/GToolbar.h b/src/frontends/gtk/GToolbar.h
index 7cbc8d24eca30eece65d8c6775d2d4e16a99d656..0cd8fdf8673a41f6ef591594321ca23eb2b85445 100644 (file)
--- a/src/frontends/gtk/GToolbar.h
+++ b/src/frontends/gtk/GToolbar.h
@@ -15,7 +15,7 @@
 #include <gtkmm.h>
 #include "frontends/Toolbar.h"
 #include "ToolbarBackend.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 class GToolbar : public Toolbar, public SigC::Object
 {

diff --git a/src/frontends/gtk/IdSc.h b/src/frontends/gtk/IdSc.h
index 4914cf4adc4ff806ea8e26f6373a027d32dc754d..ebe72cc40a52850207fe9f64955ebf4e2387a4cb 100644 (file)
--- a/src/frontends/gtk/IdSc.h
+++ b/src/frontends/gtk/IdSc.h
@@ -12,7 +12,7 @@
 #ifndef ID_SC_H
 #define ID_SC_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 namespace id_sc
 {

diff --git a/src/frontends/gtk/lyx_gui.C b/src/frontends/gtk/lyx_gui.C
index 3f190d6b5dcfbbedd85cb0a4de60629d02d43d92..0b0bbb54f8a27cc710bcddd01aafc19bdb1bc202 100644 (file)
--- a/src/frontends/gtk/lyx_gui.C
+++ b/src/frontends/gtk/lyx_gui.C
@@ -41,7 +41,7 @@
 #include "xftFontLoader.h"
 #include "GWorkArea.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include <iomanip>
 #include <fcntl.h>
 #include <boost/bind.hpp>

diff --git a/src/frontends/gtk/xftFontLoader.h b/src/frontends/gtk/xftFontLoader.h
index 986e894cf74c1ab9ea8e2f22d0b173548b86d213..4ff0dfad73a098d017ace55975752171be7b780a 100644 (file)
--- a/src/frontends/gtk/xftFontLoader.h
+++ b/src/frontends/gtk/xftFontLoader.h
@@ -13,7 +13,7 @@
 #define XFT_FONT_LOADER_H
 
 #include "lyxfont.h"
-#include "LString.h"
+#include "support/std_string.h"
 #include <X11/Xft/Xft.h>
 
 class GWorkArea;

diff --git a/src/frontends/guiapi.h b/src/frontends/guiapi.h
index a4b3cc05be432f07aac4c6500b90fa537c319cb1..a6d2fd067d53c5620ee31f89ca0fccc3b191e623 100644 (file)
--- a/src/frontends/guiapi.h
+++ b/src/frontends/guiapi.h
@@ -13,7 +13,7 @@
 #define GUIAPI_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class Dialogs;
 

diff --git a/src/frontends/lyx_gui.h b/src/frontends/lyx_gui.h
index 5e2b65379727489bb33d73cf4ee60cb78f595d8b..2e768400b68627f4767de5a538bdc69c6f0db520 100644 (file)
--- a/src/frontends/lyx_gui.h
+++ b/src/frontends/lyx_gui.h
@@ -13,7 +13,7 @@
 #define LYX_GUI_H
 
 #include "LColor.h"
-#include "LString.h"
+#include "support/std_string.h"
 #include "FuncStatus.h"
 
 #include <vector>

diff --git a/src/frontends/qt2/BulletsModule.h b/src/frontends/qt2/BulletsModule.h
index de6279e09d8228d37aeaa0997de983bd3204ed7d..cc9cb920fe50cfb93d6d7745fc1ef815155650d0 100644 (file)
--- a/src/frontends/qt2/BulletsModule.h
+++ b/src/frontends/qt2/BulletsModule.h
@@ -14,7 +14,7 @@
 
 
 #include "ui/BulletsModuleBase.h"
-#include "LString.h"
+#include "support/std_string.h"
 #include <vector>
 #include "Bullet.h"
 #include <boost/array.hpp>

diff --git a/src/frontends/qt2/FileDialog_private.h b/src/frontends/qt2/FileDialog_private.h
index 48783fa51188beefe6d039010620407ee1b6e559..573e42b3fd60e5c4e0b29d5039b7d89ed683615e 100644 (file)
--- a/src/frontends/qt2/FileDialog_private.h
+++ b/src/frontends/qt2/FileDialog_private.h
@@ -15,7 +15,7 @@
 
 #include "frontends/FileDialog.h"
 #include <qfiledialog.h>
-#include "LString.h"
+#include "support/std_string.h"
 
 class QToolButton;
 

diff --git a/src/frontends/qt2/QAbout.C b/src/frontends/qt2/QAbout.C
index 9e5789dc2bdda0700cc794a77abff0cae8250116..191542d595177cfca5de78a98a5539c5c062b68d 100644 (file)
--- a/src/frontends/qt2/QAbout.C
+++ b/src/frontends/qt2/QAbout.C
@@ -12,7 +12,7 @@
 
 
 #include "support/lstrings.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "qt_helpers.h"
 #include "ButtonController.h"
 #include "ControlAboutlyx.h"

diff --git a/src/frontends/qt2/QCharacter.h b/src/frontends/qt2/QCharacter.h
index 6f212517239dd02a2b745bc7479c1a61f88b784a..e11999379322f71104148507a0219029a5066e59 100644 (file)
--- a/src/frontends/qt2/QCharacter.h
+++ b/src/frontends/qt2/QCharacter.h
@@ -18,7 +18,7 @@
 #include "controllers/character.h"
 #include "controllers/frnt_lang.h"
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <vector>
 

diff --git a/src/frontends/qt2/QDelimiterDialog.h b/src/frontends/qt2/QDelimiterDialog.h
index 2392d31f69dc41479dbf4eb825e1d3bea91cf051..7f03f14da3a24cdc2c6f1a3138e9fdd945277c78 100644 (file)
--- a/src/frontends/qt2/QDelimiterDialog.h
+++ b/src/frontends/qt2/QDelimiterDialog.h
@@ -14,7 +14,7 @@
 
 
 #include "ui/QDelimiterDialogBase.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 class QMathDelimiter;
 class IconPalette;

diff --git a/src/frontends/qt2/QDocumentDialog.h b/src/frontends/qt2/QDocumentDialog.h
index 024d9b5f6d539c2ac7ac69894f996432497bfef1..1b97f5a382dd6fe6bb1cee50fd0a3253733f85a3 100644 (file)
--- a/src/frontends/qt2/QDocumentDialog.h
+++ b/src/frontends/qt2/QDocumentDialog.h
@@ -14,7 +14,7 @@
 
 
 #include "ui/QDocumentDialogBase.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 #include "ui/BulletsModuleBase.h"
 #include "BulletsModule.h"

diff --git a/src/frontends/qt2/QLMenubar.h b/src/frontends/qt2/QLMenubar.h
index 74d1489813ad578be6060c3cdf464bb6e64e0d24..6534d23f87d409f52f1da9c2e0a4c545ca906b05 100644 (file)
--- a/src/frontends/qt2/QLMenubar.h
+++ b/src/frontends/qt2/QLMenubar.h
@@ -15,7 +15,7 @@
 #define QLMENUBAR_H
 
 #include "frontends/Menubar.h"
-#include "LString.h"
+#include "support/std_string.h"
 #include <map>
 
 class LyXView;

diff --git a/src/frontends/qt2/QLPainter.h b/src/frontends/qt2/QLPainter.h
index b71ce94fdc67fb205dc2f68ce2c550ab96852b3f..45afb461c100601434b0f2b6745184bd5e191409 100644 (file)
--- a/src/frontends/qt2/QLPainter.h
+++ b/src/frontends/qt2/QLPainter.h
@@ -14,7 +14,7 @@
 
 
 #include "Painter.h"
-#include "LString.h"
+#include "support/std_string.h"
 #include "LColor.h"
 
 #include <boost/scoped_ptr.hpp>

diff --git a/src/frontends/qt2/QLPopupMenu.h b/src/frontends/qt2/QLPopupMenu.h
index 6095554f51e5c5bd2a8f087195ce908a5c0dd20c..3438992bb29949fb2dff079d249136a31a664842 100644 (file)
--- a/src/frontends/qt2/QLPopupMenu.h
+++ b/src/frontends/qt2/QLPopupMenu.h
@@ -15,7 +15,7 @@
 
 #include <qpopupmenu.h>
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <map>
 

diff --git a/src/frontends/qt2/QLog.C b/src/frontends/qt2/QLog.C
index 8a3496524ab3a8f7a655a1038619b445b792c95b..ce55736dfd8ce6293a6839707e5d75107439abca 100644 (file)
--- a/src/frontends/qt2/QLog.C
+++ b/src/frontends/qt2/QLog.C
@@ -13,7 +13,7 @@
 
 #include "qt_helpers.h"
 #include "ControlLog.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 #include <qtextview.h>
 #include <qpushbutton.h>

diff --git a/src/frontends/qt2/QLyXKeySym.h b/src/frontends/qt2/QLyXKeySym.h
index fba0f282c1863c546d2c7989cb1172f9a85ab883..9c666b98b833dcce4f064d323ba1e8c76574ad78 100644 (file)
--- a/src/frontends/qt2/QLyXKeySym.h
+++ b/src/frontends/qt2/QLyXKeySym.h
@@ -14,7 +14,7 @@
 #define QLYXKEYSYM_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "frontends/LyXKeySym.h"
 
 #include <qstring.h>

diff --git a/src/frontends/qt2/QMathDialog.h b/src/frontends/qt2/QMathDialog.h
index 4e4ffc1615d613b9c65dc81b822c8d96cdaa9f43..47e0b1c4766e3b8845e190e51cafd13b77c296fa 100644 (file)
--- a/src/frontends/qt2/QMathDialog.h
+++ b/src/frontends/qt2/QMathDialog.h
@@ -14,7 +14,7 @@
 
 
 #include "ui/QMathDialogBase.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 class QMath;
 class IconPalette;

diff --git a/src/frontends/qt2/QMathMatrixDialog.C b/src/frontends/qt2/QMathMatrixDialog.C
index 264dcb8479e9a9d6c0695bfc99975b655e684f6a..ba11f8baaca2e393d086b5ca8ced45b667d73bcc 100644 (file)
--- a/src/frontends/qt2/QMathMatrixDialog.C
+++ b/src/frontends/qt2/QMathMatrixDialog.C
@@ -12,7 +12,7 @@
 
 #include "qt_helpers.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "ControlMath.h"
 
 #include "QMath.h"

diff --git a/src/frontends/qt2/QParagraph.h b/src/frontends/qt2/QParagraph.h
index 28691aaf677a975bb897bf4cadbeb2f559185682..4ef7424af2865e85eee391e64cfcc0f3cf213203 100644 (file)
--- a/src/frontends/qt2/QParagraph.h
+++ b/src/frontends/qt2/QParagraph.h
@@ -15,7 +15,7 @@
 
 
 #include "QDialogView.h"
-#include "LString.h"
+#include "support/std_string.h"
 #include <vector>
 
 class ControlParagraph;

diff --git a/src/frontends/qt2/QPrefs.C b/src/frontends/qt2/QPrefs.C
index 967e0adf80038f26f89e04a0fc32e82c1d7f73e6..895dde11cce50f84addcee9d9f438971530536c1 100644 (file)
--- a/src/frontends/qt2/QPrefs.C
+++ b/src/frontends/qt2/QPrefs.C
@@ -12,7 +12,7 @@
 
 #include "support/lstrings.h"
 #include "support/tostr.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include <iomanip>
 
 #include "ControlPrefs.h"

diff --git a/src/frontends/qt2/QRef.h b/src/frontends/qt2/QRef.h
index 5c90cb9cdd3417b5068604f6cbf26f63dc4b305a..d837dff84d417e9d772900631b70e5fc7184b86f 100644 (file)
--- a/src/frontends/qt2/QRef.h
+++ b/src/frontends/qt2/QRef.h
@@ -15,7 +15,7 @@
 
 #include "QDialogView.h"
 #include <vector>
-#include "LString.h"
+#include "support/std_string.h"
 
 class ControlRef;
 class QRefDialog;

diff --git a/src/frontends/qt2/QSearchDialog.h b/src/frontends/qt2/QSearchDialog.h
index 9e497deed246f04bcb07b39e3218cfe3dbfafe11..e0fe998f7c37e7d50c7ee5557a4afa001aa54b09 100644 (file)
--- a/src/frontends/qt2/QSearchDialog.h
+++ b/src/frontends/qt2/QSearchDialog.h
@@ -14,7 +14,7 @@
 
 
 #include "ui/QSearchDialogBase.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 class QSearch;
 class QCloseEvent;

diff --git a/src/frontends/qt2/QVCLog.C b/src/frontends/qt2/QVCLog.C
index da4884bbbf8f470bbf3b9bc1c99af1b1765d99ab..bb40427d096ec5fe047e6915675e29a668974c8f 100644 (file)
--- a/src/frontends/qt2/QVCLog.C
+++ b/src/frontends/qt2/QVCLog.C
@@ -11,7 +11,7 @@
 #include <config.h>
 
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "qt_helpers.h"
 #include "support/lstrings.h"
 #include "ControlVCLog.h"

diff --git a/src/frontends/qt2/floatplacement.h b/src/frontends/qt2/floatplacement.h
index 5c59144ba9d949876b5e79baee9b7ff300075f5f..379433bbe3df2ae14181520bb75317292326e6f6 100644 (file)
--- a/src/frontends/qt2/floatplacement.h
+++ b/src/frontends/qt2/floatplacement.h
@@ -10,7 +10,7 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <qwidget.h>
 

diff --git a/src/frontends/qt2/iconpalette.h b/src/frontends/qt2/iconpalette.h
index bc2e5c32767b39237346432e6a3ac4c5663ecb43..2b8d572d4f34bb78385871423e2725ff9698805e 100644 (file)
--- a/src/frontends/qt2/iconpalette.h
+++ b/src/frontends/qt2/iconpalette.h
@@ -14,7 +14,7 @@
 
 
 #include <qwidget.h>
-#include "LString.h"
+#include "support/std_string.h"
 #include <utility>
 #include <vector>
 

diff --git a/src/frontends/qt2/panelstack.h b/src/frontends/qt2/panelstack.h
index 10bd8407661f482c02c77549df2d86d2da4a1617..8045d9a79adaa7c8c2c179674db2211204d3f09e 100644 (file)
--- a/src/frontends/qt2/panelstack.h
+++ b/src/frontends/qt2/panelstack.h
@@ -11,7 +11,7 @@
 #ifndef PANELSTACK_H
 #define PANELSTACK_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <qwidget.h>
 

diff --git a/src/frontends/qt2/qlkey.h b/src/frontends/qt2/qlkey.h
index 214042cef9078c840699ac0615ce1f43f1912a11..77995364db1bc384903bc04e3cf2e5f3e57802e2 100644 (file)
--- a/src/frontends/qt2/qlkey.h
+++ b/src/frontends/qt2/qlkey.h
@@ -14,7 +14,7 @@
 
 
 #include <qnamespace.h>
-#include "LString.h"
+#include "support/std_string.h"
 
 /**
  * Return true if the key event is a modifier.

diff --git a/src/frontends/qt2/qt_helpers.h b/src/frontends/qt2/qt_helpers.h
index 769e2004b6a9ccab939388979230cda6efecdff3..c350cdbb6c5fc2b328cd7c09ed57541061fdec80 100644 (file)
--- a/src/frontends/qt2/qt_helpers.h
+++ b/src/frontends/qt2/qt_helpers.h
@@ -13,7 +13,7 @@
 #define QTHELPERS_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <utility>
 

diff --git a/src/frontends/xforms/Color.C b/src/frontends/xforms/Color.C
index 75493e7013252ebd955bb8e01d36a8a706ac0c45..93ad4dd0e311396c1cef385f626161eee8da5a30 100644 (file)
--- a/src/frontends/xforms/Color.C
+++ b/src/frontends/xforms/Color.C
@@ -16,7 +16,7 @@
 
 #include "lyx_forms.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include <iomanip>
 
 namespace support = lyx::support;

diff --git a/src/frontends/xforms/Color.h b/src/frontends/xforms/Color.h
index f820f853ea3b0cfd542b3826f424af928c4a84ea..86a8de28813ae3dee25b420fc52efb8e521ab274 100644 (file)
--- a/src/frontends/xforms/Color.h
+++ b/src/frontends/xforms/Color.h
@@ -17,7 +17,7 @@
 #define COLOR_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "LColor.h"
 
 /** Given col, fills r, g, b in the range 0-255.

diff --git a/src/frontends/xforms/FontInfo.h b/src/frontends/xforms/FontInfo.h
index aaffd121f7718a440cb3ce92adf2aa5ce007ee64..51b0a850a6c1e19db50919eb03b2b803a8750178 100644 (file)
--- a/src/frontends/xforms/FontInfo.h
+++ b/src/frontends/xforms/FontInfo.h
@@ -14,7 +14,7 @@
 #define FONTINFO_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <boost/scoped_array.hpp>
 

diff --git a/src/frontends/xforms/FormAboutlyx.C b/src/frontends/xforms/FormAboutlyx.C
index 906a66c1708751cba985446203dd387099e4f671..8ee877ff115825251ebe8a5846ee3f150a2cd0f9 100644 (file)
--- a/src/frontends/xforms/FormAboutlyx.C
+++ b/src/frontends/xforms/FormAboutlyx.C
@@ -18,7 +18,7 @@
 #include "ControlAboutlyx.h"
 #include "forms/form_aboutlyx.h"
 #include "xforms_helpers.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "version.h"
 
 #include "lyx_forms.h"

diff --git a/src/frontends/xforms/FormBase.h b/src/frontends/xforms/FormBase.h
index 248cd114a26bde6d346319b3a8aeb67ea82b2905..a09c0edefcef2a5710dc8cc684d6f7d985bcf319 100644 (file)
--- a/src/frontends/xforms/FormBase.h
+++ b/src/frontends/xforms/FormBase.h
@@ -20,7 +20,7 @@
 #include "ButtonPolicies.h"
 #include "forms_fwd.h"
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <boost/scoped_ptr.hpp>
 #include <X11/Xlib.h> // for Pixmap
 

diff --git a/src/frontends/xforms/FormColorpicker.h b/src/frontends/xforms/FormColorpicker.h
index 6c2b37643bb67032a9ae1ae7d48f88c18dfbf68f..316fa79bbcb021a83e65b33d2eeae33de7ded733 100644 (file)
--- a/src/frontends/xforms/FormColorpicker.h
+++ b/src/frontends/xforms/FormColorpicker.h
@@ -15,7 +15,7 @@
 #include "Color.h"
 #include "forms_fwd.h"
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <boost/scoped_ptr.hpp>
 #include <X11/Xlib.h> // for Pixmap
 

diff --git a/src/frontends/xforms/FormDialogView.h b/src/frontends/xforms/FormDialogView.h
index 8cd0b8b4f3d6088a9667994467f07cd28a85697e..9e02c17f12f9280a6235d314c193f542f4875f9a 100644 (file)
--- a/src/frontends/xforms/FormDialogView.h
+++ b/src/frontends/xforms/FormDialogView.h
@@ -20,7 +20,7 @@
 #include "ButtonPolicies.h"
 #include "forms_fwd.h"
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <boost/scoped_ptr.hpp>
 #include <X11/Xlib.h> // for Pixmap
 

diff --git a/src/frontends/xforms/FormFiledialog.h b/src/frontends/xforms/FormFiledialog.h
index 5e5054bd8327e5ad56a1fa072f71d2a9201e13da..ae0b2cdaeb1f0223ee47ead1a81aa55ead14dee9 100644 (file)
--- a/src/frontends/xforms/FormFiledialog.h
+++ b/src/frontends/xforms/FormFiledialog.h
@@ -15,7 +15,7 @@
 
 
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include "forms_fwd.h"
 

diff --git a/src/frontends/xforms/FormMathsDelim.C b/src/frontends/xforms/FormMathsDelim.C
index 916126f60e3863c05e3073bdd8994b67aa977b0a..2415e74902e2c71c81527cda4c8e4cc701ffe39f 100644 (file)
--- a/src/frontends/xforms/FormMathsDelim.C
+++ b/src/frontends/xforms/FormMathsDelim.C
@@ -22,7 +22,7 @@
 
 #include "controllers/ButtonController.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 #include "delim.xbm"
 #include "delim0.xpm"

diff --git a/src/frontends/xforms/FormMathsMatrix.C b/src/frontends/xforms/FormMathsMatrix.C
index b84027102e1be721ae730cab7fb5dce0e65880f3..ad88e0c19423244a2a697a540174013f674cb1d2 100644 (file)
--- a/src/frontends/xforms/FormMathsMatrix.C
+++ b/src/frontends/xforms/FormMathsMatrix.C
@@ -26,7 +26,7 @@
 
 #include "lyx_forms.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 using namespace lyx::support;
 

diff --git a/src/frontends/xforms/FormVCLog.C b/src/frontends/xforms/FormVCLog.C
index 6ac73101a8279b2ee7f529808127055195a7c306..08f7b94b86dce0c6e63acb4d96b50bd0db030115 100644 (file)
--- a/src/frontends/xforms/FormVCLog.C
+++ b/src/frontends/xforms/FormVCLog.C
@@ -18,7 +18,7 @@
 
 #include "lyx_forms.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 
 FormVCLog::FormVCLog(Dialog & parent)

diff --git a/src/frontends/xforms/Tooltips.h b/src/frontends/xforms/Tooltips.h
index 49502f8e2f5f91cc45c6a2ad83eabd586feae29f..8edfdbf11d786d4d9b32bca383b333999ae3bb8b 100644 (file)
--- a/src/frontends/xforms/Tooltips.h
+++ b/src/frontends/xforms/Tooltips.h
@@ -19,7 +19,7 @@
 #define TOOLTIPS_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <boost/utility.hpp>
 #include <boost/signals/signal0.hpp>

diff --git a/src/frontends/xforms/XFormsMenubar.h b/src/frontends/xforms/XFormsMenubar.h
index 848e384c55e59ae80812f4beee96ede9ffafa3a4..bfc06fcf16bb8e1cb6a79510f6be07c8bc455cd9 100644 (file)
--- a/src/frontends/xforms/XFormsMenubar.h
+++ b/src/frontends/xforms/XFormsMenubar.h
@@ -12,7 +12,7 @@
 #ifndef XFORMSMENUBAR_H
 #define XFORMSMENUBAR_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "frontends/Menubar.h"
 
 #include <boost/shared_ptr.hpp>

diff --git a/src/frontends/xforms/XLyXKeySym.h b/src/frontends/xforms/XLyXKeySym.h
index e7d02df0324cca7ab74994c17d501e074bca9492..ed7dfb6032d22b04b830cf410c03a7705e71b9c4 100644 (file)
--- a/src/frontends/xforms/XLyXKeySym.h
+++ b/src/frontends/xforms/XLyXKeySym.h
@@ -13,7 +13,7 @@
 #define XLYXKEYSYM_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <X11/Xlib.h>
 #include "frontends/LyXKeySym.h"
 

diff --git a/src/frontends/xforms/XMiniBuffer.h b/src/frontends/xforms/XMiniBuffer.h
index c029fcafa2fc81a5bd92f92dbd9bae64a35a2fe7..00b6936b46acf9b83c19504d0912d0cb6f903649 100644 (file)
--- a/src/frontends/xforms/XMiniBuffer.h
+++ b/src/frontends/xforms/XMiniBuffer.h
@@ -16,7 +16,7 @@
 
 #include "lyx_forms.h"
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/signals/connection.hpp>

diff --git a/src/frontends/xforms/XPainter.h b/src/frontends/xforms/XPainter.h
index 58a70bff958ca1134b31fb0ae285918c7831bc4e..c98bb757722d0c83330a2814525ec8d29c9bc9f3 100644 (file)
--- a/src/frontends/xforms/XPainter.h
+++ b/src/frontends/xforms/XPainter.h
@@ -14,7 +14,7 @@
 #define XPAINTER_H
 
 #include "frontends/Painter.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <X11/Xlib.h>
 

diff --git a/src/frontends/xforms/forms/Makefile.am b/src/frontends/xforms/forms/Makefile.am
index 1d3ea7aab6b52a1bfba2fef6d5581b5da95ef807..8a835f6b8b32048b93fa1708405f2a0decc1ee81 100644 (file)
--- a/src/frontends/xforms/forms/Makefile.am
+++ b/src/frontends/xforms/forms/Makefile.am
@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES += *.C *.h *.c
 
 EXTRA_DIST = fdfixc.sed fdfixh.sed fdfix.sh tmp_str.sed README $(SRCS)
 
-# For (forms_fwd.h, forms_gettext.h) and LString.h, respectively.
+# For (forms_fwd.h, forms_gettext.h) and support/std_string.h, respectively.
 INCLUDES = -I$(srcdir)/..  -I$(top_srcdir)/src -I..
 
 noinst_LTLIBRARIES = libfdesign.la

diff --git a/src/frontends/xforms/forms_gettext.h b/src/frontends/xforms/forms_gettext.h
index 52aa7643c42bf17f491232ecd4b6c1dfb2898417..d925e07f3f5b06df0dfcfb7eb5d9b3f20fd93a75 100644 (file)
--- a/src/frontends/xforms/forms_gettext.h
+++ b/src/frontends/xforms/forms_gettext.h
@@ -13,7 +13,7 @@
 #define FORMS_GETTEXT_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 
 /// Extract shortcut from "<identifer>|<shortcut>" string
 string const scex(string const &);

diff --git a/src/frontends/xforms/lyx_gui.C b/src/frontends/xforms/lyx_gui.C
index 95b752e9b97cafa7d2e6bbf1748ffe8f3b0dd827..9500ef95cc3bfcc473d37c248207568f28320a62 100644 (file)
--- a/src/frontends/xforms/lyx_gui.C
+++ b/src/frontends/xforms/lyx_gui.C
@@ -38,7 +38,7 @@
 
 #include <boost/bind.hpp>
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include <iomanip>
 #include <fcntl.h>
 

diff --git a/src/frontends/xforms/xfont_loader.h b/src/frontends/xforms/xfont_loader.h
index 2abe6a8fcbfb599c1b266d2a8ca283bd0d74707d..77c2eb98d3f88493f9c128e8577d74beac5723c7 100644 (file)
--- a/src/frontends/xforms/xfont_loader.h
+++ b/src/frontends/xforms/xfont_loader.h
@@ -15,7 +15,7 @@
 
 #include <X11/Xlib.h>
 #include "lyxfont.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 class FontInfo;
 

diff --git a/src/frontends/xforms/xfont_metrics.h b/src/frontends/xforms/xfont_metrics.h
index bf1970f1afdd1ce9a9a43f5d11b9d3ef1163c1d1..e8e911f4c4135bda4e31b612f9ebe1faf2c5a2f6 100644 (file)
--- a/src/frontends/xforms/xfont_metrics.h
+++ b/src/frontends/xforms/xfont_metrics.h
@@ -14,7 +14,7 @@
 #define XFONT_METRICS_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include "font_metrics.h"
 

diff --git a/src/frontends/xforms/xforms_helpers.h b/src/frontends/xforms/xforms_helpers.h
index 2cc835e5337a62e22635e3208dacd2a18e2adcdc..dc59d7bdd70cfa1bc4099d1e29ac77db4db4e367 100644 (file)
--- a/src/frontends/xforms/xforms_helpers.h
+++ b/src/frontends/xforms/xforms_helpers.h
@@ -16,7 +16,7 @@
 #include "forms_fwd.h"
 
 #include "Color.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <algorithm>
 #include <vector>

diff --git a/src/funcrequest.C b/src/funcrequest.C
index 81fdaf7ad70ceb036e62ebe8ee2c02d36cd03bbc..24e2ce6be981b022a66b801f8c2c6a50a87b3791 100644 (file)
--- a/src/funcrequest.C
+++ b/src/funcrequest.C
@@ -15,7 +15,7 @@
 #include "lyxfunc.h" // only for setMessage()
 #include "frontends/LyXView.h"
 #include "debug.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 
 using std::vector;

diff --git a/src/funcrequest.h b/src/funcrequest.h
index ee4c7d1d3a41798ab403cdf011228894c2b3c4e7..5ebe6fa9d1d429110d4b14c73c89d047f8a3ed75 100644 (file)
--- a/src/funcrequest.h
+++ b/src/funcrequest.h
@@ -14,7 +14,7 @@
 
 #include "lfuns.h"
 #include "frontends/mouse_state.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 class BufferView;
 

diff --git a/src/gettext.h b/src/gettext.h
index daeb9ce5e7a24750f2a3f185ad04d71fb713e411..be41aef8dcc7a67400e9b4b55e21c8a68068d3cf 100644 (file)
--- a/src/gettext.h
+++ b/src/gettext.h
@@ -41,7 +41,7 @@
  *   Panic/fatal (that should not happen) messages need not be translated
  */
 
-#include "LString.h"
+#include "support/std_string.h"
 
 //#ifdef ENABLE_NLS
 

diff --git a/src/graph.h b/src/graph.h
index 9956aa47cfae74ba8b66bfacb5e75a12d9e930f2..4a8477cbf965ceca7a09253f7bf13911507b945c 100644 (file)
--- a/src/graph.h
+++ b/src/graph.h
@@ -12,7 +12,7 @@
 #ifndef GRAPH_H
 #define GRAPH_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <queue>
 #include <vector>

diff --git a/src/graphics/GraphicsCache.h b/src/graphics/GraphicsCache.h
index 78170fb5b5b3145e3f2e0e3182fbead90928b807..41427e07b33ce3e72609f662df7672a8765e5642 100644 (file)
--- a/src/graphics/GraphicsCache.h
+++ b/src/graphics/GraphicsCache.h
@@ -20,7 +20,7 @@
 #ifndef GRAPHICSCACHE_H
 #define GRAPHICSCACHE_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <vector>
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>

diff --git a/src/graphics/GraphicsCacheItem.h b/src/graphics/GraphicsCacheItem.h
index 28b7f3af025b5d72e9374d42a8c62274e30dd429..c95d45c05f56e2bf4868937cac0f987789bf4c43 100644 (file)
--- a/src/graphics/GraphicsCacheItem.h
+++ b/src/graphics/GraphicsCacheItem.h
@@ -29,7 +29,7 @@
 #define GRAPHICSCACHEITEM_H
 
 #include "GraphicsTypes.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>

diff --git a/src/graphics/GraphicsConverter.C b/src/graphics/GraphicsConverter.C
index 2f4a25487ab77f3666bde7df222975f9d5587d46..5ac8f7bd95f42ddd9f1d3523be460127125d3bd0 100644 (file)
--- a/src/graphics/GraphicsConverter.C
+++ b/src/graphics/GraphicsConverter.C
@@ -24,7 +24,7 @@
 
 #include <boost/bind.hpp>
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include <fstream>
 
 namespace support = lyx::support;

diff --git a/src/graphics/GraphicsConverter.h b/src/graphics/GraphicsConverter.h
index 15156203788793386033608fc3f84ad3442f5e83..282730bfb3ccbfddeabc37957a2a5d6e7e22d05a 100644 (file)
--- a/src/graphics/GraphicsConverter.h
+++ b/src/graphics/GraphicsConverter.h
@@ -17,7 +17,7 @@
 #ifndef GRAPHICSCONVERTER_H
 #define GRAPHICSCONVERTER_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <boost/signals/signal1.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/utility.hpp>

diff --git a/src/graphics/GraphicsImage.h b/src/graphics/GraphicsImage.h
index ad0c37f9b2bf37aa3364478c3e229417848d1521..ec39bc1b5aec732d66c905fe72bbf30f5acad684 100644 (file)
--- a/src/graphics/GraphicsImage.h
+++ b/src/graphics/GraphicsImage.h
@@ -24,7 +24,7 @@
 #ifndef GRAPHICSIMAGE_H
 #define GRAPHICSIMAGE_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <boost/shared_ptr.hpp>
 #include <boost/function/function0.hpp>

diff --git a/src/graphics/GraphicsLoader.h b/src/graphics/GraphicsLoader.h
index cd8414f3c2e351f6dff54f25b61c2ecc61561d40..5da61930ad7f182f4f2697d591c82928e0580b95 100644 (file)
--- a/src/graphics/GraphicsLoader.h
+++ b/src/graphics/GraphicsLoader.h
@@ -25,7 +25,7 @@
 #define GRAPHICSLOADER_H
 
 #include "GraphicsTypes.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <boost/signals/signal0.hpp>
 #include <boost/scoped_ptr.hpp>

diff --git a/src/graphics/GraphicsParams.C b/src/graphics/GraphicsParams.C
index e5d88f09b9630a6a37c3edeafa22387f75f49e3e..91f54a0916afb3f42a14fe8ad0357451b11b16c8 100644 (file)
--- a/src/graphics/GraphicsParams.C
+++ b/src/graphics/GraphicsParams.C
@@ -14,7 +14,7 @@
 
 #include "lyxlength.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 using std::abs;
 

diff --git a/src/graphics/GraphicsParams.h b/src/graphics/GraphicsParams.h
index d7cb0038577dbe99dede0d8efac9a9f7b7e4bdd4..9759643ccbaaa09003859d01f7a90d0f291bcf13 100644 (file)
--- a/src/graphics/GraphicsParams.h
+++ b/src/graphics/GraphicsParams.h
@@ -15,7 +15,7 @@
 #define GRAPHICSPARAMS_H
 
 #include "GraphicsTypes.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 
 namespace lyx {

diff --git a/src/graphics/GraphicsTypes.h b/src/graphics/GraphicsTypes.h
index dc6a05bfd611e8ae44c6b3c0c908a3f572014544..2dfe4cba7142614badadcc8fcefd7e644ef4fff3 100644 (file)
--- a/src/graphics/GraphicsTypes.h
+++ b/src/graphics/GraphicsTypes.h
@@ -15,7 +15,7 @@
 #ifndef GRAPHICSTYPES_H
 #define GRAPHICSTYPES_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 namespace lyx {
 namespace graphics {

diff --git a/src/graphics/PreviewImage.h b/src/graphics/PreviewImage.h
index 0c431fcc1543c04b02128701f86b24bb12191369..1289fde12f12cc841cdcfdde55bcd76ec8dfebd6 100644 (file)
--- a/src/graphics/PreviewImage.h
+++ b/src/graphics/PreviewImage.h
@@ -12,7 +12,7 @@
 #ifndef PREVIEWIMAGE_H
 #define PREVIEWIMAGE_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <boost/scoped_ptr.hpp>
 
 class InsetOld;

diff --git a/src/graphics/PreviewLoader.C b/src/graphics/PreviewLoader.C
index b8192c0c946ad4232dd473ac629cfd93a90cf341..decb4473691f0c3ef4dc53f5a2c8db6b59c9128b 100644 (file)
--- a/src/graphics/PreviewLoader.C
+++ b/src/graphics/PreviewLoader.C
@@ -30,7 +30,7 @@
 
 #include <boost/bind.hpp>
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include <fstream>
 #include <iomanip>
 

diff --git a/src/graphics/PreviewLoader.h b/src/graphics/PreviewLoader.h
index 8558a5fbcfd0e5e73c74c38d8d7e59f57a372485..345e72c72151218adde3a540977c0aa7ea3fa775 100644 (file)
--- a/src/graphics/PreviewLoader.h
+++ b/src/graphics/PreviewLoader.h
@@ -18,7 +18,7 @@
 #ifndef PREVIEWLOADER_H
 #define PREVIEWLOADER_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/signals/signal1.hpp>

diff --git a/src/graphics/PreviewedInset.h b/src/graphics/PreviewedInset.h
index 3e51613b084c287cbd7e0dd8c4d1f6bb975bcdc8..31c6691faa607a85b33fd68733e35fc1b3e654cd 100644 (file)
--- a/src/graphics/PreviewedInset.h
+++ b/src/graphics/PreviewedInset.h
@@ -16,7 +16,7 @@
 #ifndef PREVIEWEDINSET_H
 #define PREVIEWEDINSET_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <boost/signals/trackable.hpp>
 #include <boost/signals/connection.hpp>
 

diff --git a/src/graphics/Previews.h b/src/graphics/Previews.h
index 1f9430d984679bf99f42331d00c72005175e1fb4..3e2cbc03044f3edb8ad4bdede506ca4920005663 100644 (file)
--- a/src/graphics/Previews.h
+++ b/src/graphics/Previews.h
@@ -15,7 +15,7 @@
 #ifndef PREVIEWS_H
 #define PREVIEWS_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
 

diff --git a/src/importer.h b/src/importer.h
index 4eca7c06f9cd1db941dc073e953637de6c96b790..610112a8c6888efae740d9c12405c591d381cb94 100644 (file)
--- a/src/importer.h
+++ b/src/importer.h
@@ -15,7 +15,7 @@
 #define IMPORTER_H
 
 #include <vector>
-#include "LString.h"
+#include "support/std_string.h"
 
 class LyXView;
 class Format;

diff --git a/src/insets/ExternalTemplate.h b/src/insets/ExternalTemplate.h
index a10de636a83f98c02ab638fc21940fe045cdf8d9..5b6ddf0529386dadc981d78c1ceea33dfebaafb5 100644 (file)
--- a/src/insets/ExternalTemplate.h
+++ b/src/insets/ExternalTemplate.h
@@ -15,7 +15,7 @@
 
 #include <iosfwd>
 #include <map>
-#include "LString.h"
+#include "support/std_string.h"
 #include <boost/utility.hpp>
 
 class LyXLex;

diff --git a/src/insets/insetbase.h b/src/insets/insetbase.h
index b2cd718a358ae97d8e53f29b4064c10b8ff03615..f12a6af89e78c0d679cb45c5b2818007512a639d 100644 (file)
--- a/src/insets/insetbase.h
+++ b/src/insets/insetbase.h
@@ -12,7 +12,7 @@
 #ifndef INSETBASE_H
 #define INSETBASE_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <vector>
 #include <memory>

diff --git a/src/insets/insetbranch.C b/src/insets/insetbranch.C
index dba6f3693266e7b22ea762777dc14e01864900a0..6836dd7aaa9ed982fe4a3994aba5efbcd0c0f9c7 100644 (file)
--- a/src/insets/insetbranch.C
+++ b/src/insets/insetbranch.C
@@ -18,7 +18,7 @@
 #include "gettext.h"
 #include "lyxlex.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 using std::auto_ptr;
 using std::ostream;

diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C
index 6b384cacfb2004a114bbba1ab439a5d13fa2fe3e..b202a22618ad2e70007ad7cb08cbdda02c5cd130 100644 (file)
--- a/src/insets/insetcaption.C
+++ b/src/insets/insetcaption.C
@@ -27,7 +27,7 @@
 #include "support/LAssert.h"
 #include "support/lstrings.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 using namespace lyx::support;
 

diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C
index dd0224e931dee2628cf6c0b2e7a875657f61d2e4..8408b75e05a2c33601433c18300776b978df326a 100644 (file)
--- a/src/insets/insetcommand.C
+++ b/src/insets/insetcommand.C
@@ -18,7 +18,7 @@
 #include "lyxlex.h"
 #include "metricsinfo.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 using std::ostream;
 

diff --git a/src/insets/insetcommandparams.h b/src/insets/insetcommandparams.h
index 4eaf4065383ae83c219af995c7c07173f80a1137..e5186a9cf20f47441914464b3fb46478e2a33855 100644 (file)
--- a/src/insets/insetcommandparams.h
+++ b/src/insets/insetcommandparams.h
@@ -13,7 +13,7 @@
 #define INSETCOMMANDPARAMS_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <iosfwd>
 

diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C
index 981f314e050c7a9716447815e1bf729e6bc9c1a7..664d1a8035c0fcdf22263d0bf3269d2bf933ef8e 100644 (file)
--- a/src/insets/insetexternal.C
+++ b/src/insets/insetexternal.C
@@ -23,7 +23,7 @@
 #include "LaTeXFeatures.h"
 #include "lyxlex.h"
 #include "lyxrc.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 #include "frontends/lyx_gui.h"
 

diff --git a/src/insets/insetexternal.h b/src/insets/insetexternal.h
index ee84b58304b0c4bb45c9840542acdce03c64efb2..076dbaffe092136edd2c65499718abfe32f01fee 100644 (file)
--- a/src/insets/insetexternal.h
+++ b/src/insets/insetexternal.h
@@ -15,7 +15,7 @@
 #include "inset.h"
 #include "graphics/GraphicsTypes.h"
 #include "support/filename.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/signals/trackable.hpp>

diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index 962012700f258440169905012654f6a49c747f94..420c600594b4a96638f78e9fcc2bc10fbf4bd6dd 100644 (file)
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -27,7 +27,7 @@
 #include "support/lstrings.h"
 #include "support/tostr.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 using namespace lyx::support;
 

diff --git a/src/insets/insetfoot.C b/src/insets/insetfoot.C
index 446834239f67b457b028d43852526566e8b12578..62fb053f1ab43b2765bb21b0cf9be864d7d792af 100644 (file)
--- a/src/insets/insetfoot.C
+++ b/src/insets/insetfoot.C
@@ -20,7 +20,7 @@
 #include "lyxlayout.h"
 #include "paragraph_funcs.h"
 
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 using std::auto_ptr;
 using std::ostream;

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index d9a3f3ba3c6852fd887cc9813a68d9e56b82659a..64b653fd407c009db0ffc827f69a9fd8cd9957e7 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -63,7 +63,7 @@ TODO
 #include "funcrequest.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "lyxlex.h"
 #include "lyxrc.h"
 

diff --git a/src/insets/insetgraphicsParams.h b/src/insets/insetgraphicsParams.h
index c7dd3a74cacd09827e554143c4d3434503b7d112..3d614f76d5896c3dc35680589071c65db9129235 100644 (file)
--- a/src/insets/insetgraphicsParams.h
+++ b/src/insets/insetgraphicsParams.h
@@ -15,7 +15,7 @@
 
 
 #include "graphics/GraphicsTypes.h"
-#include "LString.h"
+#include "support/std_string.h"
 #include "lyxlength.h"
 #include "support/filename.h"
 

diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index 38cfe9d56f567c48074038edf104240ac17b079d..f06b16b7092f9b74eb647d1a522d26692e0507ed 100644 (file)
--- a/src/insets/insetinclude.C
+++ b/src/insets/insetinclude.C
@@ -37,7 +37,7 @@
 
 #include <boost/bind.hpp>
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 using namespace lyx::support;
 

diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h
index c209f379158745d887e0dc0cd086d66b6621889b..4b49eec77fb15f19cda53ea141f820edd9542aa9 100644 (file)
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -13,7 +13,7 @@
 #define INSET_LATEX_ACCENT_H
 
 #include "inset.h"
-#include "LString.h"
+#include "support/std_string.h"
 #include "dimension.h"
 
 /** Insertion of accents

diff --git a/src/insets/insetlist.C b/src/insets/insetlist.C
index 2b20ada5d4143f85896ded8b1e0c6146d5ad0c75..bcabf905ddfcbe8402a402929c5a8a60c84e96ff 100644 (file)
--- a/src/insets/insetlist.C
+++ b/src/insets/insetlist.C
@@ -18,7 +18,7 @@
 #include "lyxfont.h"
 #include "lyxtext.h"
 
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 using std::endl;
 using std::ostream;

diff --git a/src/insets/insetmarginal.C b/src/insets/insetmarginal.C
index d06fa37f8f8fc8196dfde3a29c72649ed683448e..d5ed64da418435fef285f85e413fccd5826c0c22 100644 (file)
--- a/src/insets/insetmarginal.C
+++ b/src/insets/insetmarginal.C
@@ -15,7 +15,7 @@
 
 #include "gettext.h"
 
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 using std::auto_ptr;
 using std::ostream;

diff --git a/src/insets/insetminipage.C b/src/insets/insetminipage.C
index 7207a4f205aaa8a5eb88e134b74aeed5f83d566e..675dbdf61a7ba4cdbf4ef9e1b0cecb805d299c35 100644 (file)
--- a/src/insets/insetminipage.C
+++ b/src/insets/insetminipage.C
@@ -20,7 +20,7 @@
 #include "lyxlex.h"
 #include "metricsinfo.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 using std::endl;
 using std::auto_ptr;

diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C
index e249d5b2e43556af727c4ba8e2be5474989cfe09..bc508810282e88691c5cdaea38b0a132327b4bca 100644 (file)
--- a/src/insets/insetnote.C
+++ b/src/insets/insetnote.C
@@ -21,7 +21,7 @@
 #include "lyxlex.h"
 #include "metricsinfo.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 using std::auto_ptr;
 using std::ostream;

diff --git a/src/insets/insetspace.h b/src/insets/insetspace.h
index e8c0fc829e1ce66ea7e6c398a02faa3e02382700..267ff8121a529f82ae62719a22aaef1772271517 100644 (file)
--- a/src/insets/insetspace.h
+++ b/src/insets/insetspace.h
@@ -17,7 +17,7 @@
 
 
 #include "inset.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 struct LaTeXFeatures;
 

diff --git a/src/insets/insetspecialchar.h b/src/insets/insetspecialchar.h
index cddd3e237f0a2f7c5b4051956b3753b8f57e31f2..73a02165c37ca2eafdbf0646bcb4d6377059b80f 100644 (file)
--- a/src/insets/insetspecialchar.h
+++ b/src/insets/insetspecialchar.h
@@ -16,7 +16,7 @@
 
 
 #include "inset.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 struct LaTeXFeatures;
 

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 6f42d17d80c3d9e0283f02f89f8783381ec9003a..66a59ad41efbae4cc616e2b24648e1f78608e7ca 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -34,7 +34,7 @@
 
 #include "support/LAssert.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 using namespace lyx::support;
 using namespace lyx::graphics;

diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h
index 7e2f71b43e8dd67eb8678cbec2df3f9c09d3e306..372c42efb176a9f2aee0709241dce824bfdd53e0 100644 (file)
--- a/src/insets/insettabular.h
+++ b/src/insets/insettabular.h
@@ -47,7 +47,7 @@
 
 #include "inset.h"
 #include "tabular.h"
-#include "LString.h"
+#include "support/std_string.h"
 #include "frontends/mouse_state.h"
 
 class FuncStatus;

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index fa6477ec6dc154e124fd2518bc068660ebcec6dc..1add1fcd5574096f2395c835af007247fab9a886 100644 (file)
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -13,7 +13,7 @@
 #define INSETTEXT_H
 
 #include "updatableinset.h"
-#include "LString.h"
+#include "support/std_string.h"
 #include "LColor.h"
 #include "ParagraphList.h"
 #include "RowList.h"

diff --git a/src/insets/insettheorem.C b/src/insets/insettheorem.C
index fb4bcbdcd4b6e708a67d2cfcf120db4968bdb013..7d93135b7f39269576123b416dfc47d0efc61b0d 100644 (file)
--- a/src/insets/insettheorem.C
+++ b/src/insets/insettheorem.C
@@ -20,7 +20,7 @@
 #include "lyxtext.h"
 #include "metricsinfo.h"
 
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 using std::endl;
 using std::ostream;

diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C
index baf8877a55ef3590daf75846baba1a0c50820759..21267234a1111effcf20e03a83e7ab4ab9f13ef2 100644 (file)
--- a/src/insets/insetwrap.C
+++ b/src/insets/insetwrap.C
@@ -24,7 +24,7 @@
 
 #include "support/tostr.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 using std::endl;
 using std::auto_ptr;

diff --git a/src/insets/mailinset.h b/src/insets/mailinset.h
index c492e727c1ad2b5805fa56d111cfff90c05a70a3..7a927220d5be18ab03e1520c7ee3791c6b8e2ae5 100644 (file)
--- a/src/insets/mailinset.h
+++ b/src/insets/mailinset.h
@@ -13,7 +13,7 @@
 #define MAILINSET_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 
 
 class InsetBase;

diff --git a/src/intl.h b/src/intl.h
index 9351c483d1fd7b6ca7fdc6bbadc04e751b5a3825..0180c84b1ee40b22da2e381d341aaf5b5851ed90 100644 (file)
--- a/src/intl.h
+++ b/src/intl.h
@@ -15,7 +15,7 @@
 #ifndef INTL_H
 #define INTL_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "trans_mgr.h"
 
 

diff --git a/src/kbmap.h b/src/kbmap.h
index f2a9cd12601447c41c8b57a18ebadcb287b0ccc8..cef9fd59e521d1503ffe082cb845407c91aafc0f 100644 (file)
--- a/src/kbmap.h
+++ b/src/kbmap.h
@@ -14,7 +14,7 @@
 #ifndef KBMAP_H
 #define KBMAP_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "frontends/key_state.h"
 #include "frontends/LyXKeySym.h"
 

diff --git a/src/kbsequence.h b/src/kbsequence.h
index 2c46672c9fc64613b5302224ecd7c67b3c058d80..9cbf3c29720d8ee2253b113ed25492f243f10235 100644 (file)
--- a/src/kbsequence.h
+++ b/src/kbsequence.h
@@ -15,7 +15,7 @@
 
 #include "frontends/key_state.h"
 #include "frontends/LyXKeySym.h"
-#include "LString.h"
+#include "support/std_string.h"
 #include <vector>
 
 class kb_keymap;

diff --git a/src/language.h b/src/language.h
index 7a3db0510e223a158aab43d0f589c746c771e580..1293778c588349d0413490838afe36f66693ad1f 100644 (file)
--- a/src/language.h
+++ b/src/language.h
@@ -16,7 +16,7 @@
 #define LANGUAGE_H
 
 #include <map>
-#include "LString.h"
+#include "support/std_string.h"
 
 class Encoding;
 

diff --git a/src/lastfiles.h b/src/lastfiles.h
index b453f25b71ddb6c9398818aac5a2800412e22a8e..a2faf5486ce40a758766abf2e7e9aa708011a57d 100644 (file)
--- a/src/lastfiles.h
+++ b/src/lastfiles.h
@@ -14,7 +14,7 @@
 
 #include <deque>
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <boost/utility.hpp>
 
 /** The latest documents loaded.

diff --git a/src/lengthcommon.h b/src/lengthcommon.h
index 491e036cd8b3313737885d991535f3f9fda2114b..765816ca3e80d4af1c56d60722e304ea664f7e09 100644 (file)
--- a/src/lengthcommon.h
+++ b/src/lengthcommon.h
@@ -15,7 +15,7 @@
 #ifndef LENGTH_COMMON_H
 #define LENGTH_COMMON_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "lyxlength.h"
 
 /// the number of units possible

diff --git a/src/lyx_cb.h b/src/lyx_cb.h
index 42d4ed605d3ac7020545384045ec6f5936ba3ac7..8bd7bc0060e17212f6c19fc061bef3fd88d82cd5 100644 (file)
--- a/src/lyx_cb.h
+++ b/src/lyx_cb.h
@@ -12,7 +12,7 @@
 #ifndef LYX_CB_H
 #define LYX_CB_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class Buffer;
 class BufferView;

diff --git a/src/lyx_main.h b/src/lyx_main.h
index af5386d7ce665989519e1440e2b07a327852f3a3..39966400146d6a07e5494cad959d7197e662d828 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -14,7 +14,7 @@
 #ifndef LYX_MAIN_H
 #define LYX_MAIN_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/utility.hpp>

diff --git a/src/lyx_sty.h b/src/lyx_sty.h
index 45987b0b114cfb16a7123dee49d19908a29fb8d3..892332ce6816529fd604fd0bed0f3e6997fd7744 100644 (file)
--- a/src/lyx_sty.h
+++ b/src/lyx_sty.h
@@ -16,7 +16,7 @@
 #ifndef LYX_STY_H
 #define LYX_STY_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 ///
 extern string const lyx_def;

diff --git a/src/lyxfind.h b/src/lyxfind.h
index 04a242f235ac92dca90e7adb78bb0d2be6a5b377..1bf5fcbd9601082ae5c5b78b69ac0648ca0bd614 100644 (file)
--- a/src/lyxfind.h
+++ b/src/lyxfind.h
@@ -14,7 +14,7 @@
 #ifndef LYXFIND_H
 #define LYXFIND_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "support/types.h"
 
 class BufferView;

diff --git a/src/lyxfont.C b/src/lyxfont.C
index cb7dfc930a0bbf3ae69acc2b34123134d3d1b361..9a66df7b21334dc72fecaa55f5ea3c6a20fc9387 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -20,7 +20,7 @@
 #include "lyxrc.h"
 #include "lyxlex.h"
 #include "language.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "support/lstrings.h"
 #include "bufferparams.h" // stateText
 

diff --git a/src/lyxfont.h b/src/lyxfont.h
index 635cab282441ac5307436bb40173e8a6fa2bfab1..6baefa7ebb76e9b7358ccc54ae0987e74adab7fe 100644 (file)
--- a/src/lyxfont.h
+++ b/src/lyxfont.h
@@ -17,7 +17,7 @@
 
 #include <iosfwd>
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "LColor.h"
 
 class LyXLex;

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 60a5be79ae094dff5c2ea743bf954b09fb328766..1f6b7c98cf5372aef16088924fae5c001a2ef2f2 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -33,7 +33,7 @@
 #include "LyXAction.h"
 #include "debug.h"
 #include "gettext.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "encoding.h"
 #include "frontends/LyXView.h"
 #include "frontends/lyx_gui.h"

diff --git a/src/lyxfunc.h b/src/lyxfunc.h
index 696f98f9dba63bfb437731c57f725c4b0c354040..788b6f9ddf48efdb9a4c223b7e2e906629c2a84b 100644 (file)
--- a/src/lyxfunc.h
+++ b/src/lyxfunc.h
@@ -17,7 +17,7 @@
 
 #include "kbsequence.h"
 #include "lfuns.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <boost/signals/trackable.hpp>
 

diff --git a/src/lyxgluelength.C b/src/lyxgluelength.C
index 9656b6ebaf2c92cdd7150403d7a92e694ab5d39d..a32bc6f775d8b6acfc6db7e22fd885e6bbf04e73 100644 (file)
--- a/src/lyxgluelength.C
+++ b/src/lyxgluelength.C
@@ -15,7 +15,7 @@
 #include "lyxgluelength.h"
 #include "lengthcommon.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 
 LyXGlueLength::LyXGlueLength(LyXLength const & len)

diff --git a/src/lyxgluelength.h b/src/lyxgluelength.h
index ea7bfb62a778fc0a64efdf2a57907aa74ae4f074..31adcf6213f36ef37c7715f73a5ceb33d18b91eb 100644 (file)
--- a/src/lyxgluelength.h
+++ b/src/lyxgluelength.h
@@ -16,7 +16,7 @@
 
 #include "lyxlength.h"
 
-#include "LString.h"
+#include "support/std_string.h"
 
 
 class LyXGlueLength {

diff --git a/src/lyxlayout.h b/src/lyxlayout.h
index 661d7fb6bfab16641becfdf0bf90b1b0652e0548..e709ffb23dcd0ce4a104ca51cd6cc4c23d94b90e 100644 (file)
--- a/src/lyxlayout.h
+++ b/src/lyxlayout.h
@@ -17,7 +17,7 @@
 #include "lyxfont.h"
 #include "layout.h"
 #include "Spacing.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 class LyXLex;
 class LyXTextClass;

diff --git a/src/lyxlength.C b/src/lyxlength.C
index e9c0cf880ecdcfe0c5f3c39cd03e21f6f5048e25..48cea2f4185061099d1d6e2bc5997372df18c2cd 100644 (file)
--- a/src/lyxlength.C
+++ b/src/lyxlength.C
@@ -20,7 +20,7 @@
 #include "lyxrc.h"
 
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 
 using std::abs;

diff --git a/src/lyxlength.h b/src/lyxlength.h
index 7ff6629f02644ab4d4adb9c6bf26311d39be6b70..01b6d3286f2d1ea559f0f17a30bfde2adb82cd32 100644 (file)
--- a/src/lyxlength.h
+++ b/src/lyxlength.h
@@ -15,7 +15,7 @@
 #ifndef LYX_LENGTH_H
 #define LYX_LENGTH_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 /**
  * LyXLength - Represents latex length measurement

diff --git a/src/lyxlex.h b/src/lyxlex.h
index 32c58834437fcd525005e143beab32a27a107abe..77babdab04551ca71cc9be762040e4eeacc36a80 100644 (file)
--- a/src/lyxlex.h
+++ b/src/lyxlex.h
@@ -19,7 +19,7 @@
 
 #include <iosfwd>
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <boost/utility.hpp>
 
 ///

diff --git a/src/lyxserver.h b/src/lyxserver.h
index 636ef2855641bb5a2be2a3d4021f874440495b09..e7ea2f3902ccde6200b9ea64727ec0ea2df617e5 100644 (file)
--- a/src/lyxserver.h
+++ b/src/lyxserver.h
@@ -13,7 +13,7 @@
 #ifndef LYXSERVER_H
 #define LYXSERVER_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <boost/signals/trackable.hpp>
 

diff --git a/src/lyxtextclass.h b/src/lyxtextclass.h
index 485b8290b34429071cb23d9957d6e66f3884d251..9c8b289fac73c23ba52dd4ed17bf0fda2e8cb24b 100644 (file)
--- a/src/lyxtextclass.h
+++ b/src/lyxtextclass.h
@@ -11,7 +11,7 @@
 #define LYXTEXTCLASS_H
 
 #include "lyxlayout.h"
-#include "LString.h"
+#include "support/std_string.h"
 #include "lyxlayout_ptr_fwd.h"
 
 #include "support/types.h"

diff --git a/src/lyxtextclasslist.h b/src/lyxtextclasslist.h
index 5e3ec8e9a95d802cab33ce911a34acca385c70e1..8fa66f2ae11ed3dfb45691e875f76311a4b9fa83 100644 (file)
--- a/src/lyxtextclasslist.h
+++ b/src/lyxtextclasslist.h
@@ -16,7 +16,7 @@
 
 #include <boost/utility.hpp>
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <vector>
 

diff --git a/src/lyxvc.h b/src/lyxvc.h
index 64ad29443ae5e2d79b5aa7338db20949207659b1..207c529de3b812b5e8d3a376450c18bf33f29578 100644 (file)
--- a/src/lyxvc.h
+++ b/src/lyxvc.h
@@ -12,7 +12,7 @@
 #ifndef LYX_VC_H
 #define LYX_VC_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class VCS;
 class Buffer;

diff --git a/src/mathed/command_inset.C b/src/mathed/command_inset.C
index f2fa8e6406d66caf008e1867ae8f70778a04cf96..aee12628e2cc3ec54cd67fc7fd41b46450d68503 100644 (file)
--- a/src/mathed/command_inset.C
+++ b/src/mathed/command_inset.C
@@ -13,7 +13,7 @@
 #include "command_inset.h"
 #include "math_mathmlstream.h"
 #include "funcrequest.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 using std::auto_ptr;
 

diff --git a/src/mathed/formula.C b/src/mathed/formula.C
index 4bf5d1faf11f16c0c5eb0930f65ef3629c0bd6dd..8c6bfd90724efc1ed6086274da5752df5d8200ee 100644 (file)
--- a/src/mathed/formula.C
+++ b/src/mathed/formula.C
@@ -20,7 +20,7 @@
 
 #include "debug.h"
 #include "latexrunparams.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 
 #include "frontends/Painter.h"

diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C
index 1f5f994152561a2d717f4eb865c4fea892362149..c50427587aff15045308bfaa425a397065a12262 100644 (file)
--- a/src/mathed/formulabase.C
+++ b/src/mathed/formulabase.C
@@ -12,7 +12,7 @@
 #include <config.h>
 
 #include "formulabase.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "support/LAssert.h"
 #include "formula.h"
 #include "formulamacro.h"

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index fab1bfa508316bca370b2ddac00fb384d658d267..f15942bc7762c3ade5fc535a5849810ca027fc1d 100644 (file)
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -22,7 +22,7 @@
 #include "frontends/font_metrics.h"
 #include "support/lstrings.h"
 #include "lyxlex.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 using namespace lyx::support;
 

diff --git a/src/mathed/math_arrayinset.C b/src/mathed/math_arrayinset.C
index a84c53653fddd83b988a9a86134d610ce066aa9a..ef1b9b0cbb47563b1c5dde5ba8a704069bf4a8cb 100644 (file)
--- a/src/mathed/math_arrayinset.C
+++ b/src/mathed/math_arrayinset.C
@@ -14,7 +14,7 @@
 #include "math_parser.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 #include <iterator>
 

diff --git a/src/mathed/math_autocorrect.C b/src/mathed/math_autocorrect.C
index 06464b38a7d9dc6dbe70458c9a6ef2029615fed2..75ea1371d79b4d95d92078ebf39b44df142c063b 100644 (file)
--- a/src/mathed/math_autocorrect.C
+++ b/src/mathed/math_autocorrect.C
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "math_autocorrect.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "debug.h"
 #include "support/filetools.h" //  LibFileSearch
 #include "math_data.h"

diff --git a/src/mathed/math_biginset.h b/src/mathed/math_biginset.h
index f5de3d1aa3b3fd68256825604f2690ca514fa984..2e605866473320eb42b866fa84950bc7888a87e2 100644 (file)
--- a/src/mathed/math_biginset.h
+++ b/src/mathed/math_biginset.h
@@ -13,7 +13,7 @@
 #define MATH_BIGINSET_H
 
 #include "math_diminset.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 
 /// Inset for \bigl & Co.

diff --git a/src/mathed/math_binaryopinset.C b/src/mathed/math_binaryopinset.C
index 5b99d411a6229b1ace049cc50b098f51b0d4d3d2..2530086dcf7ebadfa4a852b1ea2abb00b0039de5 100644 (file)
--- a/src/mathed/math_binaryopinset.C
+++ b/src/mathed/math_binaryopinset.C
@@ -13,7 +13,7 @@
 
 #include "math_binaryopinset.h"
 #include "PainterInfo.h"
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
 

diff --git a/src/mathed/math_boxinset.C b/src/mathed/math_boxinset.C
index 67dc6bd89ededce30705b619f9a78aa88e805b9d..624f627792daa7c530742c06f8b07ad31725fd93 100644 (file)
--- a/src/mathed/math_boxinset.C
+++ b/src/mathed/math_boxinset.C
@@ -13,7 +13,7 @@
 #include "math_boxinset.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 using std::auto_ptr;
 

diff --git a/src/mathed/math_boxinset.h b/src/mathed/math_boxinset.h
index 3b4831c44dffd913517deec8e5082eb7980d230b..6ab4d1c7a2bdedde21b5f342940c8162fa9ac4f3 100644 (file)
--- a/src/mathed/math_boxinset.h
+++ b/src/mathed/math_boxinset.h
@@ -13,7 +13,7 @@
 #define MATH_BOXINSET_H
 
 #include "math_nestinset.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 
 class LyXFont;

diff --git a/src/mathed/math_braceinset.C b/src/mathed/math_braceinset.C
index a782a8ca312fa5d3c5d68c1359645366603be82d..e0a6ab586217305f9e04d17bc6457a8319043b1c 100644 (file)
--- a/src/mathed/math_braceinset.C
+++ b/src/mathed/math_braceinset.C
@@ -13,7 +13,7 @@
 #include "math_braceinset.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 using std::max;
 using std::auto_ptr;

diff --git a/src/mathed/math_casesinset.C b/src/mathed/math_casesinset.C
index 050d62e43a18e971497c49cbc520ee3f87e43721..a507cc231ecd0f44c1a49b1b582936e5131b5509 100644 (file)
--- a/src/mathed/math_casesinset.C
+++ b/src/mathed/math_casesinset.C
@@ -14,7 +14,7 @@
 #include "math_mathmlstream.h"
 #include "math_support.h"
 #include "LaTeXFeatures.h"
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 using std::auto_ptr;
 

diff --git a/src/mathed/math_charinset.C b/src/mathed/math_charinset.C
index ab2fb14e72529f3c2a8702b27d8bfe8a621a27ac..47e0d0292daba32d2ab16f63641cdfd132232904 100644 (file)
--- a/src/mathed/math_charinset.C
+++ b/src/mathed/math_charinset.C
@@ -13,7 +13,7 @@
 
 #include "math_charinset.h"
 #include "dimension.h"
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
 #include "textpainter.h"

diff --git a/src/mathed/math_commentinset.C b/src/mathed/math_commentinset.C
index cfe0262eb88ec2d079caaf558cedd5d6ee974d2f..0c7f9b7255518974edab5eb7766bdc763808d352 100644 (file)
--- a/src/mathed/math_commentinset.C
+++ b/src/mathed/math_commentinset.C
@@ -13,7 +13,7 @@
 #include "math_commentinset.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 using std::auto_ptr;
 

diff --git a/src/mathed/math_cursor.C b/src/mathed/math_cursor.C
index 8f7636b357e8cb29e97dfd32c92b5e639c05b032..96fdc1c7d9c7bd956f292ff63797cb143159b7d3 100644 (file)
--- a/src/mathed/math_cursor.C
+++ b/src/mathed/math_cursor.C
@@ -16,7 +16,7 @@
 #include "support/LAssert.h"
 #include "support/limited_stack.h"
 #include "debug.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "math_cursor.h"
 #include "formulabase.h"
 #include "funcrequest.h"

diff --git a/src/mathed/math_cursor.h b/src/mathed/math_cursor.h
index 7bb040e62ec07852cc46c32466b43582b7770ff9..4df0b822d8eec69a7a87ab539c53ad663990070e 100644 (file)
--- a/src/mathed/math_cursor.h
+++ b/src/mathed/math_cursor.h
@@ -16,7 +16,7 @@
 
 #include "math_inset.h"
 #include "math_iterator.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 class InsetFormulaBase;
 class BufferView;

diff --git a/src/mathed/math_decorationinset.C b/src/mathed/math_decorationinset.C
index 55e086241df32e6f780ee7666aa52a3e3be7df9c..e74118f293a34103069dfb8e38bcd1da6074cf16 100644 (file)
--- a/src/mathed/math_decorationinset.C
+++ b/src/mathed/math_decorationinset.C
@@ -16,7 +16,7 @@
 #include "math_parser.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 using std::auto_ptr;
 

diff --git a/src/mathed/math_decorationinset.h b/src/mathed/math_decorationinset.h
index 5a5bbce698bc473850974c50b3d29e02bf6e7b49..6d2a23b66193761d2ac3db5c0445a34913cc2215 100644 (file)
--- a/src/mathed/math_decorationinset.h
+++ b/src/mathed/math_decorationinset.h
@@ -14,7 +14,7 @@
 #define MATH_DECORATIONINSET_H
 
 #include "math_nestinset.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 
 class latexkeys;

diff --git a/src/mathed/math_deliminset.h b/src/mathed/math_deliminset.h
index 9132cef9a83678a43447d31e0be4885ae7dda731..11182dc4314e3a04daf93422cbc5308ab27b0a75 100644 (file)
--- a/src/mathed/math_deliminset.h
+++ b/src/mathed/math_deliminset.h
@@ -14,7 +14,7 @@
 #define MATH_DELIMINSET_H
 
 #include "math_nestinset.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 
 /// A delimiter

diff --git a/src/mathed/math_envinset.C b/src/mathed/math_envinset.C
index 68b2b0303b3ff04f232284197f4bc80335b8f8f7..c5f768bf5fa900e50c4998bf9b76f2579346868b 100644 (file)
--- a/src/mathed/math_envinset.C
+++ b/src/mathed/math_envinset.C
@@ -13,7 +13,7 @@
 #include "math_envinset.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 using std::auto_ptr;
 

diff --git a/src/mathed/math_ertinset.C b/src/mathed/math_ertinset.C
index 45d5d41f471472b448a063541ed17b88fd39abef..d5e5cacbb96c3c51f993a8f854b6dc24eaf25625 100644 (file)
--- a/src/mathed/math_ertinset.C
+++ b/src/mathed/math_ertinset.C
@@ -12,7 +12,7 @@
 
 #include "math_ertinset.h"
 #include "math_mathmlstream.h"
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 using std::auto_ptr;
 

diff --git a/src/mathed/math_extern.C b/src/mathed/math_extern.C
index 60d763ed56da0a9bf7e898a6fdf2e959483a1415..d719c8af69767870abed6abed84d97467e07f6ec 100644 (file)
--- a/src/mathed/math_extern.C
+++ b/src/mathed/math_extern.C
@@ -30,7 +30,7 @@
 #include "math_stringinset.h"
 #include "math_symbolinset.h"
 #include "math_parser.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "debug.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"

diff --git a/src/mathed/math_extern.h b/src/mathed/math_extern.h
index 21989f02112e0e65b0d59811e415339bee95f633..5b844a934b4dec5c2102dad1567274f53e387311 100644 (file)
--- a/src/mathed/math_extern.h
+++ b/src/mathed/math_extern.h
@@ -13,7 +13,7 @@
 #define MATH_EXTERN_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class NormalStream;
 class MapleStream;

diff --git a/src/mathed/math_factory.C b/src/mathed/math_factory.C
index 2036bab309f4a8e8548e035803d4698201718a49..9c78975ef3e0dff7befde15b770998bf12ee0199 100644 (file)
--- a/src/mathed/math_factory.C
+++ b/src/mathed/math_factory.C
@@ -51,7 +51,7 @@
 
 #include "debug.h"
 #include "math_support.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "support/filetools.h" // LibFileSearch
 #include "support/lstrings.h"
 #include "frontends/lyx_gui.h"

diff --git a/src/mathed/math_factory.h b/src/mathed/math_factory.h
index a4389a158b8c344df3130a387b9d829c844e4e56..e25908f75604a26e04cd612f5a40275229e92b03 100644 (file)
--- a/src/mathed/math_factory.h
+++ b/src/mathed/math_factory.h
@@ -13,7 +13,7 @@
 #define MATH_FACTORY_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class MathAtom;
 class MathArray;

diff --git a/src/mathed/math_fontinset.C b/src/mathed/math_fontinset.C
index 24b95bb4c1f02dc90eba6606c775f0d15f48d5b1..79d25a16cb7d4ea9a6679cfd9e7fecace4a5d0a3 100644 (file)
--- a/src/mathed/math_fontinset.C
+++ b/src/mathed/math_fontinset.C
@@ -14,7 +14,7 @@
 #include "math_mathmlstream.h"
 #include "math_parser.h"
 #include "LaTeXFeatures.h"
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 using std::auto_ptr;
 

diff --git a/src/mathed/math_fontoldinset.C b/src/mathed/math_fontoldinset.C
index 84fd74f6d41083bdb140363c847293268c3d1658..59155a49aebce37b4370ab6ded7eab384c87af69 100644 (file)
--- a/src/mathed/math_fontoldinset.C
+++ b/src/mathed/math_fontoldinset.C
@@ -14,7 +14,7 @@
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
 #include "math_parser.h"
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 using std::auto_ptr;
 

diff --git a/src/mathed/math_gridinfo.h b/src/mathed/math_gridinfo.h
index 9d50b531332cb24049b02ce209d3404fd3936227..1950659a4f81747b1ac7cc0df73bae176cd6b0f4 100644 (file)
--- a/src/mathed/math_gridinfo.h
+++ b/src/mathed/math_gridinfo.h
@@ -12,7 +12,7 @@
 #ifndef MATH_GRIDINFO_H
 #define MATH_GRIDINFO_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 struct ColInfo
 {

diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C
index bec0cf3b21fb2f36ac31650cdef467b9b3bedcaa..5d21dfd5d0bd0bba243e400cffbcd6cfd357ca5a 100644 (file)
--- a/src/mathed/math_gridinset.C
+++ b/src/mathed/math_gridinset.C
@@ -16,7 +16,7 @@
 #include "funcrequest.h"
 #include "frontends/Painter.h"
 #include "debug.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 
 #include "insets/mailinset.h"

diff --git a/src/mathed/math_gridinset.h b/src/mathed/math_gridinset.h
index 361e3ec95648b83b91a74bf57c87ddd9d4437ca4..f331000b174673c743f8f7574dd5d5afb1d81c31 100644 (file)
--- a/src/mathed/math_gridinset.h
+++ b/src/mathed/math_gridinset.h
@@ -14,7 +14,7 @@
 
 #include "math_nestinset.h"
 #include "vspace.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 
 /** Gridded math inset base class.

diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C
index 10bff0f49b3b804437334136fa336105475ed642..6a9bb0dfb4de4791da20da5474463b2b33818d34 100644 (file)
--- a/src/mathed/math_hullinset.C
+++ b/src/mathed/math_hullinset.C
@@ -20,7 +20,7 @@
 #include "debug.h"
 #include "textpainter.h"
 #include "funcrequest.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "LaTeXFeatures.h"
 #include "support/LAssert.h"
 

diff --git a/src/mathed/math_inset.h b/src/mathed/math_inset.h
index 0cd16531c428dd3ad11098da929b37aa1973ed32..a4c0751dfba9bccbf34688b872cea69c3538b72b 100644 (file)
--- a/src/mathed/math_inset.h
+++ b/src/mathed/math_inset.h
@@ -13,7 +13,7 @@
 #ifndef MATH_INSET_H
 #define MATH_INSET_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "insets/insetbase.h"
 
 /**

diff --git a/src/mathed/math_kerninset.h b/src/mathed/math_kerninset.h
index e5358ecf3567a7298380986889cbfbb20e248e5f..8d40cf27b31240dd52f950377b8321dd760708dc 100644 (file)
--- a/src/mathed/math_kerninset.h
+++ b/src/mathed/math_kerninset.h
@@ -14,7 +14,7 @@
 
 #include "math_inset.h"
 #include "vspace.h"
-#include "LString.h"
+#include "support/std_string.h"
 #include "math_nestinset.h"
 
 

diff --git a/src/mathed/math_lefteqninset.C b/src/mathed/math_lefteqninset.C
index fb05e5988b61aacf1e941ec11d26dee896b3ffe8..f9a8863de50e423f5e40a5b4e5cbc9d9a3eea059 100644 (file)
--- a/src/mathed/math_lefteqninset.C
+++ b/src/mathed/math_lefteqninset.C
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "math_lefteqninset.h"
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 using std::auto_ptr;
 

diff --git a/src/mathed/math_macro.h b/src/mathed/math_macro.h
index 6d513bec212e86fb6f0767ff9516e85a7b48f9e8..5f356d861a31f8c2d2894ee10ffdd45a80cc1616 100644 (file)
--- a/src/mathed/math_macro.h
+++ b/src/mathed/math_macro.h
@@ -17,7 +17,7 @@
 #include "math_nestinset.h"
 #include "metricsinfo.h"
 #include "math_macroarg.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 class MathMacroTemplate;
 

diff --git a/src/mathed/math_macrotable.h b/src/mathed/math_macrotable.h
index 8a6b191e4e1602ab336af568dc7e29555905c601..d500b74645a26e963844cc3499f98fc022f3215c 100644 (file)
--- a/src/mathed/math_macrotable.h
+++ b/src/mathed/math_macrotable.h
@@ -13,7 +13,7 @@
 #define MATH_MACROTABLE_H
 
 #include <map>
-#include "LString.h"
+#include "support/std_string.h"
 #include "math_atom.h"
 
 

diff --git a/src/mathed/math_macrotemplate.h b/src/mathed/math_macrotemplate.h
index ff91f21450362715e20c4d9c1d00a3e95cc4278b..97441accdd14ce559fb711151b9ee0035674d1ec 100644 (file)
--- a/src/mathed/math_macrotemplate.h
+++ b/src/mathed/math_macrotemplate.h
@@ -14,7 +14,7 @@
 #define MATH_MACROTEMPLATE_H
 
 #include "math_nestinset.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 
 class MathMacro;

diff --git a/src/mathed/math_parinset.C b/src/mathed/math_parinset.C
index 9de32455f1a2d178036be97575124d5adfbd7156..83eb131c3d7bb4c9bcaa798d2ea925299a513cfe 100644 (file)
--- a/src/mathed/math_parinset.C
+++ b/src/mathed/math_parinset.C
@@ -12,7 +12,7 @@
 
 #include "math_parinset.h"
 #include "math_mathmlstream.h"
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 
 MathParInset::MathParInset(MathArray const & ar)

diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C
index 1efd8ec7db9ad6c69975764716cf6ef029797128..0ab499f1b2d4e8ee87e518fb0684e6b6f1e0bbf4 100644 (file)
--- a/src/mathed/math_parser.C
+++ b/src/mathed/math_parser.C
@@ -61,7 +61,7 @@ following hack as starting point to write some macros:
 #include "ref_inset.h"
 
 #include "lyxlex.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "debug.h"
 
 

diff --git a/src/mathed/math_parser.h b/src/mathed/math_parser.h
index b2472a86cf0639aab105a09e0023afaab9cf1439..0d7e49eb1d27dc9ebd58a1cbec6efa58c34963b3 100644 (file)
--- a/src/mathed/math_parser.h
+++ b/src/mathed/math_parser.h
@@ -14,7 +14,7 @@
 #define MATH_PARSER_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class MathAtom;
 class MathArray;

diff --git a/src/mathed/math_sizeinset.C b/src/mathed/math_sizeinset.C
index 0e9e4cca067914ea64eb3332eb997154f4fde267..c965f3e0a979685d6b177ebbd54f98faa8afdd81 100644 (file)
--- a/src/mathed/math_sizeinset.C
+++ b/src/mathed/math_sizeinset.C
@@ -14,7 +14,7 @@
 #include "math_parser.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 using std::atoi;
 using std::auto_ptr;

diff --git a/src/mathed/math_splitinset.h b/src/mathed/math_splitinset.h
index 9320ff37d339254d7d0ade04cad657491c0e73b2..94ab3287c8c41db2a1b0006e42d5c07fe01379a2 100644 (file)
--- a/src/mathed/math_splitinset.h
+++ b/src/mathed/math_splitinset.h
@@ -13,7 +13,7 @@
 #define MATH_SPLITINSET_H
 
 #include "math_gridinset.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 
 class MathSplitInset : public MathGridInset {

diff --git a/src/mathed/math_streamstr.h b/src/mathed/math_streamstr.h
index d5d2c1c4e65a149d15c9e2720e7e3a1577afe9dc..d76b1cb66e20548a6ef8f988dfc0ebd6b3f09923 100644 (file)
--- a/src/mathed/math_streamstr.h
+++ b/src/mathed/math_streamstr.h
@@ -13,7 +13,7 @@
 #define MATH_STREAMSTR_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class WriteStream;
 class NormalStream;

diff --git a/src/mathed/math_substackinset.C b/src/mathed/math_substackinset.C
index 47b4c78d4512c809b34147909aeb8f047cc502d1..08f425e79571cdd931dd56bbc46cfd7e9da2aca9 100644 (file)
--- a/src/mathed/math_substackinset.C
+++ b/src/mathed/math_substackinset.C
@@ -12,7 +12,7 @@
 
 #include "math_substackinset.h"
 #include "math_mathmlstream.h"
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 using std::auto_ptr;
 

diff --git a/src/mathed/math_support.C b/src/mathed/math_support.C
index 056d9ee97eed90d308fde9df22088b6185b70d62..58688a86b1ca8f665ecb46e54038d90ec0d0d8ea 100644 (file)
--- a/src/mathed/math_support.C
+++ b/src/mathed/math_support.C
@@ -18,7 +18,7 @@
 #include "frontends/font_metrics.h"
 #include "frontends/lyx_gui.h"
 #include "debug.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "math_mathmlstream.h"
 
 #include <map>

diff --git a/src/mathed/math_support.h b/src/mathed/math_support.h
index 83997befd348f726c2b5f2cbd69ce87a4ed333cb..af36ac0241ce770a7453c63a8d41bb3de6e8d5d9 100644 (file)
--- a/src/mathed/math_support.h
+++ b/src/mathed/math_support.h
@@ -13,7 +13,7 @@
 #ifndef MATH_SUPPORT_H
 #define MATH_SUPPORT_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class PainterInfo;
 class LyXFont;

diff --git a/src/mathed/math_xarrowinset.h b/src/mathed/math_xarrowinset.h
index 70987f2aea7fbbc8d6a9081682a36944d5eeab8f..e4f636f79686d1b7afbd1f9ce470014a4cbe7f47 100644 (file)
--- a/src/mathed/math_xarrowinset.h
+++ b/src/mathed/math_xarrowinset.h
@@ -13,7 +13,7 @@
 #define MATH_XARROWINSET_H
 
 #include "math_fracbase.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 
 /// Wide arrows like \xrightarrow

diff --git a/src/mathed/textpainter.C b/src/mathed/textpainter.C
index ea58a5abb17f0211cffc8baa7619c394b2834cec..224cca9cec5ab3cb4d80f03a524dfa1de2a52f6c 100644 (file)
--- a/src/mathed/textpainter.C
+++ b/src/mathed/textpainter.C
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "textpainter.h"
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 
 TextPainter::TextPainter(int xmax, int ymax)

diff --git a/src/messages.h b/src/messages.h
index e5c17d8dd3d9a0148425a07194edc417af2ad9f8..1c04d9c73588d05c221eb8c82c7214730013a41f 100644 (file)
--- a/src/messages.h
+++ b/src/messages.h
@@ -11,7 +11,7 @@
 #ifndef MESSAGES_H
 #define MESSAGES_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <boost/scoped_ptr.hpp>
 

diff --git a/src/metricsinfo.h b/src/metricsinfo.h
index 4881cf8ad6de4df6c5419d81bee6c74ec9d13fc1..88fe44aaa380e0b987160ba5b221208908ffbd5e 100644 (file)
--- a/src/metricsinfo.h
+++ b/src/metricsinfo.h
@@ -13,7 +13,7 @@
 #define METRICSINFO_H
 
 #include "lyxfont.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 class Painter;
 class BufferView;

diff --git a/src/paragraph.C b/src/paragraph.C
index 307f65188efd7cdfe8203d3a40829f38e9354f9f..0a6c8bd34d0fdf917434156efd20dbea781e4e87 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -27,7 +27,7 @@
 #include "language.h"
 #include "latexrunparams.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 #include "insets/insetbibitem.h"
 #include "insets/insetoptarg.h"

diff --git a/src/paragraph.h b/src/paragraph.h
index 6f0c26648dcfeef62b8c697e26b92c5959717115..2a8b930534a313e101c64aecfaaa98aa052ef8a1 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -26,7 +26,7 @@
 #include "changes.h"
 #include "RowList.h"
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class Buffer;
 class BufferParams;

diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index af9feebf7d8ebd6c946fe3b9f7f17589b5ea2a97..cc43eac19933a88fcd9bb39165aa2a57c7041471 100644 (file)
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -20,7 +20,7 @@
 #include "encoding.h"
 #include "lyxlex.h"
 #include "factory.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 #include "support/lstrings.h"
 #include "support/LAssert.h"

diff --git a/src/sgml.C b/src/sgml.C
index a8ff48dad040b17a9e658bc063f251b08428dc38..238ad2274bfccf7383a200107fce105bdb046acd 100644 (file)
--- a/src/sgml.C
+++ b/src/sgml.C
@@ -11,7 +11,7 @@
 
 #include <config.h>
 
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 #include "paragraph.h"
 #include "sgml.h"

diff --git a/src/sgml.h b/src/sgml.h
index d3377e77df4c2d5d3caa0688a6210bc840b240b7..332535bc70d0877358a7a1a8653f8bcc3752e78c 100644 (file)
--- a/src/sgml.h
+++ b/src/sgml.h
@@ -15,7 +15,7 @@
 
 #include "paragraph.h"
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <algorithm>
 #include <iosfwd>
 

diff --git a/src/support/DebugStream.h b/src/support/DebugStream.h
index 847d18b6c54ed2b4baf87b16575a502b042d3464..b29039d02ca886cb89580f48230bc62fc4d40197 100644 (file)
--- a/src/support/DebugStream.h
+++ b/src/support/DebugStream.h
@@ -12,7 +12,7 @@
 #ifndef DEBUGSTREAM_H
 #define DEBUGSTREAM_H
 
-#include "LOstream.h"
+#include "std_ostream.h"
 
 #ifdef TEST_DEBUGSTREAM
 #include <string>

diff --git a/src/support/FileInfo.h b/src/support/FileInfo.h
index f31e3f6333d4d563dcc449b215e95396069f2875..f1ca4618c66541497100c1e921210c1ceeb28203 100644 (file)
--- a/src/support/FileInfo.h
+++ b/src/support/FileInfo.h
@@ -18,7 +18,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <boost/utility.hpp>
-#include "LString.h"
+#include "support/std_string.h"
 
 namespace lyx {
 namespace support {

diff --git a/src/support/FileMonitor.h b/src/support/FileMonitor.h
index 4c59c9d5195ef5ad2732988ef5c203f7c161956b..25c2f22400df8b5ea1bdfd9b59617ffe66e06525 100644 (file)
--- a/src/support/FileMonitor.h
+++ b/src/support/FileMonitor.h
@@ -15,7 +15,7 @@
 #ifndef FILEMONITOR_H
 #define FILEMONITOR_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>

diff --git a/src/support/LIstream.h b/src/support/LIstream.h
deleted file mode 100644 (file)
index 74ea6dc..0000000
--- a/src/support/LIstream.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// -*- C++ -*-
-/**
- * \file LIstream.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- */
-
-#ifndef LISTREAM_H
-#define LISTREAM_H
-
-#ifdef HAVE_ISTREAM
-#include <istream>
-#else
-#include <iostream>
-#endif
-
-#endif

diff --git a/src/support/LOstream.h b/src/support/LOstream.h
deleted file mode 100644 (file)
index 56211ad..0000000
--- a/src/support/LOstream.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// -*- C++ -*-
-/**
- * \file LOstream.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- */
-
-#ifndef LOSTREAM_H
-#define LOSTREAM_H
-
-#ifdef HAVE_OSTREAM
-#include <ostream>
-#else
-#include <iostream>
-#endif
-
-#endif

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 04e5acaeb1c82883e987f9068b5b1f0b988a4c16..ae25732d74bac2e55dce97a4e512a3ce7673733d 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -29,10 +29,6 @@ libsupport_la_SOURCES = \
        FileMonitor.C \
        LAssert.C \
        LAssert.h \
-       LIstream.h \
-       LOstream.h \
-       os.C \
-       os.h \
        abort.C \
        atoi.C \
        boost-inst.C \
@@ -62,6 +58,8 @@ libsupport_la_SOURCES = \
        $(LYXSTRING) lyxsum.C \
        mkdir.C \
        nt_defines.h \
+       os.C \
+       os.h \
        os2_defines.h \
        os2_errortable.h \
        path.C \
@@ -74,6 +72,10 @@ libsupport_la_SOURCES = \
        snprintf.h \
        snprintf.c \
        sstream.h \
+       std_istream.h \
+       std_ostream.h \
+       std_sstream.h \
+       std_string.h \
        systemcall.C \
        systemcall.h \
        tempname.C \

diff --git a/src/support/copy.C b/src/support/copy.C
index 6d513216edc61d5d96efda913c42aaaaa172d0e1..306d788cc7ba3750335ded6e89ecd92b3d2aa1d5 100644 (file)
--- a/src/support/copy.C
+++ b/src/support/copy.C
@@ -13,7 +13,7 @@
 #include <fstream>
 
 #include "support/lyxlib.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 using std::ifstream;
 using std::ofstream;

diff --git a/src/support/filename.h b/src/support/filename.h
index feba602a6b3e075378cdd1adcdb1516aaebb4aaf..8e6585761dbece51348377b9de2d8d88fb7ad1c4 100644 (file)
--- a/src/support/filename.h
+++ b/src/support/filename.h
@@ -12,7 +12,7 @@
 #ifndef FILENAME_H
 #define FILENAME_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 
 namespace lyx {

diff --git a/src/support/filetools.C b/src/support/filetools.C
index f87a0cf7e0269952c20e5e87ccb038f3a7c3ad20..e0d333b0967be3a5b44d44926118d53ce8a4eaae 100644 (file)
--- a/src/support/filetools.C
+++ b/src/support/filetools.C
@@ -36,7 +36,7 @@
 #include "lyxlib.h"
 #include "os.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 #include <boost/cregex.hpp>
 #include <cctype>

diff --git a/src/support/filetools.h b/src/support/filetools.h
index ff2a3de2e0ebf58b67e986704664ef62aee9045f..0a857962e04d311380fcbf7f48ae5fa1c251c159 100644 (file)
--- a/src/support/filetools.h
+++ b/src/support/filetools.h
@@ -14,7 +14,7 @@
 
 #include <vector>
 #include <utility>
-#include "LString.h"
+#include "support/std_string.h"
 
 
 namespace lyx {

diff --git a/src/support/forkedcall.h b/src/support/forkedcall.h
index e71cdaeb1af469b4ca6be6cc66e7ca8c606ceac9..8e58485d18e4c8f66c0aed5af98aaee31cce7e52 100644 (file)
--- a/src/support/forkedcall.h
+++ b/src/support/forkedcall.h
@@ -26,7 +26,7 @@
 #ifndef FORKEDCALL_H
 #define FORKEDCALL_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <boost/shared_ptr.hpp>
 #include <boost/signals/signal2.hpp>

diff --git a/src/support/forkedcallqueue.h b/src/support/forkedcallqueue.h
index d06d411b5574cdb1224dd7d7cb2d085ffad0a860..77cea21c55394ac23602318581dd053359670632 100644 (file)
--- a/src/support/forkedcallqueue.h
+++ b/src/support/forkedcallqueue.h
@@ -22,7 +22,7 @@
 
 #include <queue>
 #include <utility>
-#include "LString.h"
+#include "support/std_string.h"
 
 namespace lyx {
 namespace support {

diff --git a/src/support/forkedcontr.h b/src/support/forkedcontr.h
index a6fba628c3ae5b466603ff8135fb3ddc3ebf2a45..f08db8c67519be7eb54cd754a25512210ad6b75d 100644 (file)
--- a/src/support/forkedcontr.h
+++ b/src/support/forkedcontr.h
@@ -16,7 +16,7 @@
 #ifndef FORKEDCONTR_H
 #define FORKEDCONTR_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <boost/signals/signal0.hpp>
 #include <boost/signals/trackable.hpp>

diff --git a/src/support/lstrings.C b/src/support/lstrings.C
index 2654413b382da62b428ed896000b246c524d350f..79464f3123bfd3dd7fafbce2d298e1d5a1d0766c 100644 (file)
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -11,10 +11,10 @@
 
 #include <config.h>
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "lstrings.h"
 #include "LAssert.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "debug.h"
 #include "BoostFormat.h"
 #include "lyxlib.h"

diff --git a/src/support/lstrings.h b/src/support/lstrings.h
index 837658a13d3e18c29f237ea9609ae83c09c503b3..0725ff3f490b21d8a17b80a82f6f14d437d02927 100644 (file)
--- a/src/support/lstrings.h
+++ b/src/support/lstrings.h
@@ -18,7 +18,7 @@
 
 #include <vector>
 
-#include "LString.h"
+#include "support/std_string.h"
 
 namespace lyx {
 namespace support {

diff --git a/src/support/lyxlib.h b/src/support/lyxlib.h
index ecf3289b617159bdae465937cc9fcc45de07a7e5..0eb2bc031f851dbb46a1d7189444aed25c03abce 100644 (file)
--- a/src/support/lyxlib.h
+++ b/src/support/lyxlib.h
@@ -15,7 +15,7 @@
 #ifndef LYX_LIB_H
 #define LYX_LIB_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 namespace lyx {
 namespace support {

diff --git a/src/support/lyxmanip.h b/src/support/lyxmanip.h
index 42f73ec1a09dbfa4f3e43858efdc7c479bc6a8b0..44426fea8c6080f9945d007c0b06c2b0177a79cc 100644 (file)
--- a/src/support/lyxmanip.h
+++ b/src/support/lyxmanip.h
@@ -12,8 +12,8 @@
 #ifndef LYX_MANIP_H
 #define LYX_MANIP_H
 
-#include "LString.h"
-#include "support/LOstream.h"
+#include "support/std_string.h"
+#include "support/std_ostream.h"
 
 ///
 struct NewLineAndDepth_ {

diff --git a/src/support/mkdir.C b/src/support/mkdir.C
index 37fc010e0616fa927662faf8058dbff889e24f23..8119d3db1d6f146bf7fcc485da91935333994393 100644 (file)
--- a/src/support/mkdir.C
+++ b/src/support/mkdir.C
@@ -15,7 +15,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include "lyxlib.h"
 

diff --git a/src/support/os.h b/src/support/os.h
index 06f7a051c723b98663f3bb055e63e81842b1a455..b1bf8799c053b75b1a76dd88fe0a880b37eaac3f 100644 (file)
--- a/src/support/os.h
+++ b/src/support/os.h
@@ -12,7 +12,7 @@
 #ifndef OS_H
 #define OS_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 /// wrap OS specific stuff
 namespace lyx {

diff --git a/src/support/path.h b/src/support/path.h
index 640f2154b9a6b05e48c40002a6605cccb097e2d2..e043e11035356702dcd656d7ad506657557e2635 100644 (file)
--- a/src/support/path.h
+++ b/src/support/path.h
@@ -12,7 +12,7 @@
 #ifndef PATH_H
 #define PATH_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <boost/utility.hpp>
 
 namespace lyx {

diff --git a/src/support/path_defines.h b/src/support/path_defines.h
index c1f83ab0f0889ed83d6c616b182ae42b178605be..db97e81e70610069114eee56adead8277f550e5f 100644 (file)
--- a/src/support/path_defines.h
+++ b/src/support/path_defines.h
@@ -12,7 +12,7 @@
 #ifndef PATH_DEFINES_H
 #define PATH_DEFINES_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 namespace lyx {
 namespace support {

diff --git a/src/support/sstream.h b/src/support/sstream.h
index 0d7620e1e02c152d0c85856a37cb6b4e62a2019c..16c1662643e135cd69feec76fb0885700c62cf7a 100644 (file)
--- a/src/support/sstream.h
+++ b/src/support/sstream.h
@@ -35,7 +35,7 @@ the executable file might be covered by the GNU General Public License. */
 #ifndef SSTREAM_H
 #define SSTREAM_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <iostream>
 #include <streambuf.h>
 

diff --git a/src/support/std_istream.h b/src/support/std_istream.h
new file mode 100644 (file)
index 0000000..f15cef6
--- /dev/null
+++ b/src/support/std_istream.h
@@ -0,0 +1,17 @@
+// -*- C++ -*-
+/**
+ * \file std_istream.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ */
+
+#ifndef STD_ISTREAM_H
+#define STD_ISTREAM_H
+
+#ifdef HAVE_ISTREAM
+#include <istream>
+#else
+#include <iostream>
+#endif
+
+#endif // NOT STD_ISTREAM_H

diff --git a/src/support/std_ostream.h b/src/support/std_ostream.h
new file mode 100644 (file)
index 0000000..f50e61c
--- /dev/null
+++ b/src/support/std_ostream.h
@@ -0,0 +1,17 @@
+// -*- C++ -*-
+/**
+ * \file std_ostream.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ */
+
+#ifndef STD_OSTREAM_H
+#define STD_OSTREAM_H
+
+#ifdef HAVE_OSTREAM
+#include <ostream>
+#else
+#include <iostream>
+#endif
+
+#endif // NOT STD_OSTREAM_H

diff --git a/src/support/std_sstream.h b/src/support/std_sstream.h
new file mode 100644 (file)
index 0000000..b7de97f
--- /dev/null
+++ b/src/support/std_sstream.h
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+/**
+ * \file std_sstream.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 STD_SSTREAM_H
+#define STD_SSTREAM_H
+
+// Since we will include a string header anyway, we'd better do it
+// right now so that <string> is not loaded before lyxstring.h. (JMarc)
+#include "support/std_string.h"
+
+#ifdef HAVE_SSTREAM
+#include <sstream>
+#else
+#include "support/sstream.h"
+#endif
+
+using std::istringstream;
+using std::ostringstream;
+using std::stringstream;
+
+#endif // NOT STD_SSTREAM_H

diff --git a/src/support/std_string.h b/src/support/std_string.h
new file mode 100644 (file)
index 0000000..84cceba
--- /dev/null
+++ b/src/support/std_string.h
@@ -0,0 +1,39 @@
+// -*- C++ -*-
+/**
+ * \file std_string.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 STD_STRING_H
+#define STD_STRING_H
+
+#if 0
+#ifndef _CONFIG_H
+#error The <config.h> header should always be included before std_string.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 std_string.h
+#else
+#define __STRING__
+#endif
+#include "support/lyxstring.h"
+using lyx::string;
+#define STRCONV(STR) STR.c_str()
+#endif
+
+#endif // NOT STD_STRING_H

diff --git a/src/support/systemcall.h b/src/support/systemcall.h
index 4687074d1ae36e63d13bcd016d7393046a5c50f0..cd22bdd8a3502ffcd8766e2d219a9f8e5ae3e9d5 100644 (file)
--- a/src/support/systemcall.h
+++ b/src/support/systemcall.h
@@ -15,7 +15,7 @@
 #ifndef SYSTEMCALL_H
 #define SYSTEMCALL_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 namespace lyx {
 namespace support {

diff --git a/src/support/tempname.C b/src/support/tempname.C
index deeb90cf56dd67cb2e79509dc6c77f471ccaa3be..cffa90f9e37c6b098789e84b0740a8279749074e 100644 (file)
--- a/src/support/tempname.C
+++ b/src/support/tempname.C
@@ -13,7 +13,7 @@
 #include <cstdlib>
 #include <unistd.h>
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "support/lyxlib.h"
 #include "support/filetools.h"
 #include "support/tostr.h"

diff --git a/src/support/tostr.C b/src/support/tostr.C
index 6b065bc48f5e78315f66444029447638f5b7318b..d6ea6f130f8632f298ccd63097d3124ae2139f31 100644 (file)
--- a/src/support/tostr.C
+++ b/src/support/tostr.C
@@ -10,8 +10,8 @@
 
 #include <config.h>
  
-#include "Lsstream.h"
-#include "LString.h"
+#include "support/std_sstream.h"
+#include "support/std_string.h"
 
 
 string const tostr(bool b)

diff --git a/src/support/tostr.h b/src/support/tostr.h
index 931afa3163b689f553268dc42b2344c3f2d646de..34625c07248dd9f2e7235e24d6007b04cf586882 100644 (file)
--- a/src/support/tostr.h
+++ b/src/support/tostr.h
@@ -15,7 +15,7 @@
 #ifndef TOSTR_H
 #define TOSTR_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 // When trying to convert this to a template using std::stringstream,
 // note that this will pull in the whole of <string> in more than 150

diff --git a/src/support/userinfo.h b/src/support/userinfo.h
index 055bc1d0d78fee9c8042b816dbb08dc27516cee2..5812440d9c0bc7b8583f146f2ebc8ed9796d47f9 100644 (file)
--- a/src/support/userinfo.h
+++ b/src/support/userinfo.h
@@ -12,7 +12,7 @@
 #ifndef USERINFO_H
 #define USERINFO_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 namespace lyx {
 namespace support {

diff --git a/src/tabular.C b/src/tabular.C
index ddc87639bf50b25b041327dd1c850c3901959373..26bb0126e318db6e2e7810815e43ce456bd17bf8 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -19,7 +19,7 @@
 
 #include "tabular.h"
 #include "LaTeXFeatures.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "buffer.h"
 #include "debug.h"
 #include "lyxlex.h"

diff --git a/src/tex2lyx/gettext.h b/src/tex2lyx/gettext.h
index 07a9474db464cc972093faeb8bcc60b3ceb16e12..29e75b039c40c4fdba9f081d7c27e72b2567b11b 100644 (file)
--- a/src/tex2lyx/gettext.h
+++ b/src/tex2lyx/gettext.h
@@ -12,7 +12,7 @@
 #ifndef GETTEXT_H
 #define GETTEXT_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 ///
 string const _(string const &);

diff --git a/src/text2.C b/src/text2.C
index c90856b8d6661101facc82799f0cf90227f81553..aa8a4fe64178d999fb6f3171d4408d1ac128346e 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -20,7 +20,7 @@
 #include <config.h>
 
 #include "lyxtext.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "funcrequest.h"
 #include "frontends/LyXView.h"
 #include "undo_funcs.h"

diff --git a/src/text3.C b/src/text3.C
index 5f6b325f1a5a7775e3b4d69b157f42cef6d4251a..685c7fd299d0b37a20faa469951197770c43fea5 100644 (file)
--- a/src/text3.C
+++ b/src/text3.C
@@ -19,7 +19,7 @@
 #include "BufferView.h"
 #include "funcrequest.h"
 #include "lyxrc.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "debug.h"
 #include "buffer.h"
 #include "ParagraphParameters.h"

diff --git a/src/toc.h b/src/toc.h
index e0f10cfa06f7cb0435d95001b2694db70cf47f27..86dc54020ea1216d07a7100a662c6ce0feeb4b11 100644 (file)
--- a/src/toc.h
+++ b/src/toc.h
@@ -13,8 +13,8 @@
 #ifndef TOC_H
 #define TOC_H
 
-#include "support/LOstream.h"
-#include "LString.h"
+#include "support/std_ostream.h"
+#include "support/std_string.h"
 
 #include <map>
 #include <vector>

diff --git a/src/trans.h b/src/trans.h
index f53738ad9ef7a4f5471ac96c162b0a146b0b8b50..a7edae7ce86798cb3feed6431a25441e4b8068f2 100644 (file)
--- a/src/trans.h
+++ b/src/trans.h
@@ -17,7 +17,7 @@
 #include <map>
 
 #include "tex-accent.h"
-#include "LString.h"
+#include "support/std_string.h"
 #include "trans_decl.h"
 
 class LyXLex;

diff --git a/src/trans_decl.h b/src/trans_decl.h
index 86609d94e85c0df8cd04fb2a59b1fc41516dbfc2..57ff760d76985791608063257c3cf7255e85f364 100644 (file)
--- a/src/trans_decl.h
+++ b/src/trans_decl.h
@@ -13,7 +13,7 @@
 #ifndef TRANS_DECL_H
 #define TRANS_DECL_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "tex-accent.h"
 
 #include <list>

diff --git a/src/trans_mgr.h b/src/trans_mgr.h
index 999ff3694a0cfcd9e7896843f43926e7478f737a..7336146b8f72a3f4f427ddf664894cddbc44d6f8 100644 (file)
--- a/src/trans_mgr.h
+++ b/src/trans_mgr.h
@@ -17,7 +17,7 @@
 #include "tex-accent.h"
 #include "trans_decl.h"
 #include "chset.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 class LyXText;
 class Trans;

diff --git a/src/vc-backend.h b/src/vc-backend.h
index 46dfddb7e30f1bf47043d2b82248b9f971a4a08e..74bd9dfe229006177bb731fce76add687d8a0ec1 100644 (file)
--- a/src/vc-backend.h
+++ b/src/vc-backend.h
@@ -12,7 +12,7 @@
 #ifndef VC_BACKEND_H
 #define VC_BACKEND_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class Buffer;
 

diff --git a/src/vspace.h b/src/vspace.h
index 99d85d0102716929e508831b11c6e8f0ed4988c6..99a92d341763e924aa9aed01e472c2ed5958f1bb 100644 (file)
--- a/src/vspace.h
+++ b/src/vspace.h
@@ -14,7 +14,7 @@
 
 #include "lyxgluelength.h"
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class BufferParams;
 class BufferView;