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

@@ -1,3 +1,8 @@
+2003-09-05  Angus Leeming  <leeming@lyx.org>
+
+	Changes most place everywhere due to the removal of using directives
+	from support/std_sstream.h.
+
 2003-09-05  Angus Leeming  <leeming@lyx.org>
 
 	Replace LString.h with support/std_string.h,

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)

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<ParameterStruct> ParagraphParameters::container;

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"};

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;

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;
 

src/bufferview_funcs.C

@@ -32,6 +32,9 @@
 
 using namespace lyx::support;
 
+using std::istringstream;
+using std::ostringstream;
+
 
 namespace {
 

src/counters.C

@@ -21,6 +21,7 @@
 using namespace lyx::support;
 
 using std::endl;
+using std::ostringstream;
 using std::vector;
 
 

src/frontends/controllers/ControlAboutlyx.C

@@ -11,7 +11,6 @@
 
 #include <config.h>
 
-
 #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)

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)
 {}

src/frontends/controllers/biblio.C

@@ -23,6 +23,7 @@
 
 using namespace lyx::support;
 
+using std::ostringstream;
 using std::vector;
 
 

src/frontends/gnome/GAbout.C

@@ -21,6 +21,9 @@
 #include <gtkmm/button.h>
 #include <gtkmm/textview.h>
 
+using std::istringstream;
+
+
 GAbout::GAbout()
 	: GnomeCB<ControlAboutlyx>("GAbout")
 {}

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;

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};

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 !

src/frontends/qt2/QAbout.C

@@ -10,7 +10,6 @@
 
 #include <config.h>
 
-
 #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<ControlAboutlyx, QView<QAboutDialog> > base_class;
 
-
 QAbout::QAbout(Dialog & parent)
 	: base_class(parent, _("About LyX"))
 {

src/frontends/qt2/QLog.C

@@ -26,6 +26,7 @@
 
 using std::ifstream;
 using std::getline;
+using std::ostringstream;
 
 typedef QController<ControlLog, QView<QLogDialog> > base_class;
 

src/frontends/qt2/QMathMatrixDialog.C

@@ -24,6 +24,8 @@
 #include <qspinbox.h>
 #include "emptytable.h"
 
+using std::ostringstream;
+
 
 static char h_align_str[80] = "c";
 static char v_align_c[] = "tcb";

src/frontends/qt2/QVCLog.C

@@ -10,7 +10,6 @@
 
 #include <config.h>
 
-
 #include "support/std_sstream.h"
 #include "qt_helpers.h"
 #include "support/lstrings.h"
@@ -26,9 +25,11 @@
 
 using namespace lyx::support;
 
-typedef QController<ControlVCLog, QView<QVCLogDialog> > base_class;
+using std::ostringstream;
 
 
+typedef QController<ControlVCLog, QView<QVCLogDialog> > base_class;
+
 QVCLog::QVCLog(Dialog & parent)
 	: base_class(parent, _("LyX: Version Control Log"))
 {

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 {

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)

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"

src/frontends/xforms/FormMathsMatrix.C

@@ -30,6 +30,8 @@
 
 using namespace lyx::support;
 
+using std::ostringstream;
+
 #ifndef CXX_GLOBAL_CSTD
 using std::strlen;
 #endif

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());

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;
 
 

src/funcrequest.C

@@ -18,6 +18,7 @@
 #include "support/std_sstream.h"
 
 
+using std::istringstream;
 using std::vector;
 using std::getline;
 using std::endl;

src/graphics/GraphicsConverter.C

@@ -43,6 +43,7 @@ using support::unlink;
 
 using std::endl;
 using std::ostream;
+using std::ostringstream;
 
 
 namespace lyx {

src/graphics/GraphicsParams.C

@@ -17,6 +17,7 @@
 #include "support/std_sstream.h"
 
 using std::abs;
+using std::istringstream;
 
 
 namespace lyx {

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;
 

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()

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)

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)

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 {

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

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 {

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;
 

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:

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()

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;
 
 

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 {

src/lyxfont.C

@@ -27,6 +27,7 @@
 using namespace lyx::support;
 
 using std::ostream;
+using std::ostringstream;
 using std::endl;
 
 #ifndef CXX_GLOBAL_CSTD

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;

src/lyxgluelength.C

@@ -17,6 +17,8 @@
 
 #include "support/std_sstream.h"
 
+using std::ostringstream;
+
 
 LyXGlueLength::LyXGlueLength(LyXLength const & len)
 	: len_(len)

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)

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)

src/mathed/formula.C

@@ -30,6 +30,7 @@
 
 
 using std::ostream;
+using std::ostringstream;
 using std::vector;
 using std::auto_ptr;
 using std::endl;

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;

src/mathed/formulamacro.C

@@ -26,6 +26,7 @@
 
 using namespace lyx::support;
 
+using std::istringstream;
 using std::ostream;
 using std::auto_ptr;
 

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;

src/mathed/math_diminset.C

@@ -12,6 +12,8 @@
 
 #include "math_diminset.h"
 
+using std::ostringstream;
+
 
 void MathDimInset::metricsT(TextMetricsInfo const &) const
 {

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;
 

src/mathed/math_factory.C

@@ -61,6 +61,7 @@
 using namespace lyx::support;
 
 using std::endl;
+using std::istringstream;
 
 bool has_math_fonts;
 

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;
 

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;

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;

src/mathed/math_support.C

@@ -25,6 +25,7 @@
 
 using std::max;
 using std::endl;
+using std::ostringstream;
 
 
 ///

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;

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;
 
 

src/support/ChangeLog

@@ -1,3 +1,10 @@
+2003-09-05  Angus Leeming  <leeming@lyx.org>
+
+	* 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  <leeming@lyx.org>
 
 	* lyxmanip.h: 

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;
 

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

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)
 {

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;

src/text2.C

@@ -55,6 +55,7 @@
 
 using namespace lyx::support;
 
+using std::ostringstream;
 using std::vector;
 using std::copy;
 using std::endl;

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;