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

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 {

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"
 

src/Bullet.h

@@ -13,7 +13,7 @@
 #ifndef BULLET_H
 #define BULLET_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 ///
 class Bullet {

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.

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;

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>
 
 ///

src/FloatList.h

@@ -14,7 +14,7 @@
 
 #include <map>
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class Floating;
 

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.

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>
 
 /**

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>
 

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"
 

src/LaTeXFeatures.h

@@ -15,7 +15,7 @@
 
 #include "support/types.h"
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <set>
 #include <list>

src/LyXAction.h

@@ -15,7 +15,7 @@
 
 #include "lfuns.h"
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <boost/utility.hpp>
 #include <map>
 

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 \

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>
 

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"
 

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"
 

src/Sectioning.h

@@ -14,7 +14,7 @@
 
 #include <map>
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "lyxfont.h"
 
 ///

src/Spacing.C

@@ -11,7 +11,7 @@
 
 #include <config.h>
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "Spacing.h"
 
 using std::ios;

src/Spacing.h

@@ -14,7 +14,7 @@
 
 #include <iosfwd>
 
-#include "LString.h"
+#include "support/std_string.h"
 
 ///
 class Spacing {

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;

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>

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

src/ToolbarBackend.h

@@ -16,7 +16,7 @@
 #include <vector>
 #include <algorithm>
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class LyXLex;
 

src/Variables.h

@@ -13,7 +13,7 @@
 #ifndef VARIABLES_H
 #define VARIABLES_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <map>
 
 

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").

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;

src/author.h

@@ -15,7 +15,7 @@
 #include <map>
 #include <iosfwd>
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class Author {
 public:

src/box.C

@@ -14,7 +14,7 @@
 
 #include "box.h"
 
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 using std::ostream;
 

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"

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"
 

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;

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>
 

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"

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"

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"
 

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;

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 {

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"

src/counters.h

@@ -15,7 +15,7 @@
 #ifndef COUNTERS_H
 #define COUNTERS_H
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <map>
 
 

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.

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>

src/errorlist.h

@@ -12,7 +12,7 @@
 #ifndef ERRORLIST_H
 #define ERRORLIST_H
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <vector>
 

src/exporter.h

@@ -14,7 +14,7 @@
 #define EXPORTER_H
 
 #include <vector>
-#include "LString.h"
+#include "support/std_string.h"
 
 class Buffer;
 class Format;

src/format.h

@@ -13,7 +13,7 @@
 #define FORMAT_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <vector>
 

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,

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>

src/frontends/FileDialog.h

@@ -18,7 +18,7 @@
 
 #include "lfuns.h"
 
-#include "LString.h"
+#include "support/std_string.h"
 
 /**
  * \class FileDialog

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>
 
 /**

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>

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

src/frontends/Painter.h

@@ -14,7 +14,7 @@
 #define PAINTER_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "LColor.h"
 
 class LyXFont;

src/frontends/Toolbar.h

@@ -13,7 +13,7 @@
 #define TOOLBAR_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 #include "ToolbarBackend.h"
 
 class LyXView;

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>
 

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>
 
 

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

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"

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>
 

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>

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>
 

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;
 

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.
  */

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"

src/frontends/controllers/ControlPrint.h

@@ -16,7 +16,7 @@
 
 #include "ControlDialog_impl.h"
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class PrinterParams;
 

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.
  */

src/frontends/controllers/ControlSendto.h

@@ -14,7 +14,7 @@
 
 
 #include "ControlDialog_impl.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <vector>
 

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;

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>
 

src/frontends/controllers/Kernel.h

@@ -13,7 +13,7 @@
 #define KERNEL_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 
 
 class Buffer;

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>
 

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"

src/frontends/controllers/biblio.h

@@ -13,7 +13,7 @@
 #define BIBLIOHELPERS_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 #include <map>
 #include <vector>
 

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>
 

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

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>
 

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;
 

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"

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>

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"
 

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>

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

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

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"

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;

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;

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;
 

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
 {

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
 {

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>

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;

src/frontends/guiapi.h

@@ -13,7 +13,7 @@
 #define GUIAPI_H
 
 
-#include "LString.h"
+#include "support/std_string.h"
 
 class Dialogs;
 

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>

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>

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;
 

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"

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>
 

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;

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"

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;

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>