diff --git a/src/BranchList.h b/src/BranchList.h index 3b6b2554fe..e284aa43d0 100644 --- 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 class Branch { diff --git a/src/BufferView.h b/src/BufferView.h index 029c139c38..2172c101ca 100644 --- 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 a0ac36c773..184e8e9764 100644 --- 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 7ebb157245..39c67316b1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2003-09-05 Angus Leeming + + 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 * sgml.h: ensure that the header file can be compiled stand-alone. diff --git a/src/Chktex.h b/src/Chktex.h index a73478974f..aa8311501d 100644 --- 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 f850779726..94cc3abd91 100644 --- 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 /// diff --git a/src/FloatList.h b/src/FloatList.h index ac9d832c61..2b6082d240 100644 --- a/src/FloatList.h +++ b/src/FloatList.h @@ -14,7 +14,7 @@ #include -#include "LString.h" +#include "support/std_string.h" class Floating; diff --git a/src/Floating.h b/src/Floating.h index 372bda9774..e3687e83ac 100644 --- 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 99e8c90efd..3d267e3f91 100644 --- 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 /** diff --git a/src/LaTeX.h b/src/LaTeX.h index 751d01e98c..148f700088 100644 --- 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 #include diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C index 5cb855eb7e..61dd5ea3b3 100644 --- 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 0f05c6f178..d882bc4013 100644 --- 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 #include diff --git a/src/LyXAction.h b/src/LyXAction.h index 5d7c88ede6..d1892d8737 100644 --- a/src/LyXAction.h +++ b/src/LyXAction.h @@ -15,7 +15,7 @@ #include "lfuns.h" -#include "LString.h" +#include "support/std_string.h" #include #include diff --git a/src/Makefile.am b/src/Makefile.am index 649144df95..cae0980625 100644 --- 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 4bb8fd0e72..f6746e08bb 100644 --- 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 diff --git a/src/ParagraphParameters.C b/src/ParagraphParameters.C index fef6980389..a3ef977cb4 100644 --- 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 aef9e38e7b..fcf25eb66d 100644 --- 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 b3bdd63c97..3e89caa85f 100644 --- a/src/Sectioning.h +++ b/src/Sectioning.h @@ -14,7 +14,7 @@ #include -#include "LString.h" +#include "support/std_string.h" #include "lyxfont.h" /// diff --git a/src/Spacing.C b/src/Spacing.C index 10d45e1382..91172a4576 100644 --- a/src/Spacing.C +++ b/src/Spacing.C @@ -11,7 +11,7 @@ #include -#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 cab4269732..5c51bb49f4 100644 --- a/src/Spacing.h +++ b/src/Spacing.h @@ -14,7 +14,7 @@ #include -#include "LString.h" +#include "support/std_string.h" /// class Spacing { diff --git a/src/SpellBase.h b/src/SpellBase.h index 4fdb68a80a..c0b6508f20 100644 --- 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 fcb6caebf2..eea20a7ffa 100644 --- 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 #include diff --git a/src/Thesaurus.h b/src/Thesaurus.h index c8a9afb521..f92f2e2510 100644 --- a/src/Thesaurus.h +++ b/src/Thesaurus.h @@ -15,7 +15,7 @@ #include #include -#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 946cf0fb91..b202b94930 100644 --- a/src/ToolbarBackend.h +++ b/src/ToolbarBackend.h @@ -16,7 +16,7 @@ #include #include -#include "LString.h" +#include "support/std_string.h" class LyXLex; diff --git a/src/Variables.h b/src/Variables.h index d8fa99086f..b73b63a156 100644 --- 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 diff --git a/src/WordLangTuple.h b/src/WordLangTuple.h index 22ac67aec2..e0a1d8eed4 100644 --- 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 41dbd65770..a8eae33e0d 100644 --- 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 b06b9611e9..a928bc8d1a 100644 --- a/src/author.h +++ b/src/author.h @@ -15,7 +15,7 @@ #include #include -#include "LString.h" +#include "support/std_string.h" class Author { public: diff --git a/src/box.C b/src/box.C index af520569dc..eda92d751a 100644 --- 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 3fc6db9729..748c7be27e 100644 --- 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 dd668983e4..5676fb23c2 100644 --- 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 e6fb52dc71..a09c44684e 100644 --- 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 798ae9d4ad..b7ca0cf59e 100644 --- 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 diff --git a/src/bufferparams.C b/src/bufferparams.C index 12414719e8..d2b1ab5846 100644 --- 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 aafc6c56e6..83e62ffb8e 100644 --- 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 bda1550be6..d2a945e8fb 100644 --- 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 9e67bf69f1..1bf167bd9b 100644 --- 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 ebdbdbfe60..550139236e 100644 --- a/src/chset.h +++ b/src/chset.h @@ -16,7 +16,7 @@ #include #include -#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 b0d99cbe15..3d6341c652 100644 --- 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 d7bf25654f..5b9d5323d2 100644 --- 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 diff --git a/src/debug.h b/src/debug.h index 7d8ee4b8b2..edfabb5f16 100644 --- a/src/debug.h +++ b/src/debug.h @@ -15,7 +15,7 @@ #include -#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 51d105ca25..9bfd8948c1 100644 --- 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 diff --git a/src/errorlist.h b/src/errorlist.h index e9023f2203..33e57c4b3a 100644 --- 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 diff --git a/src/exporter.h b/src/exporter.h index 629d7f473f..02afbfcfca 100644 --- a/src/exporter.h +++ b/src/exporter.h @@ -14,7 +14,7 @@ #define EXPORTER_H #include -#include "LString.h" +#include "support/std_string.h" class Buffer; class Format; diff --git a/src/format.h b/src/format.h index f95224bab4..e960f602a9 100644 --- a/src/format.h +++ b/src/format.h @@ -13,7 +13,7 @@ #define FORMAT_H -#include "LString.h" +#include "support/std_string.h" #include diff --git a/src/frontends/Alert_pimpl.h b/src/frontends/Alert_pimpl.h index d53cb93bcf..8be61575f2 100644 --- 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 4febef832c..988e606e03 100644 --- 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 #include diff --git a/src/frontends/FileDialog.h b/src/frontends/FileDialog.h index 4ee3aa68f0..bc2ce49d3e 100644 --- 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 e9e3eac1c0..5a8b1b867a 100644 --- 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 /** diff --git a/src/frontends/LyXView.h b/src/frontends/LyXView.h index 1db93a3772..4c9ee9051a 100644 --- 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 #include diff --git a/src/frontends/Menubar.h b/src/frontends/Menubar.h index 9e6df7f8ee..996ae1ed8e 100644 --- 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 3b3f7e153f..95abeb23fa 100644 --- 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 c698dd8a28..2b12c88465 100644 --- 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 33ae12be6b..4b63c73392 100644 --- 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 #include diff --git a/src/frontends/controllers/ButtonController.h b/src/frontends/controllers/ButtonController.h index b85386b86c..3c0e96f4b8 100644 --- 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 diff --git a/src/frontends/controllers/ButtonPolicies.h b/src/frontends/controllers/ButtonPolicies.h index fb34463e7e..564f4d7de4 100644 --- a/src/frontends/controllers/ButtonPolicies.h +++ b/src/frontends/controllers/ButtonPolicies.h @@ -19,7 +19,7 @@ #include #include -#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 b75e724064..179f12c647 100644 --- 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 b7ca16dd39..4cbf30721e 100644 --- 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 diff --git a/src/frontends/controllers/ControlDocument.h b/src/frontends/controllers/ControlDocument.h index 4cac6307f2..6b2e3ac592 100644 --- a/src/frontends/controllers/ControlDocument.h +++ b/src/frontends/controllers/ControlDocument.h @@ -15,7 +15,7 @@ #include #include "ControlDialog_impl.h" -#include "LString.h" +#include "support/std_string.h" #include "bufferparams.h" #include diff --git a/src/frontends/controllers/ControlForks.h b/src/frontends/controllers/ControlForks.h index 6fe57c03e2..0752a06204 100644 --- 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 diff --git a/src/frontends/controllers/ControlParagraph.C b/src/frontends/controllers/ControlParagraph.C index 901b768511..512c6fef35 100644 --- 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 20d3e1f966..97f822a744 100644 --- 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 bd5bf94d5c..581a81bdb2 100644 --- 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 738bbdb389..e6119c68a9 100644 --- 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 0bbcd8f53d..595b8ce359 100644 --- 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 13d58eed1d..6f4cc60bb0 100644 --- 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 diff --git a/src/frontends/controllers/ControlSpellchecker.h b/src/frontends/controllers/ControlSpellchecker.h index 67446820e3..4e87d437b1 100644 --- a/src/frontends/controllers/ControlSpellchecker.h +++ b/src/frontends/controllers/ControlSpellchecker.h @@ -15,7 +15,7 @@ #include #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 8b7b256f1e..84b40f65ca 100644 --- 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 #include diff --git a/src/frontends/controllers/Kernel.h b/src/frontends/controllers/Kernel.h index 9e35603ef2..6022e390bf 100644 --- 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 1a111908c7..203f88e98c 100644 --- 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 diff --git a/src/frontends/controllers/biblio.C b/src/frontends/controllers/biblio.C index b700805e5b..f541cfd053 100644 --- 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 0f04cc47ca..1694ab93a5 100644 --- 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 #include diff --git a/src/frontends/controllers/frnt_lang.h b/src/frontends/controllers/frnt_lang.h index b0b5faf9f3..ffff790236 100644 --- 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 #include diff --git a/src/frontends/controllers/helper_funcs.h b/src/frontends/controllers/helper_funcs.h index fc63f62485..c20fa8a635 100644 --- 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 // pair #include // pair diff --git a/src/frontends/controllers/tex_helpers.h b/src/frontends/controllers/tex_helpers.h index 0e97bda2ad..3132a7da4a 100644 --- 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 #include diff --git a/src/frontends/font_metrics.h b/src/frontends/font_metrics.h index d873b02b51..ffd0c17378 100644 --- 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 24bdb27f0c..9c69961fc4 100644 --- a/src/frontends/gnome/GAbout.C +++ b/src/frontends/gnome/GAbout.C @@ -12,7 +12,7 @@ #include #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 0bed070c9f..556e883d26 100644 --- 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 #include #include diff --git a/src/frontends/gtk/FileDialogPrivate.C b/src/frontends/gtk/FileDialogPrivate.C index 7dc3479f62..b473fcf389 100644 --- a/src/frontends/gtk/FileDialogPrivate.C +++ b/src/frontends/gtk/FileDialogPrivate.C @@ -11,7 +11,7 @@ #include #include -#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 feb99c9f38..51a1071f72 100644 --- 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 diff --git a/src/frontends/gtk/GLyXKeySym.h b/src/frontends/gtk/GLyXKeySym.h index 3d11aa90f0..980a40d6d5 100644 --- 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 33f8cae015..baf978c1a1 100644 --- 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 8b621c0b9b..7d580fcaca 100644 --- a/src/frontends/gtk/GPainter.C +++ b/src/frontends/gtk/GPainter.C @@ -12,7 +12,7 @@ #include #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 073f124f39..0dcffe51b5 100644 --- a/src/frontends/gtk/GPainter.h +++ b/src/frontends/gtk/GPainter.h @@ -17,7 +17,7 @@ #include #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 9b32c1ffb4..de78f03e57 100644 --- 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 4b525a18b1..b236bdce0c 100644 --- 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 7cbc8d24ec..0cd8fdf867 100644 --- a/src/frontends/gtk/GToolbar.h +++ b/src/frontends/gtk/GToolbar.h @@ -15,7 +15,7 @@ #include #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 4914cf4adc..ebe72cc40a 100644 --- 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 3f190d6b5d..0b0bbb54f8 100644 --- 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 #include #include diff --git a/src/frontends/gtk/xftFontLoader.h b/src/frontends/gtk/xftFontLoader.h index 986e894cf7..4ff0dfad73 100644 --- 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 class GWorkArea; diff --git a/src/frontends/guiapi.h b/src/frontends/guiapi.h index a4b3cc05be..a6d2fd067d 100644 --- 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 5e2b653797..2e768400b6 100644 --- 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 diff --git a/src/frontends/qt2/BulletsModule.h b/src/frontends/qt2/BulletsModule.h index de6279e09d..cc9cb920fe 100644 --- 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 #include "Bullet.h" #include diff --git a/src/frontends/qt2/FileDialog_private.h b/src/frontends/qt2/FileDialog_private.h index 48783fa511..573e42b3fd 100644 --- a/src/frontends/qt2/FileDialog_private.h +++ b/src/frontends/qt2/FileDialog_private.h @@ -15,7 +15,7 @@ #include "frontends/FileDialog.h" #include -#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 9e5789dc2b..191542d595 100644 --- 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 6f21251723..e119993793 100644 --- 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 diff --git a/src/frontends/qt2/QDelimiterDialog.h b/src/frontends/qt2/QDelimiterDialog.h index 2392d31f69..7f03f14da3 100644 --- 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 024d9b5f6d..1b97f5a382 100644 --- 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 74d1489813..6534d23f87 100644 --- 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 class LyXView; diff --git a/src/frontends/qt2/QLPainter.h b/src/frontends/qt2/QLPainter.h index b71ce94fdc..45afb461c1 100644 --- 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 diff --git a/src/frontends/qt2/QLPopupMenu.h b/src/frontends/qt2/QLPopupMenu.h index 6095554f51..3438992bb2 100644 --- a/src/frontends/qt2/QLPopupMenu.h +++ b/src/frontends/qt2/QLPopupMenu.h @@ -15,7 +15,7 @@ #include -#include "LString.h" +#include "support/std_string.h" #include diff --git a/src/frontends/qt2/QLog.C b/src/frontends/qt2/QLog.C index 8a3496524a..ce55736dfd 100644 --- 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 #include diff --git a/src/frontends/qt2/QLyXKeySym.h b/src/frontends/qt2/QLyXKeySym.h index fba0f282c1..9c666b98b8 100644 --- 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 diff --git a/src/frontends/qt2/QMathDialog.h b/src/frontends/qt2/QMathDialog.h index 4e4ffc1615..47e0b1c476 100644 --- 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 264dcb8479..ba11f8baac 100644 --- 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 28691aaf67..4ef7424af2 100644 --- 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 class ControlParagraph; diff --git a/src/frontends/qt2/QPrefs.C b/src/frontends/qt2/QPrefs.C index 967e0adf80..895dde11cc 100644 --- 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 #include "ControlPrefs.h" diff --git a/src/frontends/qt2/QRef.h b/src/frontends/qt2/QRef.h index 5c90cb9cdd..d837dff84d 100644 --- a/src/frontends/qt2/QRef.h +++ b/src/frontends/qt2/QRef.h @@ -15,7 +15,7 @@ #include "QDialogView.h" #include -#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 9e497deed2..e0fe998f7c 100644 --- 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 da4884bbbf..bb40427d09 100644 --- a/src/frontends/qt2/QVCLog.C +++ b/src/frontends/qt2/QVCLog.C @@ -11,7 +11,7 @@ #include -#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 5c59144ba9..379433bbe3 100644 --- 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 diff --git a/src/frontends/qt2/iconpalette.h b/src/frontends/qt2/iconpalette.h index bc2e5c3276..2b8d572d4f 100644 --- a/src/frontends/qt2/iconpalette.h +++ b/src/frontends/qt2/iconpalette.h @@ -14,7 +14,7 @@ #include -#include "LString.h" +#include "support/std_string.h" #include #include diff --git a/src/frontends/qt2/panelstack.h b/src/frontends/qt2/panelstack.h index 10bd840766..8045d9a79a 100644 --- 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 diff --git a/src/frontends/qt2/qlkey.h b/src/frontends/qt2/qlkey.h index 214042cef9..77995364db 100644 --- a/src/frontends/qt2/qlkey.h +++ b/src/frontends/qt2/qlkey.h @@ -14,7 +14,7 @@ #include -#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 769e2004b6..c350cdbb6c 100644 --- 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 diff --git a/src/frontends/xforms/Color.C b/src/frontends/xforms/Color.C index 75493e7013..93ad4dd0e3 100644 --- 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 namespace support = lyx::support; diff --git a/src/frontends/xforms/Color.h b/src/frontends/xforms/Color.h index f820f853ea..86a8de2881 100644 --- 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 aaffd121f7..51b0a850a6 100644 --- 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 diff --git a/src/frontends/xforms/FormAboutlyx.C b/src/frontends/xforms/FormAboutlyx.C index 906a66c170..8ee877ff11 100644 --- 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 248cd114a2..a09c0edefc 100644 --- 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 #include // for Pixmap diff --git a/src/frontends/xforms/FormColorpicker.h b/src/frontends/xforms/FormColorpicker.h index 6c2b37643b..316fa79bbc 100644 --- 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 #include // for Pixmap diff --git a/src/frontends/xforms/FormDialogView.h b/src/frontends/xforms/FormDialogView.h index 8cd0b8b4f3..9e02c17f12 100644 --- 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 #include // for Pixmap diff --git a/src/frontends/xforms/FormFiledialog.h b/src/frontends/xforms/FormFiledialog.h index 5e5054bd83..ae0b2cdaeb 100644 --- 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 916126f60e..2415e74902 100644 --- 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 b84027102e..ad88e0c194 100644 --- 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 6ac73101a8..08f7b94b86 100644 --- 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 49502f8e2f..8edfdbf11d 100644 --- 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 #include diff --git a/src/frontends/xforms/XFormsMenubar.h b/src/frontends/xforms/XFormsMenubar.h index 848e384c55..bfc06fcf16 100644 --- 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 diff --git a/src/frontends/xforms/XLyXKeySym.h b/src/frontends/xforms/XLyXKeySym.h index e7d02df032..ed7dfb6032 100644 --- 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 #include "frontends/LyXKeySym.h" diff --git a/src/frontends/xforms/XMiniBuffer.h b/src/frontends/xforms/XMiniBuffer.h index c029fcafa2..00b6936b46 100644 --- 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 #include #include diff --git a/src/frontends/xforms/XPainter.h b/src/frontends/xforms/XPainter.h index 58a70bff95..c98bb75772 100644 --- 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 diff --git a/src/frontends/xforms/forms/Makefile.am b/src/frontends/xforms/forms/Makefile.am index 1d3ea7aab6..8a835f6b8b 100644 --- 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 52aa7643c4..d925e07f3f 100644 --- 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 "|" string string const scex(string const &); diff --git a/src/frontends/xforms/lyx_gui.C b/src/frontends/xforms/lyx_gui.C index 95b752e9b9..9500ef95cc 100644 --- a/src/frontends/xforms/lyx_gui.C +++ b/src/frontends/xforms/lyx_gui.C @@ -38,7 +38,7 @@ #include -#include "Lsstream.h" +#include "support/std_sstream.h" #include #include diff --git a/src/frontends/xforms/xfont_loader.h b/src/frontends/xforms/xfont_loader.h index 2abe6a8fcb..77c2eb98d3 100644 --- a/src/frontends/xforms/xfont_loader.h +++ b/src/frontends/xforms/xfont_loader.h @@ -15,7 +15,7 @@ #include #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 bf1970f1af..e8e911f4c4 100644 --- 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 2cc835e533..dc59d7bdd7 100644 --- 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 #include diff --git a/src/funcrequest.C b/src/funcrequest.C index 81fdaf7ad7..24e2ce6be9 100644 --- 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 ee4c7d1d3a..5ebe6fa9d1 100644 --- 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 daeb9ce5e7..be41aef8dc 100644 --- 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 9956aa47cf..4a8477cbf9 100644 --- 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 #include diff --git a/src/graphics/GraphicsCache.h b/src/graphics/GraphicsCache.h index 78170fb5b5..41427e07b3 100644 --- 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 #include #include diff --git a/src/graphics/GraphicsCacheItem.h b/src/graphics/GraphicsCacheItem.h index 28b7f3af02..c95d45c05f 100644 --- 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 #include diff --git a/src/graphics/GraphicsConverter.C b/src/graphics/GraphicsConverter.C index 2f4a25487a..5ac8f7bd95 100644 --- a/src/graphics/GraphicsConverter.C +++ b/src/graphics/GraphicsConverter.C @@ -24,7 +24,7 @@ #include -#include "Lsstream.h" +#include "support/std_sstream.h" #include namespace support = lyx::support; diff --git a/src/graphics/GraphicsConverter.h b/src/graphics/GraphicsConverter.h index 1515620378..282730bfb3 100644 --- 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 #include #include diff --git a/src/graphics/GraphicsImage.h b/src/graphics/GraphicsImage.h index ad0c37f9b2..ec39bc1b5a 100644 --- 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 #include diff --git a/src/graphics/GraphicsLoader.h b/src/graphics/GraphicsLoader.h index cd8414f3c2..5da61930ad 100644 --- 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 #include diff --git a/src/graphics/GraphicsParams.C b/src/graphics/GraphicsParams.C index e5d88f09b9..91f54a0916 100644 --- 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 d7cb003857..9759643ccb 100644 --- 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 dc6a05bfd6..2dfe4cba71 100644 --- 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 0c431fcc15..1289fde12f 100644 --- 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 class InsetOld; diff --git a/src/graphics/PreviewLoader.C b/src/graphics/PreviewLoader.C index b8192c0c94..decb447369 100644 --- a/src/graphics/PreviewLoader.C +++ b/src/graphics/PreviewLoader.C @@ -30,7 +30,7 @@ #include -#include "Lsstream.h" +#include "support/std_sstream.h" #include #include diff --git a/src/graphics/PreviewLoader.h b/src/graphics/PreviewLoader.h index 8558a5fbcf..345e72c721 100644 --- 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 #include #include diff --git a/src/graphics/PreviewedInset.h b/src/graphics/PreviewedInset.h index 3e51613b08..31c6691faa 100644 --- 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 #include diff --git a/src/graphics/Previews.h b/src/graphics/Previews.h index 1f9430d984..3e2cbc0304 100644 --- 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 #include diff --git a/src/importer.h b/src/importer.h index 4eca7c06f9..610112a8c6 100644 --- a/src/importer.h +++ b/src/importer.h @@ -15,7 +15,7 @@ #define IMPORTER_H #include -#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 a10de636a8..5b6ddf0529 100644 --- a/src/insets/ExternalTemplate.h +++ b/src/insets/ExternalTemplate.h @@ -15,7 +15,7 @@ #include #include -#include "LString.h" +#include "support/std_string.h" #include class LyXLex; diff --git a/src/insets/insetbase.h b/src/insets/insetbase.h index b2cd718a35..f12a6af89e 100644 --- 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 #include diff --git a/src/insets/insetbranch.C b/src/insets/insetbranch.C index dba6f36932..6836dd7aaa 100644 --- 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 6b384cacfb..b202a22618 100644 --- 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 dd0224e931..8408b75e05 100644 --- 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 4eaf406538..e5186a9cf2 100644 --- 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 diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C index 981f314e05..664d1a8035 100644 --- 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 ee84b58304..076dbaffe0 100644 --- 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 #include diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C index 962012700f..420c600594 100644 --- 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 446834239f..62fb053f1a 100644 --- 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 d9a3f3ba3c..64b653fd40 100644 --- 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 c7dd3a74ca..3d614f76d5 100644 --- 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 38cfe9d56f..f06b16b709 100644 --- a/src/insets/insetinclude.C +++ b/src/insets/insetinclude.C @@ -37,7 +37,7 @@ #include -#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 c209f37915..4b49eec77f 100644 --- 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 2b20ada5d4..bcabf905dd 100644 --- 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 d06fa37f8f..d5ed64da41 100644 --- 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 7207a4f205..675dbdf61a 100644 --- 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 e249d5b2e4..bc50881028 100644 --- 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 e8c0fc829e..267ff8121a 100644 --- 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 cddd3e237f..73a02165c3 100644 --- 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 6f42d17d80..66a59ad41e 100644 --- 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 7e2f71b43e..372c42efb1 100644 --- 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 fa6477ec6d..1add1fcd55 100644 --- 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 fb4bcbdcd4..7d93135b7f 100644 --- 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 baf8877a55..21267234a1 100644 --- 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 c492e727c1..7a927220d5 100644 --- 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 9351c483d1..0180c84b1e 100644 --- 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 f2a9cd1260..cef9fd59e5 100644 --- 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 2c46672c9f..9cbf3c2972 100644 --- 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 class kb_keymap; diff --git a/src/language.h b/src/language.h index 7a3db0510e..1293778c58 100644 --- a/src/language.h +++ b/src/language.h @@ -16,7 +16,7 @@ #define LANGUAGE_H #include -#include "LString.h" +#include "support/std_string.h" class Encoding; diff --git a/src/lastfiles.h b/src/lastfiles.h index b453f25b71..a2faf5486c 100644 --- a/src/lastfiles.h +++ b/src/lastfiles.h @@ -14,7 +14,7 @@ #include -#include "LString.h" +#include "support/std_string.h" #include /** The latest documents loaded. diff --git a/src/lengthcommon.h b/src/lengthcommon.h index 491e036cd8..765816ca3e 100644 --- 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 42d4ed605d..8bd7bc0060 100644 --- 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 af5386d7ce..3996640014 100644 --- 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 #include diff --git a/src/lyx_sty.h b/src/lyx_sty.h index 45987b0b11..892332ce68 100644 --- 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 04a242f235..1bf5fcbd96 100644 --- 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 cb7dfc930a..9a66df7b21 100644 --- 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 635cab2824..6baefa7ebb 100644 --- a/src/lyxfont.h +++ b/src/lyxfont.h @@ -17,7 +17,7 @@ #include -#include "LString.h" +#include "support/std_string.h" #include "LColor.h" class LyXLex; diff --git a/src/lyxfunc.C b/src/lyxfunc.C index 60a5be79ae..1f6b7c98cf 100644 --- 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 696f98f9db..788b6f9ddf 100644 --- 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 diff --git a/src/lyxgluelength.C b/src/lyxgluelength.C index 9656b6ebaf..a32bc6f775 100644 --- 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 ea7bfb62a7..31adcf6213 100644 --- 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 661d7fb6bf..e709ffb23d 100644 --- 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 e9c0cf880e..48cea2f418 100644 --- 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 7ff6629f02..01b6d3286f 100644 --- 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 32c5883443..77babdab04 100644 --- a/src/lyxlex.h +++ b/src/lyxlex.h @@ -19,7 +19,7 @@ #include -#include "LString.h" +#include "support/std_string.h" #include /// diff --git a/src/lyxserver.h b/src/lyxserver.h index 636ef28556..e7ea2f3902 100644 --- 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 diff --git a/src/lyxtextclass.h b/src/lyxtextclass.h index 485b8290b3..9c8b289fac 100644 --- 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 5e3ec8e9a9..8fa66f2ae1 100644 --- a/src/lyxtextclasslist.h +++ b/src/lyxtextclasslist.h @@ -16,7 +16,7 @@ #include -#include "LString.h" +#include "support/std_string.h" #include diff --git a/src/lyxvc.h b/src/lyxvc.h index 64ad29443a..207c529de3 100644 --- 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 f2fa8e6406..aee12628e2 100644 --- 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 4bf5d1faf1..8c6bfd9072 100644 --- 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 1f5f994152..c50427587a 100644 --- a/src/mathed/formulabase.C +++ b/src/mathed/formulabase.C @@ -12,7 +12,7 @@ #include #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 fab1bfa508..f15942bc77 100644 --- 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 a84c53653f..ef1b9b0cbb 100644 --- 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 diff --git a/src/mathed/math_autocorrect.C b/src/mathed/math_autocorrect.C index 06464b38a7..75ea1371d7 100644 --- a/src/mathed/math_autocorrect.C +++ b/src/mathed/math_autocorrect.C @@ -11,7 +11,7 @@ #include #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 f5de3d1aa3..2e60586647 100644 --- 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 5b99d411a6..2530086dcf 100644 --- 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 67dc6bd89e..624f627792 100644 --- 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 3b4831c44d..6ab4d1c7a2 100644 --- 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 a782a8ca31..e0a6ab5862 100644 --- 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 050d62e43a..a507cc231e 100644 --- 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 ab2fb14e72..47e0d0292d 100644 --- 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 cfe0262eb8..0c7f9b7255 100644 --- 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 8f7636b357..96fdc1c7d9 100644 --- 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 7bb040e62e..4df0b822d8 100644 --- 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 55e086241d..e74118f293 100644 --- 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 5a5bbce698..6d2a23b661 100644 --- 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 9132cef9a8..11182dc431 100644 --- 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 68b2b0303b..c5f768bf5f 100644 --- 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 45d5d41f47..d5e5cacbb9 100644 --- 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 60d763ed56..d719c8af69 100644 --- 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 21989f0211..5b844a934b 100644 --- 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 2036bab309..9c78975ef3 100644 --- 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 a4389a158b..e25908f756 100644 --- 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 24b95bb4c1..79d25a16cb 100644 --- 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 84fd74f6d4..59155a49ae 100644 --- 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 9d50b53133..1950659a4f 100644 --- 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 bec0cf3b21..5d21dfd5d0 100644 --- 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 361e3ec956..f331000b17 100644 --- 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 10bff0f49b..6a9bb0dfb4 100644 --- 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 0cd16531c4..a4c0751dfb 100644 --- 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 e5358ecf35..8d40cf27b3 100644 --- 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 fb05e5988b..f9a8863de5 100644 --- a/src/mathed/math_lefteqninset.C +++ b/src/mathed/math_lefteqninset.C @@ -11,7 +11,7 @@ #include #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 6d513bec21..5f356d861a 100644 --- 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 8a6b191e4e..d500b74645 100644 --- a/src/mathed/math_macrotable.h +++ b/src/mathed/math_macrotable.h @@ -13,7 +13,7 @@ #define MATH_MACROTABLE_H #include -#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 ff91f21450..97441accdd 100644 --- 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 9de32455f1..83eb131c3d 100644 --- 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 1efd8ec7db..0ab499f1b2 100644 --- 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 b2472a86cf..0d7e49eb1d 100644 --- 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 0e9e4cca06..c965f3e0a9 100644 --- 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 9320ff37d3..94ab3287c8 100644 --- 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 d5d2c1c4e6..d76b1cb66e 100644 --- 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 47b4c78d45..08f425e795 100644 --- 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 056d9ee97e..58688a86b1 100644 --- 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 diff --git a/src/mathed/math_support.h b/src/mathed/math_support.h index 83997befd3..af36ac0241 100644 --- 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 70987f2aea..e4f636f796 100644 --- 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 ea58a5abb1..224cca9cec 100644 --- a/src/mathed/textpainter.C +++ b/src/mathed/textpainter.C @@ -11,7 +11,7 @@ #include #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 e5c17d8dd3..1c04d9c735 100644 --- 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 diff --git a/src/metricsinfo.h b/src/metricsinfo.h index 4881cf8ad6..88fe44aaa3 100644 --- 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 307f65188e..0a6c8bd34d 100644 --- 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 6f0c26648d..2a8b930534 100644 --- 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 af9feebf7d..cc43eac199 100644 --- 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 a8ff48dad0..238ad2274b 100644 --- a/src/sgml.C +++ b/src/sgml.C @@ -11,7 +11,7 @@ #include -#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 d3377e77df..332535bc70 100644 --- a/src/sgml.h +++ b/src/sgml.h @@ -15,7 +15,7 @@ #include "paragraph.h" -#include "LString.h" +#include "support/std_string.h" #include #include diff --git a/src/support/DebugStream.h b/src/support/DebugStream.h index 847d18b6c5..b29039d02c 100644 --- 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 diff --git a/src/support/FileInfo.h b/src/support/FileInfo.h index f31e3f6333..f1ca4618c6 100644 --- a/src/support/FileInfo.h +++ b/src/support/FileInfo.h @@ -18,7 +18,7 @@ #include #include #include -#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 4c59c9d519..25c2f22400 100644 --- 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 #include diff --git a/src/support/Makefile.am b/src/support/Makefile.am index 04e5acaeb1..ae25732d74 100644 --- 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 6d513216ed..306d788cc7 100644 --- a/src/support/copy.C +++ b/src/support/copy.C @@ -13,7 +13,7 @@ #include #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 feba602a6b..8e6585761d 100644 --- 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 f87a0cf7e0..e0d333b096 100644 --- 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 #include diff --git a/src/support/filetools.h b/src/support/filetools.h index ff2a3de2e0..0a857962e0 100644 --- a/src/support/filetools.h +++ b/src/support/filetools.h @@ -14,7 +14,7 @@ #include #include -#include "LString.h" +#include "support/std_string.h" namespace lyx { diff --git a/src/support/forkedcall.h b/src/support/forkedcall.h index e71cdaeb1a..8e58485d18 100644 --- 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 #include diff --git a/src/support/forkedcallqueue.h b/src/support/forkedcallqueue.h index d06d411b55..77cea21c55 100644 --- a/src/support/forkedcallqueue.h +++ b/src/support/forkedcallqueue.h @@ -22,7 +22,7 @@ #include #include -#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 a6fba628c3..f08db8c675 100644 --- 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 #include diff --git a/src/support/lstrings.C b/src/support/lstrings.C index 2654413b38..79464f3123 100644 --- a/src/support/lstrings.C +++ b/src/support/lstrings.C @@ -11,10 +11,10 @@ #include -#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 837658a13d..0725ff3f49 100644 --- a/src/support/lstrings.h +++ b/src/support/lstrings.h @@ -18,7 +18,7 @@ #include -#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 ecf3289b61..0eb2bc031f 100644 --- 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 42f73ec1a0..44426fea8c 100644 --- 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 37fc010e06..8119d3db1d 100644 --- a/src/support/mkdir.C +++ b/src/support/mkdir.C @@ -15,7 +15,7 @@ #include #include -#include "LString.h" +#include "support/std_string.h" #include "lyxlib.h" diff --git a/src/support/os.h b/src/support/os.h index 06f7a051c7..b1bf8799c0 100644 --- 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 640f2154b9..e043e11035 100644 --- 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 namespace lyx { diff --git a/src/support/path_defines.h b/src/support/path_defines.h index c1f83ab0f0..db97e81e70 100644 --- 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 0d7620e1e0..16c1662643 100644 --- 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 #include diff --git a/src/support/LIstream.h b/src/support/std_istream.h similarity index 68% rename from src/support/LIstream.h rename to src/support/std_istream.h index 74ea6dc1fe..f15cef6401 100644 --- a/src/support/LIstream.h +++ b/src/support/std_istream.h @@ -1,12 +1,12 @@ // -*- C++ -*- /** - * \file LIstream.h + * \file std_istream.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 +#ifndef STD_ISTREAM_H +#define STD_ISTREAM_H #ifdef HAVE_ISTREAM #include @@ -14,4 +14,4 @@ #include #endif -#endif +#endif // NOT STD_ISTREAM_H diff --git a/src/support/LOstream.h b/src/support/std_ostream.h similarity index 68% rename from src/support/LOstream.h rename to src/support/std_ostream.h index 56211ad2e5..f50e61c2ef 100644 --- a/src/support/LOstream.h +++ b/src/support/std_ostream.h @@ -1,12 +1,12 @@ // -*- C++ -*- /** - * \file LOstream.h + * \file std_ostream.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 +#ifndef STD_OSTREAM_H +#define STD_OSTREAM_H #ifdef HAVE_OSTREAM #include @@ -14,4 +14,4 @@ #include #endif -#endif +#endif // NOT STD_OSTREAM_H diff --git a/src/Lsstream.h b/src/support/std_sstream.h similarity index 81% rename from src/Lsstream.h rename to src/support/std_sstream.h index bac4ce5fba..b7de97f86a 100644 --- a/src/Lsstream.h +++ b/src/support/std_sstream.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file Lsstream.h + * \file std_sstream.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,12 +10,12 @@ * Full author contact details are available in file CREDITS. */ -#ifndef LSSTREAM_H -#define LSSTREAM_H +#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 is not loaded before lyxstring.h. (JMarc) -#include "LString.h" +#include "support/std_string.h" #ifdef HAVE_SSTREAM #include @@ -27,4 +27,4 @@ using std::istringstream; using std::ostringstream; using std::stringstream; -#endif +#endif // NOT STD_SSTREAM_H diff --git a/src/LString.h b/src/support/std_string.h similarity index 70% rename from src/LString.h rename to src/support/std_string.h index 64f0242ab6..84ccebad3d 100644 --- a/src/LString.h +++ b/src/support/std_string.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file LString.h + * \file std_string.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,12 +10,12 @@ * Full author contact details are available in file CREDITS. */ -#ifndef LSTRING_H -#define LSTRING_H +#ifndef STD_STRING_H +#define STD_STRING_H #if 0 #ifndef _CONFIG_H -#error The header should always be included before LString.h +#error The header should always be included before std_string.h #endif #endif @@ -27,7 +27,7 @@ using std::string; #else #ifdef __STRING__ -#error The header has been included before LString.h +#error The header has been included before std_string.h #else #define __STRING__ #endif @@ -36,4 +36,4 @@ using lyx::string; #define STRCONV(STR) STR.c_str() #endif -#endif +#endif // NOT STD_STRING_H diff --git a/src/support/systemcall.h b/src/support/systemcall.h index 4687074d1a..cd22bdd8a3 100644 --- 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 deeb90cf56..cffa90f9e3 100644 --- a/src/support/tempname.C +++ b/src/support/tempname.C @@ -13,7 +13,7 @@ #include #include -#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 6b065bc48f..d6ea6f130f 100644 --- a/src/support/tostr.C +++ b/src/support/tostr.C @@ -10,8 +10,8 @@ #include -#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 931afa3163..34625c0724 100644 --- 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 in more than 150 diff --git a/src/support/userinfo.h b/src/support/userinfo.h index 055bc1d0d7..5812440d9c 100644 --- 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 ddc87639bf..26bb0126e3 100644 --- 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 07a9474db4..29e75b039c 100644 --- 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 c90856b8d6..aa8a4fe641 100644 --- a/src/text2.C +++ b/src/text2.C @@ -20,7 +20,7 @@ #include #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 5f6b325f1a..685c7fd299 100644 --- 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 e0f10cfa06..86dc54020e 100644 --- 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 #include diff --git a/src/trans.h b/src/trans.h index f53738ad9e..a7edae7ce8 100644 --- a/src/trans.h +++ b/src/trans.h @@ -17,7 +17,7 @@ #include #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 86609d94e8..57ff760d76 100644 --- 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 diff --git a/src/trans_mgr.h b/src/trans_mgr.h index 999ff3694a..7336146b8f 100644 --- 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 46dfddb7e3..74bd9dfe22 100644 --- 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 99d85d0102..99a92d3417 100644 --- 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;