From f239801ae38551ada215494694dfe47bb4e610be Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Fri, 5 Sep 2003 18:02:24 +0000 Subject: [PATCH] Changes due to the removal of using directives from support/std_sstream.h. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7686 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 5 +++++ src/LaTeXFeatures.C | 1 + src/ParagraphParameters.C | 3 +++ src/Spacing.C | 3 +++ src/buffer.C | 1 + src/bufferparams.C | 2 ++ src/bufferview_funcs.C | 3 +++ src/counters.C | 1 + src/frontends/controllers/ControlAboutlyx.C | 2 +- src/frontends/controllers/ControlParagraph.C | 4 ++++ src/frontends/controllers/biblio.C | 1 + src/frontends/gnome/GAbout.C | 3 +++ src/frontends/gnome/lyx_gui.C | 1 + src/frontends/gtk/GAboutlyx.C | 3 +++ src/frontends/gtk/lyx_gui.C | 3 +++ src/frontends/qt2/QAbout.C | 5 +++-- src/frontends/qt2/QLog.C | 1 + src/frontends/qt2/QMathMatrixDialog.C | 2 ++ src/frontends/qt2/QVCLog.C | 5 +++-- src/frontends/xforms/Color.C | 2 ++ src/frontends/xforms/FormAboutlyx.C | 3 +++ src/frontends/xforms/FormMathsDelim.C | 2 ++ src/frontends/xforms/FormMathsMatrix.C | 2 ++ src/frontends/xforms/FormVCLog.C | 2 +- src/frontends/xforms/lyx_gui.C | 1 + src/funcrequest.C | 1 + src/graphics/GraphicsConverter.C | 1 + src/graphics/GraphicsParams.C | 1 + src/graphics/PreviewLoader.C | 1 + src/insets/insetbranch.C | 2 ++ src/insets/insetcaption.C | 1 + src/insets/insetcommand.C | 2 ++ src/insets/insetexternal.C | 2 ++ src/insets/insetfloat.C | 2 ++ src/insets/insetgraphics.C | 2 ++ src/insets/insetinclude.C | 2 ++ src/insets/insetminipage.C | 2 ++ src/insets/insetnote.C | 2 ++ src/insets/insettabular.C | 2 ++ src/insets/insetwrap.C | 2 ++ src/lyxfont.C | 1 + src/lyxfunc.C | 1 + src/lyxgluelength.C | 2 ++ src/lyxlength.C | 3 ++- src/mathed/command_inset.C | 1 + src/mathed/formula.C | 1 + src/mathed/formulabase.C | 2 ++ src/mathed/formulamacro.C | 1 + src/mathed/math_autocorrect.C | 1 + src/mathed/math_diminset.C | 2 ++ src/mathed/math_extern.C | 1 + src/mathed/math_factory.C | 1 + src/mathed/math_gridinset.C | 2 ++ src/mathed/math_hullinset.C | 2 ++ src/mathed/math_parser.C | 1 + src/mathed/math_support.C | 1 + src/paragraph.C | 1 + src/paragraph_funcs.C | 1 + src/support/ChangeLog | 7 +++++++ src/support/filetools.C | 1 + src/support/std_sstream.h | 4 ---- src/support/tostr.C | 2 ++ src/tabular.C | 1 + src/text2.C | 1 + src/text3.C | 1 + 65 files changed, 117 insertions(+), 11 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 39c67316b1..9c6a3df65c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2003-09-05 Angus Leeming + + Changes most place everywhere due to the removal of using directives + from support/std_sstream.h. + 2003-09-05 Angus Leeming Replace LString.h with support/std_string.h, diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C index 61dd5ea3b3..49b88bf85f 100644 --- a/src/LaTeXFeatures.C +++ b/src/LaTeXFeatures.C @@ -35,6 +35,7 @@ using std::list; using std::set; using std::find; using std::ostream; +using std::ostringstream; LaTeXFeatures::LaTeXFeatures(BufferParams const & p) diff --git a/src/ParagraphParameters.C b/src/ParagraphParameters.C index a3ef977cb4..7c1142bb38 100644 --- a/src/ParagraphParameters.C +++ b/src/ParagraphParameters.C @@ -31,7 +31,10 @@ using namespace lyx::support; +using std::istringstream; using std::ostream; +using std::ostringstream; + // Initialize static member var. ShareContainer ParagraphParameters::container; diff --git a/src/Spacing.C b/src/Spacing.C index 91172a4576..40e10c4247 100644 --- a/src/Spacing.C +++ b/src/Spacing.C @@ -15,7 +15,10 @@ #include "Spacing.h" using std::ios; +using std::istringstream; using std::ostream; +using std::ostringstream; + string const Spacing::spacing_string[] = {"single", "onehalf", "double", "other"}; diff --git a/src/buffer.C b/src/buffer.C index 748c7be27e..0f18ec3c11 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -71,6 +71,7 @@ using std::pow; #endif using std::ostream; +using std::ostringstream; using std::ofstream; using std::ifstream; using std::fstream; diff --git a/src/bufferparams.C b/src/bufferparams.C index d2b1ab5846..2c402a7075 100644 --- a/src/bufferparams.C +++ b/src/bufferparams.C @@ -34,7 +34,9 @@ using namespace lyx::support; +using std::istringstream; using std::ostream; +using std::ostringstream; using std::endl; using std::pair; diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C index d2a945e8fb..5cd7213330 100644 --- a/src/bufferview_funcs.C +++ b/src/bufferview_funcs.C @@ -32,6 +32,9 @@ using namespace lyx::support; +using std::istringstream; +using std::ostringstream; + namespace { diff --git a/src/counters.C b/src/counters.C index 3d6341c652..6e7c5f1608 100644 --- a/src/counters.C +++ b/src/counters.C @@ -21,6 +21,7 @@ using namespace lyx::support; using std::endl; +using std::ostringstream; using std::vector; diff --git a/src/frontends/controllers/ControlAboutlyx.C b/src/frontends/controllers/ControlAboutlyx.C index 179f12c647..7d25c60410 100644 --- a/src/frontends/controllers/ControlAboutlyx.C +++ b/src/frontends/controllers/ControlAboutlyx.C @@ -11,7 +11,6 @@ #include - #include "ControlAboutlyx.h" #include "gettext.h" #include "version.h" @@ -25,6 +24,7 @@ using namespace lyx::support; using std::ostream; +using std::ostringstream; ControlAboutlyx::ControlAboutlyx(Dialog & parent) diff --git a/src/frontends/controllers/ControlParagraph.C b/src/frontends/controllers/ControlParagraph.C index 512c6fef35..8cf516372b 100644 --- a/src/frontends/controllers/ControlParagraph.C +++ b/src/frontends/controllers/ControlParagraph.C @@ -21,6 +21,10 @@ using namespace lyx::support; +using std::istringstream; +using std::ostringstream; + + ControlParagraph::ControlParagraph(Dialog & parent) : Dialog::Controller(parent), ininset_(false) {} diff --git a/src/frontends/controllers/biblio.C b/src/frontends/controllers/biblio.C index f541cfd053..e77ba9557e 100644 --- a/src/frontends/controllers/biblio.C +++ b/src/frontends/controllers/biblio.C @@ -23,6 +23,7 @@ using namespace lyx::support; +using std::ostringstream; using std::vector; diff --git a/src/frontends/gnome/GAbout.C b/src/frontends/gnome/GAbout.C index 9c69961fc4..d91d751942 100644 --- a/src/frontends/gnome/GAbout.C +++ b/src/frontends/gnome/GAbout.C @@ -21,6 +21,9 @@ #include #include +using std::istringstream; + + GAbout::GAbout() : GnomeCB("GAbout") {} diff --git a/src/frontends/gnome/lyx_gui.C b/src/frontends/gnome/lyx_gui.C index 556e883d26..9add4fe4a9 100644 --- a/src/frontends/gnome/lyx_gui.C +++ b/src/frontends/gnome/lyx_gui.C @@ -51,6 +51,7 @@ using std::exit; #endif +using std::ostringstream; using std::vector; using std::hex; using std::dec; diff --git a/src/frontends/gtk/GAboutlyx.C b/src/frontends/gtk/GAboutlyx.C index 4c1216d9fd..df6bf84ffc 100644 --- a/src/frontends/gtk/GAboutlyx.C +++ b/src/frontends/gtk/GAboutlyx.C @@ -19,6 +19,9 @@ #include "support/filetools.h" #include "version.h" +using std::ostringstream; + + namespace { enum TranslateState {NORMAL, BEGIN, IN_AT, IN_BOLD, IN_ITALIC}; diff --git a/src/frontends/gtk/lyx_gui.C b/src/frontends/gtk/lyx_gui.C index 0b0bbb54f8..fd32a4d5ab 100644 --- a/src/frontends/gtk/lyx_gui.C +++ b/src/frontends/gtk/lyx_gui.C @@ -51,6 +51,9 @@ #include "xformsImage.h" #include "xforms_helpers.h" +using std::ostringstream; + + extern BufferList bufferlist; // FIXME: wrong place ! diff --git a/src/frontends/qt2/QAbout.C b/src/frontends/qt2/QAbout.C index 191542d595..81ea3d993e 100644 --- a/src/frontends/qt2/QAbout.C +++ b/src/frontends/qt2/QAbout.C @@ -10,7 +10,6 @@ #include - #include "support/lstrings.h" #include "support/std_sstream.h" #include "qt_helpers.h" @@ -28,10 +27,12 @@ using namespace lyx::support; using std::getline; +using std::istringstream; +using std::ostringstream; + typedef QController > base_class; - QAbout::QAbout(Dialog & parent) : base_class(parent, _("About LyX")) { diff --git a/src/frontends/qt2/QLog.C b/src/frontends/qt2/QLog.C index ce55736dfd..cb03fde8c6 100644 --- a/src/frontends/qt2/QLog.C +++ b/src/frontends/qt2/QLog.C @@ -26,6 +26,7 @@ using std::ifstream; using std::getline; +using std::ostringstream; typedef QController > base_class; diff --git a/src/frontends/qt2/QMathMatrixDialog.C b/src/frontends/qt2/QMathMatrixDialog.C index ba11f8baac..b3566c1e49 100644 --- a/src/frontends/qt2/QMathMatrixDialog.C +++ b/src/frontends/qt2/QMathMatrixDialog.C @@ -24,6 +24,8 @@ #include #include "emptytable.h" +using std::ostringstream; + static char h_align_str[80] = "c"; static char v_align_c[] = "tcb"; diff --git a/src/frontends/qt2/QVCLog.C b/src/frontends/qt2/QVCLog.C index bb40427d09..07b769cd10 100644 --- a/src/frontends/qt2/QVCLog.C +++ b/src/frontends/qt2/QVCLog.C @@ -10,7 +10,6 @@ #include - #include "support/std_sstream.h" #include "qt_helpers.h" #include "support/lstrings.h" @@ -26,9 +25,11 @@ using namespace lyx::support; -typedef QController > base_class; +using std::ostringstream; +typedef QController > base_class; + QVCLog::QVCLog(Dialog & parent) : base_class(parent, _("LyX: Version Control Log")) { diff --git a/src/frontends/xforms/Color.C b/src/frontends/xforms/Color.C index 93ad4dd0e3..145241f833 100644 --- a/src/frontends/xforms/Color.C +++ b/src/frontends/xforms/Color.C @@ -28,6 +28,8 @@ using std::floor; using std::max; using std::min; using std::setw; +using std::istringstream; +using std::ostringstream; namespace { diff --git a/src/frontends/xforms/FormAboutlyx.C b/src/frontends/xforms/FormAboutlyx.C index 8ee877ff11..963a5db4a2 100644 --- a/src/frontends/xforms/FormAboutlyx.C +++ b/src/frontends/xforms/FormAboutlyx.C @@ -23,6 +23,9 @@ #include "lyx_forms.h" +using std::ostringstream; + + namespace { #if FL_VERSION == 0 || (FL_REVISION == 0 && FL_FIXLEVEL < 2) diff --git a/src/frontends/xforms/FormMathsDelim.C b/src/frontends/xforms/FormMathsDelim.C index 2415e74902..b00040dfbb 100644 --- a/src/frontends/xforms/FormMathsDelim.C +++ b/src/frontends/xforms/FormMathsDelim.C @@ -24,6 +24,8 @@ #include "support/std_sstream.h" +using std::ostringstream; + #include "delim.xbm" #include "delim0.xpm" #include "delim1.xpm" diff --git a/src/frontends/xforms/FormMathsMatrix.C b/src/frontends/xforms/FormMathsMatrix.C index ad88e0c194..0ed67fb302 100644 --- a/src/frontends/xforms/FormMathsMatrix.C +++ b/src/frontends/xforms/FormMathsMatrix.C @@ -30,6 +30,8 @@ using namespace lyx::support; +using std::ostringstream; + #ifndef CXX_GLOBAL_CSTD using std::strlen; #endif diff --git a/src/frontends/xforms/FormVCLog.C b/src/frontends/xforms/FormVCLog.C index 08f7b94b86..87c1a9e606 100644 --- a/src/frontends/xforms/FormVCLog.C +++ b/src/frontends/xforms/FormVCLog.C @@ -30,7 +30,7 @@ void FormVCLog::update() { fl_clear_browser(dialog_->browser); - ostringstream ss; + std::ostringstream ss; controller().getVCLogFile(ss); fl_add_browser_line(dialog_->browser, ss.str().c_str()); diff --git a/src/frontends/xforms/lyx_gui.C b/src/frontends/xforms/lyx_gui.C index 9500ef95cc..c15dc8dcf6 100644 --- a/src/frontends/xforms/lyx_gui.C +++ b/src/frontends/xforms/lyx_gui.C @@ -54,6 +54,7 @@ using std::hex; using std::setbase; using std::setfill; using std::setw; +using std::ostringstream; using std::vector; diff --git a/src/funcrequest.C b/src/funcrequest.C index 24e2ce6be9..6382dc8695 100644 --- a/src/funcrequest.C +++ b/src/funcrequest.C @@ -18,6 +18,7 @@ #include "support/std_sstream.h" +using std::istringstream; using std::vector; using std::getline; using std::endl; diff --git a/src/graphics/GraphicsConverter.C b/src/graphics/GraphicsConverter.C index 5ac8f7bd95..23a552084d 100644 --- a/src/graphics/GraphicsConverter.C +++ b/src/graphics/GraphicsConverter.C @@ -43,6 +43,7 @@ using support::unlink; using std::endl; using std::ostream; +using std::ostringstream; namespace lyx { diff --git a/src/graphics/GraphicsParams.C b/src/graphics/GraphicsParams.C index 91f54a0916..1a13a5bae2 100644 --- a/src/graphics/GraphicsParams.C +++ b/src/graphics/GraphicsParams.C @@ -17,6 +17,7 @@ #include "support/std_sstream.h" using std::abs; +using std::istringstream; namespace lyx { diff --git a/src/graphics/PreviewLoader.C b/src/graphics/PreviewLoader.C index decb447369..e73480b268 100644 --- a/src/graphics/PreviewLoader.C +++ b/src/graphics/PreviewLoader.C @@ -51,6 +51,7 @@ using std::map; using std::ifstream; using std::ofstream; using std::ostream; +using std::ostringstream; using std::pair; using std::vector; diff --git a/src/insets/insetbranch.C b/src/insets/insetbranch.C index 6836dd7aaa..c473b9f8f1 100644 --- a/src/insets/insetbranch.C +++ b/src/insets/insetbranch.C @@ -21,7 +21,9 @@ #include "support/std_sstream.h" using std::auto_ptr; +using std::istringstream; using std::ostream; +using std::ostringstream; void InsetBranch::init() diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C index b202a22618..1cfd264c91 100644 --- a/src/insets/insetcaption.C +++ b/src/insets/insetcaption.C @@ -33,6 +33,7 @@ using namespace lyx::support; using std::endl; using std::ostream; +using std::ostringstream; InsetCaption::InsetCaption(BufferParams const & bp) diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C index 8408b75e05..ac5fc69b0d 100644 --- a/src/insets/insetcommand.C +++ b/src/insets/insetcommand.C @@ -20,7 +20,9 @@ #include "support/std_sstream.h" +using std::istringstream; using std::ostream; +using std::ostringstream; InsetCommand::InsetCommand(InsetCommandParams const & p) diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C index 664d1a8035..2607db4ff8 100644 --- a/src/insets/insetexternal.C +++ b/src/insets/insetexternal.C @@ -43,7 +43,9 @@ namespace support = lyx::support; using std::endl; using std::auto_ptr; +using std::istringstream; using std::ostream; +using std::ostringstream; namespace lyx { diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C index 420c600594..1072e9f95e 100644 --- a/src/insets/insetfloat.C +++ b/src/insets/insetfloat.C @@ -33,7 +33,9 @@ using namespace lyx::support; using std::endl; using std::auto_ptr; +using std::istringstream; using std::ostream; +using std::ostringstream; // With this inset it will be possible to support the latex package diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C index 64b653fd40..5b5a5cad3e 100644 --- a/src/insets/insetgraphics.C +++ b/src/insets/insetgraphics.C @@ -85,7 +85,9 @@ using namespace lyx::support; using std::endl; using std::auto_ptr; +using std::istringstream; using std::ostream; +using std::ostringstream; namespace { diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C index f06b16b709..ab646a64bf 100644 --- a/src/insets/insetinclude.C +++ b/src/insets/insetinclude.C @@ -43,7 +43,9 @@ using namespace lyx::support; using std::endl; using std::auto_ptr; +using std::istringstream; using std::ostream; +using std::ostringstream; using std::pair; using std::vector; diff --git a/src/insets/insetminipage.C b/src/insets/insetminipage.C index 675dbdf61a..9d9abf6fcf 100644 --- a/src/insets/insetminipage.C +++ b/src/insets/insetminipage.C @@ -24,7 +24,9 @@ using std::endl; using std::auto_ptr; +using std::istringstream; using std::ostream; +using std::ostringstream; // Some information about Minipages in LaTeX: diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C index bc50881028..5f8d44bdea 100644 --- a/src/insets/insetnote.C +++ b/src/insets/insetnote.C @@ -24,7 +24,9 @@ #include "support/std_sstream.h" using std::auto_ptr; +using std::istringstream; using std::ostream; +using std::ostringstream; void InsetNote::init() diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C index 66a59ad41e..b6b5f741cf 100644 --- a/src/insets/insettabular.C +++ b/src/insets/insettabular.C @@ -44,7 +44,9 @@ using std::max; using std::swap; using std::auto_ptr; using std::ifstream; +using std::istringstream; using std::ostream; +using std::ostringstream; using std::vector; diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C index 21267234a1..a7acd816f6 100644 --- a/src/insets/insetwrap.C +++ b/src/insets/insetwrap.C @@ -28,7 +28,9 @@ using std::endl; using std::auto_ptr; +using std::istringstream; using std::ostream; +using std::ostringstream; namespace { diff --git a/src/lyxfont.C b/src/lyxfont.C index 9a66df7b21..cc551c7f1d 100644 --- a/src/lyxfont.C +++ b/src/lyxfont.C @@ -27,6 +27,7 @@ using namespace lyx::support; using std::ostream; +using std::ostringstream; using std::endl; #ifndef CXX_GLOBAL_CSTD diff --git a/src/lyxfunc.C b/src/lyxfunc.C index 1f6b7c98cf..f76005cf13 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -74,6 +74,7 @@ using std::pair; using std::make_pair; using std::endl; using std::find_if; +using std::istringstream; using std::vector; using std::transform; using std::back_inserter; diff --git a/src/lyxgluelength.C b/src/lyxgluelength.C index a32bc6f775..4ca88f4ed2 100644 --- a/src/lyxgluelength.C +++ b/src/lyxgluelength.C @@ -17,6 +17,8 @@ #include "support/std_sstream.h" +using std::ostringstream; + LyXGlueLength::LyXGlueLength(LyXLength const & len) : len_(len) diff --git a/src/lyxlength.C b/src/lyxlength.C index 48cea2f418..3a68ee2311 100644 --- a/src/lyxlength.C +++ b/src/lyxlength.C @@ -22,8 +22,9 @@ #include "support/std_sstream.h" - using std::abs; +using std::ostringstream; + LyXLength::LyXLength() : val_(0), unit_(LyXLength::UNIT_NONE) diff --git a/src/mathed/command_inset.C b/src/mathed/command_inset.C index aee12628e2..cbd82038a9 100644 --- a/src/mathed/command_inset.C +++ b/src/mathed/command_inset.C @@ -16,6 +16,7 @@ #include "support/std_sstream.h" using std::auto_ptr; +using std::ostringstream; CommandInset::CommandInset(string const & name) diff --git a/src/mathed/formula.C b/src/mathed/formula.C index 8c6bfd9072..89cb9acfbb 100644 --- a/src/mathed/formula.C +++ b/src/mathed/formula.C @@ -30,6 +30,7 @@ using std::ostream; +using std::ostringstream; using std::vector; using std::auto_ptr; using std::endl; diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C index c50427587a..7a5dcaf42f 100644 --- a/src/mathed/formulabase.C +++ b/src/mathed/formulabase.C @@ -40,7 +40,9 @@ using namespace lyx::support; using std::endl; +using std::istringstream; using std::ostream; +using std::ostringstream; using std::vector; using std::abs; using std::max; diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C index f15942bc77..eb1093b91f 100644 --- a/src/mathed/formulamacro.C +++ b/src/mathed/formulamacro.C @@ -26,6 +26,7 @@ using namespace lyx::support; +using std::istringstream; using std::ostream; using std::auto_ptr; diff --git a/src/mathed/math_autocorrect.C b/src/mathed/math_autocorrect.C index 75ea1371d7..8810f63cde 100644 --- a/src/mathed/math_autocorrect.C +++ b/src/mathed/math_autocorrect.C @@ -24,6 +24,7 @@ using namespace lyx::support; using std::ifstream; using std::istream; +using std::istringstream; using std::ostream; using std::endl; using std::vector; diff --git a/src/mathed/math_diminset.C b/src/mathed/math_diminset.C index f1253db192..22921751e0 100644 --- a/src/mathed/math_diminset.C +++ b/src/mathed/math_diminset.C @@ -12,6 +12,8 @@ #include "math_diminset.h" +using std::ostringstream; + void MathDimInset::metricsT(TextMetricsInfo const &) const { diff --git a/src/mathed/math_extern.C b/src/mathed/math_extern.C index d719c8af69..6381d0436f 100644 --- a/src/mathed/math_extern.C +++ b/src/mathed/math_extern.C @@ -41,6 +41,7 @@ using namespace lyx::support; using std::ostream; using std::istringstream; +using std::ostringstream; using std::find_if; using std::endl; diff --git a/src/mathed/math_factory.C b/src/mathed/math_factory.C index 9c78975ef3..2b0b973388 100644 --- a/src/mathed/math_factory.C +++ b/src/mathed/math_factory.C @@ -61,6 +61,7 @@ using namespace lyx::support; using std::endl; +using std::istringstream; bool has_math_fonts; diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C index 5d21dfd5d0..4f1889d3e8 100644 --- a/src/mathed/math_gridinset.C +++ b/src/mathed/math_gridinset.C @@ -26,6 +26,8 @@ using std::max; using std::min; using std::vector; using std::istream; +using std::istringstream; +using std::ostringstream; using std::auto_ptr; using std::endl; diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C index 6a9bb0dfb4..c094677cd8 100644 --- a/src/mathed/math_hullinset.C +++ b/src/mathed/math_hullinset.C @@ -31,6 +31,8 @@ using namespace lyx::support; +using std::istringstream; +using std::ostringstream; using std::vector; using std::max; using std::endl; diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C index 0ab499f1b2..a11f6fe75c 100644 --- a/src/mathed/math_parser.C +++ b/src/mathed/math_parser.C @@ -66,6 +66,7 @@ following hack as starting point to write some macros: using std::istream; +using std::istringstream; using std::ostream; using std::ios; using std::endl; diff --git a/src/mathed/math_support.C b/src/mathed/math_support.C index 58688a86b1..3441463bc3 100644 --- a/src/mathed/math_support.C +++ b/src/mathed/math_support.C @@ -25,6 +25,7 @@ using std::max; using std::endl; +using std::ostringstream; /// diff --git a/src/paragraph.C b/src/paragraph.C index 0a6c8bd34d..567b299ad5 100644 --- a/src/paragraph.C +++ b/src/paragraph.C @@ -40,6 +40,7 @@ using namespace lyx::support; using std::ostream; +using std::ostringstream; using std::endl; using std::fstream; using std::ios; diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C index cc43eac199..855837e7c3 100644 --- a/src/paragraph_funcs.C +++ b/src/paragraph_funcs.C @@ -41,6 +41,7 @@ using namespace lyx::support; using lyx::pos_type; //using lyx::layout_type; using std::endl; +using std::istringstream; using std::ostream; diff --git a/src/support/ChangeLog b/src/support/ChangeLog index bb022dace9..3e4dc8c8f4 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,3 +1,10 @@ +2003-09-05 Angus Leeming + + * std_istream.h: new file Just renaming of LIstream.h + * std_ostream.h: new file Just renaming of LIstream.h + * std_sstream.h: new file Just renaming of Lsstream.h + * std_string.h: new file Just renaming of LString.h + 2003-09-05 Angus Leeming * lyxmanip.h: diff --git a/src/support/filetools.C b/src/support/filetools.C index e0d333b096..0ce3da0bfa 100644 --- a/src/support/filetools.C +++ b/src/support/filetools.C @@ -77,6 +77,7 @@ using std::make_pair; using std::pair; using std::endl; using std::ifstream; +using std::ostringstream; using std::vector; using std::getline; diff --git a/src/support/std_sstream.h b/src/support/std_sstream.h index b7de97f86a..088c95bc81 100644 --- a/src/support/std_sstream.h +++ b/src/support/std_sstream.h @@ -23,8 +23,4 @@ #include "support/sstream.h" #endif -using std::istringstream; -using std::ostringstream; -using std::stringstream; - #endif // NOT STD_SSTREAM_H diff --git a/src/support/tostr.C b/src/support/tostr.C index d6ea6f130f..a6dc3fac68 100644 --- a/src/support/tostr.C +++ b/src/support/tostr.C @@ -13,6 +13,8 @@ #include "support/std_sstream.h" #include "support/std_string.h" +using std::ostringstream; + string const tostr(bool b) { diff --git a/src/tabular.C b/src/tabular.C index 26bb0126e3..19cadf3f9b 100644 --- a/src/tabular.C +++ b/src/tabular.C @@ -36,6 +36,7 @@ using namespace lyx::support; using std::abs; using std::ostream; +using std::ostringstream; using std::istream; using std::getline; using std::max; diff --git a/src/text2.C b/src/text2.C index aa8a4fe641..3adfdbbba7 100644 --- a/src/text2.C +++ b/src/text2.C @@ -55,6 +55,7 @@ using namespace lyx::support; +using std::ostringstream; using std::vector; using std::copy; using std::endl; diff --git a/src/text3.C b/src/text3.C index 685c7fd299..4112c9bf5c 100644 --- a/src/text3.C +++ b/src/text3.C @@ -45,6 +45,7 @@ using namespace bv_funcs; using std::endl; using std::find; +using std::istringstream; using std::vector; using lyx::pos_type;