we assume (more or less) conforming compilers nowadays.

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

src/Author.cpp

@@ -16,7 +16,7 @@
 
 #include <boost/assert.hpp>
 
-#include "support/std_istream.h"
+#include <istream>
 
 using std::string;
 

src/Box.cpp

@@ -14,7 +14,7 @@
 
 #include "Box.h"
 
-#include "support/std_ostream.h"
+#include <ostream>
 
 using std::ostream;
 

src/frontends/qt4/Validator.cpp

@@ -22,13 +22,10 @@
 
 #include "support/docstring.h"
 #include "support/lstrings.h"
-#include "support/std_ostream.h"
 
 #include <QLineEdit>
 #include <QWidget>
 
-#include <sstream>
-
 using lyx::support::isStrDbl;
 using std::string;
 

src/insets/InsetBibitem.cpp

@@ -25,10 +25,10 @@
 #include "ParagraphList.h"
 
 #include "support/lstrings.h"
-#include "support/std_ostream.h"
 #include "support/docstream.h"
 #include "support/convert.h"
 
+#include <ostream>
 
 namespace lyx {
 

src/insets/InsetFoot.cpp

@@ -24,9 +24,10 @@
 #include "OutputParams.h"
 #include "ParIterator.h"
 
-#include "support/std_ostream.h"
 #include "support/lstrings.h"
 
+#include <ostream>
+
 namespace lyx {
 
 using std::string;

src/insets/InsetHFill.cpp

@@ -13,7 +13,7 @@
 #include "InsetHFill.h"
 #include "gettext.h"
 
-#include "support/std_ostream.h"
+#include <ostream>
 
 
 namespace lyx {

src/insets/InsetIndex.cpp

@@ -19,7 +19,7 @@
 #include "MetricsInfo.h"
 #include "sgml.h"
 
-#include "support/std_ostream.h"
+#include <ostream>
 
 
 namespace lyx {

src/insets/InsetMarginal.cpp

@@ -17,7 +17,7 @@
 #include "gettext.h"
 #include "OutputParams.h"
 
-#include "support/std_ostream.h"
+#include <ostream>
 
 
 namespace lyx {

src/insets/InsetTOC.cpp

@@ -20,7 +20,7 @@
 #include "OutputParams.h"
 #include "TocBackend.h"
 
-#include "support/std_ostream.h"
+#include <ostream>
 
 
 namespace lyx {

src/insets/InsetTheorem.cpp

@@ -20,7 +20,7 @@
 #include "Text.h"
 #include "MetricsInfo.h"
 
-#include "support/std_ostream.h"
+#include <ostream>
 
 
 namespace lyx {

src/mathed/InsetMathAMSArray.cpp

@@ -23,7 +23,8 @@
 #include "gettext.h"
 
 #include "support/lstrings.h"
-#include "support/std_ostream.h"
+
+#include <ostream>
 
 
 namespace lyx {

src/mathed/InsetMathBoldSymbol.cpp

@@ -11,10 +11,12 @@
 #include <config.h>
 
 #include "InsetMathBoldSymbol.h"
+
 #include "MathStream.h"
 #include "MathData.h"
 #include "LaTeXFeatures.h"
-#include "support/std_ostream.h"
+
+#include <ostream>
 
 
 namespace lyx {

src/mathed/InsetMathComment.cpp

@@ -11,10 +11,12 @@
 #include <config.h>
 
 #include "InsetMathComment.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathSupport.h"
-#include "support/std_ostream.h"
+
+#include <ostream>
 
 
 namespace lyx {

src/mathed/InsetMathEnv.cpp

@@ -11,10 +11,12 @@
 #include <config.h>
 
 #include "InsetMathEnv.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathStream.h"
-#include "support/std_ostream.h"
+
+#include <ostream>
 
 
 namespace lyx {

src/mathed/InsetMathPar.cpp

@@ -11,9 +11,11 @@
 #include <config.h>
 
 #include "InsetMathPar.h"
+
 #include "MathData.h"
 #include "MathStream.h"
-#include "support/std_ostream.h"
+
+#include <ostream>
 
 
 namespace lyx {

src/mathed/InsetMathPhantom.cpp

@@ -11,13 +11,11 @@
 #include <config.h>
 
 #include "InsetMathPhantom.h"
-#include "MathStream.h"
-#include "MathStream.h"
-
 
+#include "MathStream.h"
 #include "frontends/Painter.h"
 
-#include "support/std_ostream.h"
+#include <ostream>
 
 
 namespace lyx {

src/mathed/InsetMathSize.cpp

@@ -11,12 +11,14 @@
 #include <config.h>
 
 #include "InsetMathSize.h"
+
 #include "MathData.h"
 #include "MathParser.h"
 #include "MathStream.h"
 
 #include "support/convert.h"
-#include "support/std_ostream.h"
+
+#include <ostream>
 
 
 namespace lyx {

src/mathed/InsetMathSplit.cpp

@@ -11,6 +11,7 @@
 #include <config.h>
 
 #include "InsetMathSplit.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathStream.h"
@@ -21,7 +22,8 @@
 #include "LaTeXFeatures.h"
 
 #include "support/lstrings.h"
-#include "support/std_ostream.h"
+
+#include <ostream>
 
 
 namespace lyx {

src/mathed/InsetMathSubstack.cpp

@@ -10,11 +10,11 @@
 
 #include <config.h>
 
-#include "LaTeXFeatures.h"
 #include "InsetMathSubstack.h"
+
+#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathStream.h"
-#include "support/std_ostream.h"
 
 #include "FuncRequest.h"
 #include "FuncStatus.h"
@@ -22,6 +22,7 @@
 
 #include "support/lstrings.h"
 
+#include <ostream>
 
 namespace lyx {
 

src/mathed/InsetMathTabular.cpp

@@ -11,14 +11,14 @@
 #include <config.h>
 
 #include "InsetMathTabular.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathStream.h"
 
 #include "support/lstrings.h"
-#include "support/std_ostream.h"
 
-#include <iterator>
+#include <ostream>
 
 
 namespace lyx {

src/mathed/InsetMathXYMatrix.cpp

@@ -11,10 +11,11 @@
 #include <config.h>
 
 #include "InsetMathXYMatrix.h"
-#include "MathStream.h"
 
 #include "LaTeXFeatures.h"
-#include "support/std_ostream.h"
+#include "MathStream.h"
+
+#include <ostream>
 
 
 namespace lyx {

src/mathed/TextPainter.cpp

@@ -11,7 +11,8 @@
 #include <config.h>
 
 #include "TextPainter.h"
-#include "support/std_ostream.h"
+
+#include <ostream>
 
 
 namespace lyx {

src/sgml.cpp

@@ -16,19 +16,18 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "Counters.h"
-#include "Text.h"
 #include "Layout.h"
 #include "OutputParams.h"
 #include "Paragraph.h"
+#include "Text.h"
 
+#include "support/convert.h"
 #include "support/docstream.h"
 #include "support/lstrings.h"
-#include "support/std_ostream.h"
-#include "support/convert.h"
 #include "support/textutils.h"
 
 #include <map>
-#include <sstream>
+#include <ostream>
 
 
 namespace lyx {
@@ -98,12 +97,12 @@ docstring sgml::escapeChar(char_type c)
 
 docstring sgml::escapeString(docstring const & raw)
 {
-	odocstringstream bin;
+	docstring bin;
+	bin.reserve(raw.size() * 2); // crude approximation is sufficient
+	for (size_t i = 0; i != raw.size(); ++i)
+		bin += sgml::escapeChar(raw[i]);
 
-	for(docstring::size_type i = 0; i < raw.size(); ++i) {
-		bin  << sgml::escapeChar(raw[i]);
-	}
-	return bin.str();
+	return bin;
 }
 
 
@@ -167,12 +166,11 @@ docstring sgml::cleanID(Buffer const & buf, OutputParams const & runparams,
 			mangle = true;
 		}
 	}
-	if (mangle) {
+
+	if (mangle)
 		content += "-" + convert<docstring>(mangleID++);
-	}
-	else if (isDigitASCII(content[content.size() - 1])) {
+	else if (isDigitASCII(content[content.size() - 1]))
 		content += ".";
-	}
 
 	mangledNames[orig] = content;
 

src/support/Makefile.am

@@ -77,8 +77,6 @@ liblyxsupport_la_SOURCES = \
 	socktools.cpp \
 	socktools.h \
 	strfwd.h \
-	std_istream.h \
-	std_ostream.h \
 	Systemcall.cpp \
 	Systemcall.h \
 	tempname.cpp \

src/support/std_istream.h

@@ -1,17 +0,0 @@
-// -*- C++ -*-
-/**
- * \file std_istream.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- */
-
-#ifndef STD_ISTREAM_H
-#define STD_ISTREAM_H
-
-#ifdef HAVE_ISTREAM
-#include <istream>
-#else
-#include <iostream>
-#endif
-
-#endif // NOT STD_ISTREAM_H

src/support/std_ostream.h

@@ -1,17 +0,0 @@
-// -*- C++ -*-
-/**
- * \file std_ostream.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- */
-
-#ifndef STD_OSTREAM_H
-#define STD_OSTREAM_H
-
-#ifdef HAVE_OSTREAM
-#include <ostream>
-#else
-#include <iostream>
-#endif
-
-#endif // NOT STD_OSTREAM_H