change "support/std_sstream.h" to <sstream>

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

diff --git a/config/ChangeLog b/config/ChangeLog
index 9e5fa2e28fddf2dacd794c8080599ec108b0bd4c..b386debc1cc1814a9c79795293767fd7577b053d 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-24  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * common.am (AM_ETAGSFLAGS): setup variable
+
 2004-05-28  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
        * depcomp.diff: remove file

diff --git a/config/common.am b/config/common.am
index 476213313a1344aba9a51a27fbfb6c209abdeaf1..e8fceee999be497310dc5a080133ddc6a165f0ef 100644 (file)
--- a/config/common.am
+++ b/config/common.am
@@ -6,7 +6,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
 AM_INSTALL_DATA_FLAGS = $(INSTALL) -m 644 -D
 
-ETAGS_ARGS = --lang=c++
+AM_ETAGSFLAGS = --lang=c++
 
 if USE_INCLUDED_BOOST
 BOOST_INCLUDES = -I$(top_srcdir)/boost

diff --git a/src/ChangeLog b/src/ChangeLog
index 56fa5d201a049cfbc55e4614928579c3abff66e7..8153039efffae1d53cd5ef06a328158d8b12d294 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2004-07-24  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * text3.C, text2.C, text.C, tabular.C, paragraph_funcs.C, paragraph.C:
+       * lyxlength.C, lyxgluelength.C, lyxfunc.C, lyxfont.C, lyxfind.C:
+       * kbmap.C, funcrequest.C, factory.C, cursor.C, counters.C:
+       * bufferview_funcs.C, bufferparams.C, buffer.C, Spacing.C:
+       * ParagraphParameters.C, LaTeXFeatures.C: replace
+       "support/std_sstream.h" with <sstream>
+
 2004-07-23  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
        * lyxserver.C (startPipe): use this (pointer) not *this (reference)

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 406d50e49386f9410660c577077f5cae7e7d7ceb..1741883794c9b94a4522f92dceaf60665d60eb16 100644 (file)
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -27,7 +27,7 @@
 
 #include "support/filetools.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 using lyx::support::IsSGMLFilename;
 using lyx::support::MakeRelPath;
@@ -307,7 +307,7 @@ string const LaTeXFeatures::getPackages() const
                }
                packages << "]{natbib}\n";
        }
-       
+
        // jurabib -- we need version 0.6 at least.
        if (isRequired("jurabib")) {
                packages << "\\RequirePackage{jurabib}[2004/01/25]\n";

diff --git a/src/ParagraphParameters.C b/src/ParagraphParameters.C
index 7f4ecfcdb9afb7496f54b349b905aa1e390e0122..2d0ee33f2063842cffc366ca1736cd309890a888 100644 (file)
--- a/src/ParagraphParameters.C
+++ b/src/ParagraphParameters.C
@@ -28,7 +28,8 @@
 #include "frontends/LyXView.h"
 
 #include "support/lstrings.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
 
 using lyx::support::rtrim;
 

diff --git a/src/Spacing.C b/src/Spacing.C
index 776979052143bf4097566c7705cab293548c45eb..ddb9ddbba187fd69f74c763b0b0ebc99fbbcd250 100644 (file)
--- a/src/Spacing.C
+++ b/src/Spacing.C
@@ -10,11 +10,11 @@
  */
 
 #include <config.h>
-#include <string>
 
 #include "Spacing.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
+#include <string>
 
 using std::ios;
 using std::istringstream;

diff --git a/src/buffer.C b/src/buffer.C
index d2f07cf19e3a936b7a9dc258ce94327ae9a2dd75..d6665c8352d1bcf3ea059cf830809a6defd79634 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -71,14 +71,15 @@
 #include "support/path.h"
 #include "support/textutils.h"
 #include "support/tostr.h"
-#include "support/std_sstream.h"
 
 #include <boost/bind.hpp>
 
+#include <utime.h>
+
 #include <iomanip>
 #include <stack>
+#include <sstream>
 
-#include <utime.h>
 
 using lyx::pos_type;
 using lyx::par_type;
@@ -1078,7 +1079,7 @@ void Buffer::makeDocBookFile(string const & fname,
                            << "\"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\"";
                else
                        ofs << " PUBLIC \"-//OASIS//DTD DocBook V4.2//EN\"";
-               
+
                string preamble = params().preamble;
                string const name = runparams.nice ? ChangeExtension(pimpl_->filename, ".sgml")
                         : fname;

diff --git a/src/bufferparams.C b/src/bufferparams.C
index da924693fe07e23d13e512a09186f6451f0051fa..448edc75dc9ea4ae960fb3a706d767532134e414 100644 (file)
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -41,7 +41,7 @@
 
 #include <boost/array.hpp>
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 namespace support = lyx::support;
 using lyx::support::bformat;
@@ -328,7 +328,7 @@ string const BufferParams::readToken(LyXLex & lex, string const & token)
                        cite_engine = biblio::ENGINE_NATBIB_AUTHORYEAR;
                else if (engine == "jurabib")
                        cite_engine = biblio::ENGINE_JURABIB;
-               
+
        } else if (token == "\\use_bibtopic") {
                lex.nextToken();
                use_bibtopic = lex.getInteger();

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index 0bcc2e892d91066cc53e7a12474eda85c4121f10..5428d11ed15e7eb8406a8e105559115a2d79e469 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -35,7 +35,8 @@
 #include "insets/insettext.h"
 
 #include "support/tostr.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
 
 using lyx::support::bformat;
 

diff --git a/src/counters.C b/src/counters.C
index 087a0bd2c454d041f813df7148876b3e41cbc1e9..657c28e2251f87946798b47d8a61ec11d7e2f799 100644 (file)
--- a/src/counters.C
+++ b/src/counters.C
@@ -16,11 +16,12 @@
 #include "debug.h"
 
 #include "support/lstrings.h"
-#include "support/std_sstream.h"
 #include "support/tostr.h"
 
 #include <boost/assert.hpp>
 
+#include <sstream>
+
 using std::endl;
 using std::ostringstream;
 using std::string;

diff --git a/src/cursor.C b/src/cursor.C
index 903593c55108d58cf8e5506fce4b427f2cc0f823..82a0a58b31841afa25799a8b65fc474f6afe48bc 100644 (file)
--- a/src/cursor.C
+++ b/src/cursor.C
@@ -40,12 +40,13 @@
 #include "mathed/math_macrotable.h"
 
 #include "support/limited_stack.h"
-#include "support/std_sstream.h"
 
 #include "frontends/LyXView.h"
 
 #include <boost/assert.hpp>
 
+#include <sstream>
+
 using lyx::par_type;
 
 using std::string;

diff --git a/src/factory.C b/src/factory.C
index 8d3b9b6ac10bcf0ceea4373ab80158f84bb22268..66ae5f30e5ec01fd80ea48bef19ae614656a418e 100644 (file)
--- a/src/factory.C
+++ b/src/factory.C
@@ -60,10 +60,11 @@
 #include "frontends/LyXView.h"
 
 #include "support/lstrings.h"
-#include "support/std_sstream.h"
 
 #include <boost/assert.hpp>
 
+#include <sstream>
+
 using lyx::support::compare_ascii_no_case;
 
 using std::auto_ptr;

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 5b148a6f002afe74c8109e2d2f3800aa187da353..c8e09e94ae0ca9542eb766cd1fb8d6e3586b1bb7 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-24  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * biblio.C, ControlPrefs.C, ControlParagraph.C:
+       * ControlLog.C, ControlDocument.C, ControlAboutlyx.C: replace
+       "support/std_sstream.h" with <sstream>
+
 2004-05-19  Angus Leeming  <leeming@lyx.org>
 
        * *.[Ch]: wrap all code up inside namespace lyx::frontend.

diff --git a/src/frontends/controllers/ControlAboutlyx.C b/src/frontends/controllers/ControlAboutlyx.C
index 55411730097c3e9f134fe683dbbf503db126d7ce..6591b6f7488061f231dedea8bb4c63760c649dd1 100644 (file)
--- a/src/frontends/controllers/ControlAboutlyx.C
+++ b/src/frontends/controllers/ControlAboutlyx.C
@@ -14,12 +14,12 @@
 #include "ControlAboutlyx.h"
 #include "gettext.h"
 #include "version.h"
-#include "support/std_sstream.h"
 
 #include "support/filetools.h" // FileSearch
 #include "support/path_defines.h"
 
 #include <fstream>
+#include <sstream>
 
 using std::ostream;
 using std::ostringstream;

diff --git a/src/frontends/controllers/ControlDocument.C b/src/frontends/controllers/ControlDocument.C
index f614db1e3342c83f5fceb6a607788b6e080038e8..689c395a5519992a2beff8262f041ac7c3e72716 100644 (file)
--- a/src/frontends/controllers/ControlDocument.C
+++ b/src/frontends/controllers/ControlDocument.C
@@ -21,7 +21,7 @@
 #include "LColor.h"
 #include "lyxtextclasslist.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 using std::ostringstream;
 using std::string;

diff --git a/src/frontends/controllers/ControlLog.C b/src/frontends/controllers/ControlLog.C
index dad828aaba69ab3502ee89751e13443e9b8239ec..4f849af0b806200b2adbb60f18ecfe69387c925c 100644 (file)
--- a/src/frontends/controllers/ControlLog.C
+++ b/src/frontends/controllers/ControlLog.C
@@ -16,8 +16,7 @@
 #include "gettext.h"
 #include "lyxlex.h"
 
-#include "support/std_sstream.h"
-
+#include <sstream>
 #include <fstream>
 
 using std::istringstream;

diff --git a/src/frontends/controllers/ControlParagraph.C b/src/frontends/controllers/ControlParagraph.C
index 4d597ddcc43bbe7c3df592e6839a636f5e19789c..88e2f7a3bb0da7ba28b1db8d6067b74f75db5725 100644 (file)
--- a/src/frontends/controllers/ControlParagraph.C
+++ b/src/frontends/controllers/ControlParagraph.C
@@ -17,8 +17,8 @@
 #include "lyxlex.h"
 #include "paragraph.h"
 #include "ParagraphParameters.h"
-#include "support/std_sstream.h"
 
+#include <sstream>
 
 using std::istringstream;
 using std::ostringstream;

diff --git a/src/frontends/controllers/ControlPrefs.C b/src/frontends/controllers/ControlPrefs.C
index 7da7e88683efcf3c8736f5b9ff32502d22c3d6c6..8236af8c56296f46e25455b2c7bb7efea89db7b9 100644 (file)
--- a/src/frontends/controllers/ControlPrefs.C
+++ b/src/frontends/controllers/ControlPrefs.C
@@ -24,7 +24,7 @@
 #include "support/globbing.h"
 #include "support/path_defines.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 using std::ostringstream;
 using std::pair;

diff --git a/src/frontends/controllers/biblio.C b/src/frontends/controllers/biblio.C
index b7776a5452df2da9dd39ade3ab64c7963415bbd2..8522f1fc663caa81a2d915c4a7e35ef45e7d7772 100644 (file)
--- a/src/frontends/controllers/biblio.C
+++ b/src/frontends/controllers/biblio.C
@@ -18,11 +18,11 @@
 #include "gettext.h"
 
 #include "support/lstrings.h"
-#include "support/std_sstream.h"
 
 #include <boost/regex.hpp>
 
 #include <algorithm>
+#include <sstream>
 
 using std::string;
 using std::ostringstream;

diff --git a/src/frontends/gnome/ChangeLog b/src/frontends/gnome/ChangeLog
index 05f7798f8da944c0c3d310607b4c04d30bc29f64..e7e0e7c34b417410a4fcdc35776a98be5e3a08ff 100644 (file)
--- a/src/frontends/gnome/ChangeLog
+++ b/src/frontends/gnome/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-24  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * lyx_gui.C:
+       * GAbout.C: change "support/std_sstream.h" to <sstream>
+
 2004-05-28  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
        * Makefile.am (libgnome_la_SOURCES): add support.c and support.h

diff --git a/src/frontends/gnome/GAbout.C b/src/frontends/gnome/GAbout.C
index d91d7519423784e26980d28cc21cefbd7797fa61..f390388a53198904bfe261861929bc97dad2892f 100644 (file)
--- a/src/frontends/gnome/GAbout.C
+++ b/src/frontends/gnome/GAbout.C
@@ -12,7 +12,6 @@
 #include <config.h>
 
 #include "support/lstrings.h"
-#include "support/std_sstream.h"
 
 #include "gnome_helpers.h"
 #include "gnomeBC.h"
@@ -21,6 +20,8 @@
 #include <gtkmm/button.h>
 #include <gtkmm/textview.h>
 
+#include <sstream>
+
 using std::istringstream;
 
 

diff --git a/src/frontends/gnome/lyx_gui.C b/src/frontends/gnome/lyx_gui.C
index 141731ef59a41a08465f3b54a846d58840d8a1ab..13e4607d86ac3960b19c0b8f0404d437606e9397 100644 (file)
--- a/src/frontends/gnome/lyx_gui.C
+++ b/src/frontends/gnome/lyx_gui.C
@@ -38,10 +38,11 @@
 #include "xfont_loader.h"
 #include "xformsImage.h"
 
-#include "support/std_sstream.h"
+#include <boost/bind.hpp>
+
+#include <sstream>
 #include <iomanip>
 #include <fcntl.h>
-#include <boost/bind.hpp>
 
 #include "gnome_helpers.h"
 #include <gtkmm/main.h>

diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog
index 50a6880344599bea749d3d3abef83cabb3a78a67..7476275ba7422596fc72a199318f70b6f2b0608a 100644 (file)
--- a/src/frontends/gtk/ChangeLog
+++ b/src/frontends/gtk/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-24  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * lyx_gui.C: change "support/std_sstream.h" to <sstream>
+
 2004-07-22  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
        * lyx_gui.C (register_socket_callback,unregister_socket_callback):

diff --git a/src/frontends/gtk/lyx_gui.C b/src/frontends/gtk/lyx_gui.C
index 6c4f31cf9db070eec89fd46b99bd6e142bc434f0..9fbf7a1b6e8a1355c067c25bdbcf7bd2dda9048c 100644 (file)
--- a/src/frontends/gtk/lyx_gui.C
+++ b/src/frontends/gtk/lyx_gui.C
@@ -47,13 +47,15 @@
 #include "xftFontLoader.h"
 #include "GWorkArea.h"
 
-#include "support/std_sstream.h"
-#include <iomanip>
-#include <fcntl.h>
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
 
+#include <fcntl.h>
+
+#include <sstream>
+#include <iomanip>
+
 //just for xforms
 #include "lyx_forms.h"
 #include "xformsImage.h"

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 90064bf3dd3c90b28b4332599e194b6d6b2bff5e..2e7b4aee928105acc5f5b9d6bff01278e80ba3ac 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,6 +1,11 @@
+2004-07-24  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * QPrefs.C, QMathMatrixDialog.C:
+       * QLog.C, QAbout.C: change "support/std_sstream.h" to <sstream>
+
 2004-07-22  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
-       * lyx_gui.C (set_read_callback,remove_read_callback): delete funcs 
+       * lyx_gui.C (set_read_callback,remove_read_callback): delete funcs
 
        * Makefile.dialogs (MOCFILES): remove io_callback.[Ch]
        * io_callback.[Ch]: delete files

diff --git a/src/frontends/qt2/QAbout.C b/src/frontends/qt2/QAbout.C
index bfe0e5bf5eb3ae6f2ec1dcd793222db14da8d7fd..fe9c83febdd46bb5a834c171fea5db34e87e55e3 100644 (file)
--- a/src/frontends/qt2/QAbout.C
+++ b/src/frontends/qt2/QAbout.C
@@ -19,7 +19,8 @@
 #include "controllers/ControlAboutlyx.h"
 
 #include "support/lstrings.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
 
 #include <qlabel.h>
 #include <qpushbutton.h>

diff --git a/src/frontends/qt2/QLog.C b/src/frontends/qt2/QLog.C
index 7e9e3086afd84e93db338b7f8f049786dcee770d..4bc69419a23cff4d28e715e3d3ac990f9ba0ce2b 100644 (file)
--- a/src/frontends/qt2/QLog.C
+++ b/src/frontends/qt2/QLog.C
@@ -16,7 +16,7 @@
 
 #include "controllers/ControlLog.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 #include <qtextview.h>
 #include <qpushbutton.h>

diff --git a/src/frontends/qt2/QMathMatrixDialog.C b/src/frontends/qt2/QMathMatrixDialog.C
index f9815edddb258c0bdafadbdcb87c5baa7096e908..26a5529c6e10286213efcc6098abdabe26a77b86 100644 (file)
--- a/src/frontends/qt2/QMathMatrixDialog.C
+++ b/src/frontends/qt2/QMathMatrixDialog.C
@@ -18,7 +18,7 @@
 
 #include "controllers/ControlMath.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 #include <qcombobox.h>
 #include <qlineedit.h>

diff --git a/src/frontends/qt2/QPrefs.C b/src/frontends/qt2/QPrefs.C
index 3e345c713413d2a8d46a0d6615fab61e5925e1f3..47fbdd6e8d1a1ece66a7ea6a79aea4b9bd62bf18 100644 (file)
--- a/src/frontends/qt2/QPrefs.C
+++ b/src/frontends/qt2/QPrefs.C
@@ -37,7 +37,6 @@
 
 #include "support/lstrings.h"
 #include "support/tostr.h"
-#include "support/std_sstream.h"
 
 #include "controllers/ControlPrefs.h"
 #include "controllers/frnt_lang.h"
@@ -56,6 +55,7 @@
 #include <boost/tuple/tuple.hpp>
 
 #include <iomanip>
+#include <sstream>
 
 using lyx::support::compare_no_case;
 using lyx::support::strToDbl;

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 2d68b73f020a3decc55a2571d5752ccc93f77709..0dfb2137a48f8f720c627376d1dda738b33a2b88 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,7 +1,13 @@
+2004-07-24  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * lyx_gui.C, FormMathsMatrix.C, FormLog.C:
+       * FormAboutlyx.C, Color.C: change "support/std_sstream.h" to
+       <sstream>
+
 2004-07-22  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
        * lyx_gui.C (C_read_callback, set_read_callback,
-       remove_read_callback): delete funcs 
+       remove_read_callback): delete funcs
 
 2004-07-21  Lars Gullik Bjonnes  <larsbj@gullik.net>
 

diff --git a/src/frontends/xforms/Color.C b/src/frontends/xforms/Color.C
index 7c683b9b363a4cee304660b9b5c5cc5156bcfd0b..c39283214a813354ad75b79b95b4e08435233a0d 100644 (file)
--- a/src/frontends/xforms/Color.C
+++ b/src/frontends/xforms/Color.C
@@ -16,9 +16,8 @@
 
 #include "LColor.h"
 
-#include "support/std_sstream.h"
-
 #include <cmath>
+#include <sstream>
 #include <iomanip>
 
 #ifndef CXX_GLOBAL_CSTD

diff --git a/src/frontends/xforms/FormAboutlyx.C b/src/frontends/xforms/FormAboutlyx.C
index 66858aefe20625c2c671643b0e7671388eeb70bd..467da4bb1c02661aea28d7778f470707474ee39f 100644 (file)
--- a/src/frontends/xforms/FormAboutlyx.C
+++ b/src/frontends/xforms/FormAboutlyx.C
@@ -18,11 +18,12 @@
 #include "ControlAboutlyx.h"
 #include "forms/form_aboutlyx.h"
 #include "xforms_helpers.h"
-#include "support/std_sstream.h"
 #include "version.h"
 
 #include "lyx_forms.h"
 
+#include <sstream>
+
 using std::ostringstream;
 
 namespace lyx {

diff --git a/src/frontends/xforms/FormLog.C b/src/frontends/xforms/FormLog.C
index be6d6625eb252c66567ef7921124eec038046ae9..685d6aca7ad7b9855f3a6f30984d0ba5bf4bcf84 100644 (file)
--- a/src/frontends/xforms/FormLog.C
+++ b/src/frontends/xforms/FormLog.C
@@ -14,10 +14,10 @@
 #include "ControlLog.h"
 #include "forms/form_browser.h"
 
-#include "support/std_sstream.h"
-
 #include "lyx_forms.h"
 
+#include <sstream>
+
 namespace lyx {
 namespace frontend {
 

diff --git a/src/frontends/xforms/FormMathsDelim.C b/src/frontends/xforms/FormMathsDelim.C
index 2bcc42f06f490e1750bf01fe1cbf5aee51549e78..26a5beb5595ffec17b613741c82f9e7bd01a820a 100644 (file)
--- a/src/frontends/xforms/FormMathsDelim.C
+++ b/src/frontends/xforms/FormMathsDelim.C
@@ -22,7 +22,7 @@
 
 #include "controllers/ButtonController.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 using std::ostringstream;
 

diff --git a/src/frontends/xforms/FormMathsMatrix.C b/src/frontends/xforms/FormMathsMatrix.C
index 7076fc3054b40b4ec126ba0a3f0c3edef9aefa98..6e02d401479151e61a84c46f7d848e89f116d105 100644 (file)
--- a/src/frontends/xforms/FormMathsMatrix.C
+++ b/src/frontends/xforms/FormMathsMatrix.C
@@ -25,7 +25,7 @@
 
 #include "lyx_forms.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 
 using std::ostringstream;

diff --git a/src/frontends/xforms/lyx_gui.C b/src/frontends/xforms/lyx_gui.C
index d4579ab0485a0d39034aeff40c538fe630a38b13..14ff26790e3380ee43e7732efb45541873f8b56d 100644 (file)
--- a/src/frontends/xforms/lyx_gui.C
+++ b/src/frontends/xforms/lyx_gui.C
@@ -42,10 +42,11 @@
 
 #include <boost/bind.hpp>
 
-#include "support/std_sstream.h"
-#include <iomanip>
 #include <fcntl.h>
 
+#include <sstream>
+#include <iomanip>
+
 using lyx::support::AddName;
 using lyx::support::user_lyxdir;
 

diff --git a/src/funcrequest.C b/src/funcrequest.C
index 9e36053e06bdcba250fff7f3cdf039fec577ca44..382ac4fa4a10a3279d12c17096d7864c32163cd4 100644 (file)
--- a/src/funcrequest.C
+++ b/src/funcrequest.C
@@ -12,9 +12,8 @@
 
 #include "funcrequest.h"
 
-#include "support/std_sstream.h"
-
 #include <iostream>
+#include <sstream>
 #include <vector>
 
 using std::getline;

diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog
index 4a8e85db58b5bc47a3457b98a1d21bc961d65f28..e420bede3601ddeb5a7a681810f4ded5534a7aa1 100644 (file)
--- a/src/graphics/ChangeLog
+++ b/src/graphics/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-24  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * PreviewLoader.C, GraphicsParams.C, GraphicsConverter.C: change
+       "support/std_sstream.h" to <sstream>
+
 2004-04-19  Angus Leeming  <leeming@lyx.org>
 
        * Previews.[Ch] (status): new member function, replacing activated.

diff --git a/src/graphics/GraphicsConverter.C b/src/graphics/GraphicsConverter.C
index dc9c5d0b73c23006c2bb2b39b049591395d326fa..4e1a754f8d8b5f32a8b14b3e209c00f01470fb28 100644 (file)
--- a/src/graphics/GraphicsConverter.C
+++ b/src/graphics/GraphicsConverter.C
@@ -24,7 +24,7 @@
 
 #include <boost/bind.hpp>
 
-#include "support/std_sstream.h"
+#include <sstream>
 #include <fstream>
 
 namespace support = lyx::support;

diff --git a/src/graphics/GraphicsParams.C b/src/graphics/GraphicsParams.C
index f9317fed70dfaffb9a38dbe67b6f0f8ec3cc5fe1..6274ea1d6ba77814ef26152691ef95a333f952ae 100644 (file)
--- a/src/graphics/GraphicsParams.C
+++ b/src/graphics/GraphicsParams.C
@@ -14,7 +14,7 @@
 
 #include "lyxlength.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 
 using std::string;

diff --git a/src/graphics/PreviewLoader.C b/src/graphics/PreviewLoader.C
index f592de1c39e3d1a64fcf09f388e8bf224f5e7a30..f3109b910e412e61886a67cfed11bfbe9af294c3 100644 (file)
--- a/src/graphics/PreviewLoader.C
+++ b/src/graphics/PreviewLoader.C
@@ -37,7 +37,7 @@
 
 #include <boost/bind.hpp>
 
-#include "support/std_sstream.h"
+#include <sstream>
 #include <fstream>
 #include <iomanip>
 

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 56937ad8cfc6fff8304b06527d1345a9460a3d1e..f22182495d979c035e83628e45e890994078301c 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,11 @@
+2004-07-24  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * insetwrap.C, insetvspace.C, insettabular.C, insetnote.C:
+       * insetinclude.C, insetgraphics.C, insetfloat.C:
+       * insetexternal.C, insetert.C, insetcharstyle.C, insetcaption.C:
+       * insetbranch.C, insetbox.C, ExternalTransforms.C: change
+       "support/std_sstream.h" to <sstream>
+
 2004-06-22  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
        * insetgraphics.C (prepareFile): remove conversion_needed flag.

diff --git a/src/insets/ExternalTransforms.C b/src/insets/ExternalTransforms.C
index ee31553ba42af59be7fe5fe9764f08f71185bcf1..806943dbfb0611d2921dfefb216c8b367c6d6281 100644 (file)
--- a/src/insets/ExternalTransforms.C
+++ b/src/insets/ExternalTransforms.C
@@ -19,8 +19,9 @@
 #include "support/translator.h"
 
 #include <boost/regex.hpp>
-#include "support/std_sstream.h"
+
 #include <cmath> // std::abs
+#include <sstream>
 
 using lyx::support::float_equal;
 

diff --git a/src/insets/insetbox.C b/src/insets/insetbox.C
index 4f8124fff5579fdd78c07bd616787fb684de7ebc..f93283ad24742059107792264bf1620b942467e2 100644 (file)
--- a/src/insets/insetbox.C
+++ b/src/insets/insetbox.C
@@ -25,9 +25,10 @@
 #include "metricsinfo.h"
 #include "paragraph.h"
 
-#include "support/std_sstream.h"
 #include "support/translator.h"
 
+#include <sstream>
+
 using std::auto_ptr;
 using std::string;
 using std::istringstream;

diff --git a/src/insets/insetbranch.C b/src/insets/insetbranch.C
index ac64ed5dc3ed651cb1abd40730cae7ff03112d82..1485bb8f053bdaec9c12845a3b9269b8838ed633 100644 (file)
--- a/src/insets/insetbranch.C
+++ b/src/insets/insetbranch.C
@@ -23,7 +23,7 @@
 #include "lyxlex.h"
 #include "paragraph.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 using std::string;
 using std::auto_ptr;

diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C
index bddcf21a1eda27b60fa42cdda35d43b4035e2cb4..37e9c4ef9ff5627ed5f7148ba02b010e6c43ae55 100644 (file)
--- a/src/insets/insetcaption.C
+++ b/src/insets/insetcaption.C
@@ -29,7 +29,7 @@
 
 #include "support/lstrings.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 
 using lyx::support::bformat;

diff --git a/src/insets/insetcharstyle.C b/src/insets/insetcharstyle.C
index da213d2483f6ed5da3ae642f87c54248c6bf21f5..910350243cdc87a3660326791d1b4dc9d4c7f63c 100644 (file)
--- a/src/insets/insetcharstyle.C
+++ b/src/insets/insetcharstyle.C
@@ -27,7 +27,8 @@
 
 #include "frontends/font_metrics.h"
 #include "frontends/Painter.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
 
 
 using std::string;

diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C
index a1a28733be77a352786c2f48025517782e798daf..77a357b05eec3321777c47dfed2bf7bf1fa9bed6 100644 (file)
--- a/src/insets/insetcommand.C
+++ b/src/insets/insetcommand.C
@@ -19,7 +19,7 @@
 #include "lyxlex.h"
 #include "metricsinfo.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 
 using std::string;

diff --git a/src/insets/insetert.C b/src/insets/insetert.C
index cddd553b4803f838396b77bfe41a18b7dd42197f..b3d14d210fe9ecb8565dfabec941cfeb27b03023 100644 (file)
--- a/src/insets/insetert.C
+++ b/src/insets/insetert.C
@@ -29,7 +29,7 @@
 #include "frontends/Alert.h"
 #include "frontends/LyXView.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 using lyx::pos_type;
 

diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C
index 822893a403bed53bd6c7a224cd18c5980f7e911e..b4548c62501c2d17680b1ce274221969e4645035 100644 (file)
--- a/src/insets/insetexternal.C
+++ b/src/insets/insetexternal.C
@@ -43,10 +43,10 @@
 #include "support/lyxlib.h"
 #include "support/tostr.h"
 #include "support/translator.h"
-#include "support/std_sstream.h"
 
 #include <boost/bind.hpp>
 
+#include <sstream>
 
 namespace support = lyx::support;
 namespace external = lyx::external;

diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index 41da3b33a9aaf25a36e5c03b10cb248381ac3239..41d7dffe8efacbc9138ddca60c4f13ed1fdbbaba 100644 (file)
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -32,7 +32,8 @@
 
 #include "support/lstrings.h"
 #include "support/tostr.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
 
 using lyx::support::contains;
 

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index 34db409c60fb29faf7a97db0948d46e3c8acd18a..fe29faf3ba076b397f9aabd04e8d0a38aaa2262e 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -77,12 +77,14 @@ TODO
 #include "support/os.h"
 #include "support/systemcall.h"
 #include "support/tostr.h"
-#include "support/std_sstream.h"
 
 #include <boost/bind.hpp>
 #include <boost/tuple/tuple.hpp>
 
+#include <sstream>
+
 namespace support = lyx::support;
+
 using lyx::support::AbsolutePath;
 using lyx::support::bformat;
 using lyx::support::ChangeExtension;

diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index da8f3c795c4994b4c60a119b337f592c974aad55..a8bd6600b9343cc0c3bc6fe5054c36937b753a7f 100644 (file)
--- a/src/insets/insetinclude.C
+++ b/src/insets/insetinclude.C
@@ -49,7 +49,8 @@
 #include <boost/bind.hpp>
 
 #include "support/std_ostream.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
 
 using lyx::support::AddName;
 using lyx::support::AbsolutePath;

diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C
index 0dc70914030a34d19247c882d5832be75c0b3b4e..3be5403fb54ccff288c0a69101b7009932e47a06 100644 (file)
--- a/src/insets/insetnote.C
+++ b/src/insets/insetnote.C
@@ -27,9 +27,9 @@
 #include "paragraph.h"
 
 #include "support/lyxalgo.h"
-#include "support/std_sstream.h"
 #include "support/translator.h"
 
+#include <sstream>
 
 using std::string;
 using std::auto_ptr;

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 91be3b9d370ac60e70342eb237d794dc92db17cf..515f95cf227b5399f3e7718181774e6f1dbdb5b2 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -37,8 +37,7 @@
 #include "frontends/LyXView.h"
 #include "frontends/Painter.h"
 
-#include "support/std_sstream.h"
-
+#include <sstream>
 #include <iostream>
 
 using lyx::graphics::PreviewLoader;

diff --git a/src/insets/insetvspace.C b/src/insets/insetvspace.C
index 5559fa325bda2b9322d63d2b1fe088fba8a320b8..5946dd70e26f6cf58b4dfe07fe9ba0091fba01c9 100644 (file)
--- a/src/insets/insetvspace.C
+++ b/src/insets/insetvspace.C
@@ -27,7 +27,7 @@
 #include "frontends/font_metrics.h"
 #include "frontends/Painter.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 using std::istringstream;
 using std::ostream;

diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C
index a307258d99a1d6c83aef5005f56d2d2f9b70ad19..0fa0ad530662f96fc65587b104ad53a4d70f6fe5 100644 (file)
--- a/src/insets/insetwrap.C
+++ b/src/insets/insetwrap.C
@@ -28,9 +28,9 @@
 #include "outputparams.h"
 #include "paragraph.h"
 
-#include "support/std_sstream.h"
 #include "support/tostr.h"
 
+#include <sstream>
 
 using std::string;
 using std::endl;

diff --git a/src/kbmap.C b/src/kbmap.C
index 280a72df58878e770b978496b0aabe17c014cb94..9377be0c436b01e77684c83b2b0c34d9b58b0083 100644 (file)
--- a/src/kbmap.C
+++ b/src/kbmap.C
@@ -23,7 +23,8 @@
 #include "frontends/LyXKeySym.h"
 
 #include "support/filetools.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
 
 using lyx::support::i18nLibFileSearch;
 
@@ -293,14 +294,14 @@ string const kb_keymap::printbindings(FuncRequest const & func) const
 }
 
 
-kb_keymap::Bindings 
+kb_keymap::Bindings
 kb_keymap::findbindings(FuncRequest const & func) const
 {
        return findbindings(func, kb_sequence(0, 0));
 }
 
 
-kb_keymap::Bindings 
+kb_keymap::Bindings
 kb_keymap::findbindings(FuncRequest const & func,
                        kb_sequence const & prefix) const
 {
@@ -313,7 +314,7 @@ kb_keymap::findbindings(FuncRequest const & func,
                if (cit->table.get()) {
                        kb_sequence seq = prefix;
                        seq.addkey(cit->code, cit->mod.first);
-                       Bindings res2 = 
+                       Bindings res2 =
                                cit->table->findbindings(func, seq);
                        res.insert(res.end(), res2.begin(), res2.end());
                } else if (cit->func == func) {
@@ -333,9 +334,9 @@ kb_keymap::find1keybinding(FuncRequest const & func) const
        Table::const_iterator end = table.end();
        for (Table::const_iterator cit = table.begin();
            cit != end; ++cit) {
-               if (!cit->table.get() && cit->func == func) 
+               if (!cit->table.get() && cit->func == func)
                        return std::make_pair(cit->code.get(), cit->mod.first);
        }
 
        return std::make_pair<LyXKeySym const *, key_modifier::state>(0, key_modifier::none);
-}      
+}

diff --git a/src/lyxfind.C b/src/lyxfind.C
index cfee2c9f04435a7be031677ef35ef4764c07eef2..0c4c9e9eec1b17d62916a8f13d39e0828b188a0c 100644 (file)
--- a/src/lyxfind.C
+++ b/src/lyxfind.C
@@ -33,7 +33,7 @@
 #include "support/textutils.h"
 #include "support/tostr.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 using lyx::support::lowercase;
 using lyx::support::uppercase;

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 8ddc66ad54080466f2492fc8822ff531945c3619..cc05bac8f05f943db72db600b5688759570d8ad7 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -25,7 +25,8 @@
 #include "lyxrc.h"
 
 #include "support/lstrings.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
 
 using lyx::support::ascii_lowercase;
 using lyx::support::bformat;

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 2b268bc98bc0a7a42eeeb1ddd25c653fc8d69fe1..934cb51fec74eda22eacc55d81683c132233c91a 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -87,9 +87,10 @@
 #include "support/path_defines.h"
 #include "support/systemcall.h"
 #include "support/tostr.h"
-#include "support/std_sstream.h"
 #include "support/os.h"
 
+#include <sstream>
+
 using bv_funcs::freefont2string;
 
 using lyx::support::AddName;
@@ -299,7 +300,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
 
        // the default error message if we disable the command
        setStatusMessage(N_("Command disabled"));
-       if (!flag.enabled()) 
+       if (!flag.enabled())
                return flag;
 
        // Check whether we need a buffer

diff --git a/src/lyxgluelength.C b/src/lyxgluelength.C
index c38c814d22c5d957143f008b350ab33d62fe48aa..bd76faffe5c9838b498865116053c8a520e098c4 100644 (file)
--- a/src/lyxgluelength.C
+++ b/src/lyxgluelength.C
@@ -15,7 +15,7 @@
 #include "lyxgluelength.h"
 #include "lengthcommon.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 using std::ostringstream;
 using std::string;

diff --git a/src/lyxlength.C b/src/lyxlength.C
index 8ca01187834022cab315abb9dc14cd02622d6756..eaee147fc4e2e28f91a57d0837bef1d6b45150fd 100644 (file)
--- a/src/lyxlength.C
+++ b/src/lyxlength.C
@@ -19,8 +19,8 @@
 #include "lengthcommon.h"
 #include "lyxrc.h"
 
+#include <sstream>
 
-#include "support/std_sstream.h"
 
 using std::abs;
 using std::ostringstream;

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index d3d2d442dc0a2908954178f048d2090bf10e96aa..b812e68e07336be4788410dfa04e3838bcaf1132 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,11 @@
+2004-07-24  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * math_support.C, math_parser.C, math_nestinset.C, math_macrotable.C: 
+       * math_hullinset.C, math_gridinset.C, math_factory.C:
+       * math_extern.C, math_autocorrect.C, math_arrayinset.C:
+       * formulamacro.C, command_inset.C: change "support/std_sstream.h"
+       to <sstream>
+
 2004-07-24  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
        * math_macrotable.C (expand): n is now size_t

diff --git a/src/mathed/command_inset.C b/src/mathed/command_inset.C
index b38f46115a053813f40fb44887e49f10cc337938..076dfd34b9a08e80471a16eee64cb5f6fc48398d 100644 (file)
--- a/src/mathed/command_inset.C
+++ b/src/mathed/command_inset.C
@@ -16,7 +16,7 @@
 #include "dispatchresult.h"
 #include "funcrequest.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 using std::string;
 using std::auto_ptr;

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index 9919748e989fd93158d9f32fa9ec96e8913057a0..303cb7049044f092edb6d15bb3f0b1bbdc98f48b 100644 (file)
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -28,7 +28,8 @@
 #include "frontends/font_metrics.h"
 
 #include "support/lstrings.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
 
 using lyx::support::bformat;
 

diff --git a/src/mathed/math_arrayinset.C b/src/mathed/math_arrayinset.C
index 9e1ea21f42562467a2ac9cbc0c601cd0e7d7acf2..28dc9e9569dd349089858719912270d19b912f33 100644 (file)
--- a/src/mathed/math_arrayinset.C
+++ b/src/mathed/math_arrayinset.C
@@ -15,9 +15,9 @@
 #include "math_parser.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
-#include "support/std_sstream.h"
 
 #include <iterator>
+#include <sstream>
 
 using std::getline;
 

diff --git a/src/mathed/math_autocorrect.C b/src/mathed/math_autocorrect.C
index 986f3da9d8607093045b2e0fdf68ef9eed558d70..4d06c78259210d21900e5463474ca64c083cfc00 100644 (file)
--- a/src/mathed/math_autocorrect.C
+++ b/src/mathed/math_autocorrect.C
@@ -17,10 +17,10 @@
 #include "math_parser.h"
 #include "debug.h"
 
-#include "support/std_sstream.h"
 #include "support/filetools.h" //  LibFileSearch
 
 #include <fstream>
+#include <sstream>
 
 using lyx::support::LibFileSearch;
 

diff --git a/src/mathed/math_extern.C b/src/mathed/math_extern.C
index 99e381d78aaf7cee47c9e96e39c52135d44a4582..c33a53c3764a094df96e7d843cfe8f0e6b4b8dd2 100644 (file)
--- a/src/mathed/math_extern.C
+++ b/src/mathed/math_extern.C
@@ -31,12 +31,12 @@
 #include "math_stringinset.h"
 #include "math_symbolinset.h"
 #include "math_parser.h"
-#include "support/std_sstream.h"
 #include "debug.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 
 #include <algorithm>
+#include <sstream>
 
 using lyx::support::cmd_ret;
 using lyx::support::getVectorFromString;

diff --git a/src/mathed/math_factory.C b/src/mathed/math_factory.C
index acaa0ca69ea37fe276a16ff1c0869bba4fdf3116..3da237bd528201a84c1ce5488fa569ef598c94d4 100644 (file)
--- a/src/mathed/math_factory.C
+++ b/src/mathed/math_factory.C
@@ -57,13 +57,13 @@
 #include "debug.h"
 #include "math_support.h"
 
-#include "support/std_sstream.h"
 #include "support/filetools.h" // LibFileSearch
 #include "support/lstrings.h"
 
 #include "frontends/lyx_gui.h"
 
 #include <fstream>
+#include <sstream>
 
 using lyx::support::LibFileSearch;
 using lyx::support::split;

diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C
index 168dc625b2b2b5452ef9057a7f8e3f246c0f9f86..07325ab759e092b8b6ec9002c1f97a227476ef7c 100644 (file)
--- a/src/mathed/math_gridinset.C
+++ b/src/mathed/math_gridinset.C
@@ -26,10 +26,10 @@
 
 #include "frontends/Painter.h"
 
-#include "support/std_sstream.h"
-
 #include "insets/mailinset.h"
 
+#include <sstream>
+
 using std::endl;
 using std::max;
 using std::min;

diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C
index a39330fca1b6d10adeb6c5fd60013682f0ee9a43..b56dec9d2c70fb9b8414911e618de80382d843eb 100644 (file)
--- a/src/mathed/math_hullinset.C
+++ b/src/mathed/math_hullinset.C
@@ -40,10 +40,10 @@
 #include "graphics/PreviewImage.h"
 #include "graphics/PreviewLoader.h"
 
-#include "support/std_sstream.h"
-
 #include <boost/bind.hpp>
 
+#include <sstream>
+
 using lyx::cap::grabAndEraseSelection;
 
 using std::endl;

diff --git a/src/mathed/math_macrotable.C b/src/mathed/math_macrotable.C
index 09930bd598a87c07fdda8de60bfcb62dc4a1460e..f7bb45efcb5c3aa099dfdb255f10dbfde3dd1364 100644 (file)
--- a/src/mathed/math_macrotable.C
+++ b/src/mathed/math_macrotable.C
@@ -19,10 +19,10 @@
 #include "debug.h"
 #include "dociterator.h"
 
-#include "support/std_sstream.h"
-
 #include <boost/assert.hpp>
 
+#include <sstream>
+
 using std::endl;
 using std::istringstream;
 using std::map;

diff --git a/src/mathed/math_nestinset.C b/src/mathed/math_nestinset.C
index 9f501423e97d8966cc4a1715c42c3558a9784018..2f593493da8f272f5cbdd9611d253444ab5910ab 100644 (file)
--- a/src/mathed/math_nestinset.C
+++ b/src/mathed/math_nestinset.C
@@ -41,13 +41,14 @@
 #include "outputparams.h"
 #include "undo.h"
 
-#include "support/std_sstream.h"
 #include "support/lstrings.h"
 
 #include "frontends/Dialogs.h"
 #include "frontends/LyXView.h"
 #include "frontends/Painter.h"
 
+#include <sstream>
+
 using lyx::cap::copySelection;
 using lyx::cap::grabAndEraseSelection;
 using lyx::cap::cutSelection;

diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C
index 89ed19a2088fd6c75bd5bdc615bdc71883bda6a6..0264350e87bb209ba58a9a910fb9f919be713e43 100644 (file)
--- a/src/mathed/math_parser.C
+++ b/src/mathed/math_parser.C
@@ -62,9 +62,10 @@ following hack as starting point to write some macros:
 #include "ref_inset.h"
 
 #include "lyxlex.h"
-#include "support/std_sstream.h"
 #include "debug.h"
 
+#include <sstream>
+
 #ifndef CXX_GLOBAL_CSTD
 using std::atoi;
 #endif
@@ -1282,6 +1283,3 @@ void initParser()
        theCatcode[int('~')]  = catActive;
        theCatcode[int('%')]  = catComment;
 }
-
-
-

diff --git a/src/mathed/math_support.C b/src/mathed/math_support.C
index ea2ccd667d5061752cf5b3b035d2423b60fd9140..50163682547f204e7a84d1e6cb377628b0a5bc96 100644 (file)
--- a/src/mathed/math_support.C
+++ b/src/mathed/math_support.C
@@ -24,9 +24,8 @@
 #include "frontends/font_metrics.h"
 #include "frontends/lyx_gui.h"
 
-#include "support/std_sstream.h"
-
 #include <map>
+#include <sstream>
 
 
 using std::string;

diff --git a/src/paragraph.C b/src/paragraph.C
index 5657b2f77cd3c2578ca6de1c34d0eaa3f88b2304..66eebe04eb15c016a0d0e44005351b670c90175b 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -41,7 +41,6 @@
 #include "insets/insetoptarg.h"
 
 #include "support/lstrings.h"
-#include "support/std_sstream.h"
 #include "support/textutils.h"
 #include "support/tostr.h"
 
@@ -50,6 +49,7 @@
 
 #include <list>
 #include <stack>
+#include <sstream>
 
 using lyx::pos_type;
 

diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index 86db8b948b96807163a4521efd21cdb1961750dd..b2794d996adbd7bd655db5053a041450d99551f4 100644 (file)
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -30,8 +30,8 @@
 #include "support/filetools.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
-#include "support/std_sstream.h"
 
+#include <sstream>
 #include <vector>
 
 using lyx::pos_type;

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 27e34e2327311b6dd2dc6e42b9d11a183054244d..1d8fbc8cb2cc0f4a27940fd9459da132af247b8e 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,13 @@
+2004-07-24  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * tostr.C, lstrings.C, globbing.C, filetools.C: change
+       "support/std_sstream.h" to <sstream>
+
+       * Makefile.am (libsupport_la_SOURCES): delete std_sstream.h and
+       sstream.h
+       (std_sstream.h): delete file
+       (sstream.h): delete file
+
 2004-06-29  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * filetools.C (i18nLibFileSearch): honor case where LANGUAGE
@@ -10,10 +20,10 @@
        its po files when moved around; set default user directory to
        ~/Library/Preferences/LyX/ for LyX/Mac.
        (lyx_localedir): return the value that may have been computed in
-       setLyXPaths 
+       setLyXPaths
 
 2004-05-27  Kayvan Sylvan <kayvan@sylvan.com>
-       
+
        * Makefile.am (libsupport_la_SOURCES): remove reference to
        nt_defines.h
 

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 85b6e14916b78bd2b783a3f68121e7826b628ac2..7f12f2cc3c754ee5831febf8fdecdb4929085178 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -66,10 +66,8 @@ libsupport_la_SOURCES = \
        snprintf.c \
        socktools.C \
        socktools.h \
-       sstream.h \
        std_istream.h \
        std_ostream.h \
-       std_sstream.h \
        systemcall.C \
        systemcall.h \
        tempname.C \

diff --git a/src/support/filetools.C b/src/support/filetools.C
index 4d1cd6c8b271aeebd201104322ce1da901bca4ff..c9ea4562a86aeb1bcc048b51951ac1410e1e90aa 100644 (file)
--- a/src/support/filetools.C
+++ b/src/support/filetools.C
@@ -35,19 +35,19 @@
 #include "lyxlib.h"
 #include "os.h"
 
-#include "support/std_sstream.h"
-
 #include <boost/assert.hpp>
 #include <boost/regex.hpp>
 
+#include <fcntl.h>
+
 #include <cctype>
 #include <cstdlib>
 #include <cstdio>
-#include <fcntl.h>
 #include <cerrno>
 
 #include <utility>
 #include <fstream>
+#include <sstream>
 
 
 // Which part of this is still necessary? (JMarc).
@@ -335,7 +335,7 @@ i18nLibFileSearch(string const & dir, string const & name,
        string l;
        lang = split(lang, l, ':');
        while (!l.empty() && l != "C" && l != "POSIX") {
-               string const tmp = LibFileSearch(dir, 
+               string const tmp = LibFileSearch(dir,
                                                 token(l, '_', 0) + '_' + name,
                                                 ext);
                if (!tmp.empty())

diff --git a/src/support/globbing.C b/src/support/globbing.C
index b0d16e88e46e39772e7545478e656909de9240c5..b112db32ae0bd7174cddbd27f1a9dbd558c35af0 100644 (file)
--- a/src/support/globbing.C
+++ b/src/support/globbing.C
@@ -16,12 +16,13 @@
 
 #include "lstrings.h"
 #include "path.h"
-#include "std_sstream.h"
 
 #include <boost/regex.hpp>
 #include <boost/tokenizer.hpp>
 
-#include "glob.h"
+#include <glob.h>
+
+#include <sstream>
 
 using std::distance;
 using std::ostringstream;

diff --git a/src/support/lstrings.C b/src/support/lstrings.C
index c4182fb5a10ee38a34be9976d315923ea2d45ab2..9910d5400773e6108c693221e5ec77f769d03105 100644 (file)
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -12,7 +12,6 @@
 #include <config.h>
 
 #include "lstrings.h"
-#include "support/std_sstream.h"
 #include "debug.h"
 #include "lyxlib.h"
 #include "tostr.h"
@@ -26,6 +25,8 @@
 #include <cctype>
 #include <cstdlib>
 
+#include <sstream>
+
 using std::transform;
 using std::string;
 using std::vector;

diff --git a/src/support/sstream.h b/src/support/sstream.h
deleted file mode 100644 (file)
index ecc91bf..0000000
--- a/src/support/sstream.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/* This is part of libio/iostream, providing -*- C++ -*- input/output.
-Copyright (C) 2000 Free Software Foundation
-
-This file is part of the GNU IO Library.  This library is free
-software; you can redistribute it and/or modify it under the
-terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this library; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-As a special exception, if you link this library with files
-compiled with a GNU compiler to produce an executable, this does not cause
-the resulting executable to be covered by the GNU General Public License.
-This exception does not however invalidate any other reasons why
-the executable file might be covered by the GNU General Public License. */
-
-/* Written by Magnus Fromreide (magfr@lysator.liu.se). */
-
-/* Sligtly modified for use in The LyX Project.
-   Made to be usable with both std::string (as supplied with Gcc 2.95.2),
-   and with lyxstring. Dynamic casts have been replaced by static_casts.
-   One fix to avoid unsigned/signed warnings.
-
-   Lars Gullik Bjønnes (larsbj@lyx.org)
-*/
-
-#ifndef SSTREAM_H
-#define SSTREAM_H
-
-#include <string>
-#include <iostream>
-#include <streambuf.h>
-
-namespace std
-{
-  class stringbuf : public streambuf
-  {
-  public:
-    typedef char       char_type;
-    typedef int                int_type;
-    typedef streampos  pos_type;
-    typedef streamoff  off_type;
-
-    explicit stringbuf(int which=ios::in|ios::out) :
-      streambuf(which), buf(), mode(static_cast<ios::open_mode>(which)),
-      rpos(0), bufsize(1)
-    { }
-
-    explicit stringbuf(const std::string &s, int which=ios::in|ios::out) :
-      streambuf(which), buf(s), mode(static_cast<ios::open_mode>(which)),
-      bufsize(1)
-    {
-      if(mode & ios::in)
-       {
-         setg(&defbuf, &defbuf + bufsize, &defbuf + bufsize);
-       }
-      if(mode & ios::out)
-       {
-         setp(&defbuf, &defbuf + bufsize);
-       }
-      rpos = (mode & ios::ate ? s.size() : 0);
-    }
-
-    std::string str() const
-    {
-      const_cast<stringbuf*>(this)->sync();  // Sigh, really ugly hack
-      return buf;
-    };
-
-    void str(const std::string& s)
-    {
-      buf = s;
-      if(mode & ios::in)
-       {
-         gbump(egptr() - gptr());
-       }
-      if(mode & ios::out)
-       {
-         pbump(pbase() - pptr());
-       }
-      rpos = (mode & ios::ate ? s.size() : 0);
-    }
-
-  protected:
-    inline virtual int sync();
-    inline virtual int overflow(int = EOF);
-    inline virtual int underflow();
-  private:
-    std::string                        buf;
-    ios::open_mode             mode;
-    std::string::size_type     rpos;
-    streamsize                 bufsize;
-    char                       defbuf;
-  };
-
-  class stringstreambase : virtual public ios {
-  protected:
-    stringbuf __my_sb;
-  public:
-    std::string str() const
-    {
-      return static_cast<stringbuf*>(_strbuf)->str();
-    }
-    void str(const std::string& s)
-    {
-      clear();
-      static_cast<stringbuf*>(_strbuf)->str(s);
-    }
-
-    stringbuf* rdbuf()
-    {
-      return &__my_sb;
-    }
-  protected:
-    stringstreambase(int which) :
-      __my_sb(which)
-    {
-      init (&__my_sb);
-    }
-
-    stringstreambase(const std::string& s, int which) :
-      __my_sb(s, which)
-    {
-      init (&__my_sb);
-    }
-  };
-
-  class istringstream : public stringstreambase, public istream {
-  public:
-    istringstream(int which=ios::in) :
-      stringstreambase(which)
-    { }
-
-    istringstream(const std::string& s, int which=ios::in) :
-      stringstreambase(s, which)
-    { }
-  };
-
-  class ostringstream : public stringstreambase, public ostream {
-  public:
-    ostringstream(int which=ios::out) :
-      stringstreambase(which)
-    { }
-
-    ostringstream(const std::string& s, int which=ios::out) :
-      stringstreambase(s, which)
-    { }
-  };
-
-  class stringstream : public stringstreambase, public iostream {
-  public:
-    stringstream(int which=ios::in|ios::out) :
-      stringstreambase(which)
-    { }
-
-    stringstream(const std::string &s, int which=ios::in|ios::out) :
-      stringstreambase(s, which)
-    { }
-  };
-
-} // namespace std
-
-inline int stringbuf::sync()
-{
-  if((mode & ios::out) == 0)
-    return EOF;
-
-  streamsize n = pptr() - pbase();
-  if(n)
-    {
-      buf.replace(rpos, std::string::npos, pbase(), n);
-      //if(buf.size() - rpos != n)
-      if (buf.size() != n + rpos)
-       return EOF;
-      rpos += n;
-      pbump(-n);
-      gbump(egptr() - gptr());
-    }
-  return 0;
-}
-
-inline int stringbuf::overflow(int ch)
-{
-  if((mode & ios::out) == 0)
-    return EOF;
-
-  streamsize n = pptr() - pbase();
-
-  if(n && sync())
-    return EOF;
-
-  if(ch != EOF)
-    {
-      std::string::size_type oldSize = buf.size();
-
-      buf.replace(rpos, std::string::npos, 1, ch);
-      if(buf.size() - oldSize != 1)
-       return EOF;
-      ++rpos;
-    }
-  return 0;
-}
-
-inline int stringbuf::underflow()
-{
-  sync();
-  if((mode & ios::in) == 0)
-    {
-      return EOF;
-    }
-  if(rpos >= buf.size())
-    {
-      return EOF;
-    }
-
-  std::string::size_type n = egptr() - eback();
-  std::string::size_type s;
-
-  s = buf.copy(eback(), n, rpos);
-  pbump(pbase() - pptr());
-  gbump(eback() - gptr());
-  int res = (0377 & buf[rpos]);
-  rpos += s;
-  return res;
-}
-
-#endif /* not __STRSTREAM__ */

diff --git a/src/support/std_sstream.h b/src/support/std_sstream.h
deleted file mode 100644 (file)
index 782cdf0..0000000
--- a/src/support/std_sstream.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// -*- C++ -*-
-/**
- * \file std_sstream.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Lars Gullik Bjønnes
- * \author Jean-Marc Lasgouttes
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#ifndef STD_SSTREAM_H
-#define STD_SSTREAM_H
-
-#ifdef HAVE_SSTREAM
-#include <sstream>
-#else
-#include "support/sstream.h"
-#endif
-
-#endif // NOT STD_SSTREAM_H

diff --git a/src/support/tostr.C b/src/support/tostr.C
index da5b7aaa8d98a0beada6ccb9722fccd569dc5c09..81058d5d87959de332856034a168b64c80cfabb5 100644 (file)
--- a/src/support/tostr.C
+++ b/src/support/tostr.C
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 using std::string;
 using std::ostringstream;

diff --git a/src/tabular.C b/src/tabular.C
index 06e3aa1772955094839f95f88b2b2839053bd4eb..98411af6604372cf37fbbbbb16bef52202870c09 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -32,7 +32,7 @@
 #include "support/lstrings.h"
 #include "support/tostr.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 using lyx::support::ltrim;
 using lyx::support::prefixIs;

diff --git a/src/text.C b/src/text.C
index 15374a2f3d03d6711323191feaea207366f21ad2..daa001ce32893bb9c060b31030d8f3d63835d0a2 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -66,7 +66,8 @@
 #include "support/lstrings.h"
 #include "support/textutils.h"
 #include "support/tostr.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
 
 using lyx::par_type;
 using lyx::pos_type;

diff --git a/src/text2.C b/src/text2.C
index 1988bd3e665937f3b5f07474153a29364318ea0f..dfcac666b53251c1211cc756922b678a3495d191 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -58,7 +58,8 @@
 #include "support/lstrings.h"
 #include "support/textutils.h"
 #include "support/tostr.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
 
 using lyx::par_type;
 using lyx::pos_type;

diff --git a/src/text3.C b/src/text3.C
index 5709367613cc03d8ba44520920bcc948be8e2bfb..2b4f91be62e031762884d29a1c0740ed425fa974 100644 (file)
--- a/src/text3.C
+++ b/src/text3.C
@@ -54,12 +54,12 @@
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "support/tostr.h"
-#include "support/std_sstream.h"
 
 #include "mathed/math_hullinset.h"
 #include "mathed/math_macrotemplate.h"
 
 #include <clocale>
+#include <sstream>
 
 using lyx::pos_type;