Add missing headers. With thanks to Martin...

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

diff --git a/src/BranchList.C b/src/BranchList.C
index b1183c7312946224d86987697b11e3217c4b0565..2198a7cc70ab6347c177f2a0f4a97c34516e12cb 100644 (file)
--- a/src/BranchList.C
+++ b/src/BranchList.C
@@ -13,6 +13,7 @@
 #include "BranchList.h"
 #include "support/LAssert.h"
 
+#include <functional>
 
 using std::bind2nd;
 using std::remove_if;

diff --git a/src/ChangeLog b/src/ChangeLog
index 9c6a3df65c8e3618597742122b543765686c53ff..0faef9cb16c26f96c91db4d21b392e40764a5a3e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,21 @@
+2003-09-05  Angus Leeming  <leeming@lyx.org>
+
+       * factory.C (createInset):
+       * vspace.C (c-tor): replace sscanf call with an istringstream.
+       * ispell.C: re-add missing HP/UX headers.
+       * lyxserver.C: re-add missing  os2 headers.
+
+2003-09-05  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * BranchList.C:
+       * graph.C:
+       * ispell.C:
+       * lastfiles.C:
+       * lyx_cb.C:
+       * lyxserver.C:
+       * texrow.C:
+       * text3.C: re-add missing system headers, needed for 2.95.2.
+
 2003-09-05  Angus Leeming  <leeming@lyx.org>
 
        Changes most place everywhere due to the removal of using directives

diff --git a/src/factory.C b/src/factory.C
index e7fbcee7f5c9621077655afdd0048a8a285de88d..5fad59694e98880c556d52ecedcbc90515855e3b 100644 (file)
--- a/src/factory.C
+++ b/src/factory.C
@@ -50,12 +50,13 @@
 #include "frontends/Dialogs.h"
 #include "frontends/LyXView.h"
 #include "support/lstrings.h"
-
+#include "support/std_sstream.h"
 
 using namespace lyx::support;
 
 using std::endl;
 
+
 InsetOld * createInset(FuncRequest const & cmd)
 {
        BufferView * bv = cmd.view();
@@ -141,9 +142,11 @@ InsetOld * createInset(FuncRequest const & cmd)
 
        case LFUN_TABULAR_INSERT:
                if (!cmd.argument.empty()) {
-                       int r = 2;
-                       int c = 2;
-                       ::sscanf(cmd.argument.c_str(),"%d%d", &r, &c);
+                       std::istringstream ss(cmd.argument);
+                       int r, c;
+                       ss >> r >> c;
+                       if (r <= 0) r = 2;
+                       if (c <= 0) c = 2;
                        return new InsetTabular(*bv->buffer(), r, c);
                }
                bv->owner()->getDialogs().show("tabularcreate");

diff --git a/src/frontends/Alert_pimpl.h b/src/frontends/Alert_pimpl.h
index 8be61575f2892f431daff8f71973dcdda7b326f9..fa153a23cec22af8747b2c92c49d57aec0539718 100644 (file)
--- a/src/frontends/Alert_pimpl.h
+++ b/src/frontends/Alert_pimpl.h
@@ -12,7 +12,7 @@
 // GUI-specific implementations
 
 #include "support/std_string.h"
-
+#include <utility>
 
 int prompt_pimpl(string const & title, string const & question,
            int default_button, int escape_button,

diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog
index fdeda321ef992119d2f2a0c1a7da28015177a07b..d71ea59e046a8a984ec1306e3969c6505c109e7e 100644 (file)
--- a/src/frontends/ChangeLog
+++ b/src/frontends/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-05  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * Alert_pimpl.h: re-add missing system headers, needed for 2.95.2.
+
 2003-09-05  Angus Leeming  <leeming@lyx.org>
 
        * WorkArea.C: removed. It was entirely empty.

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index fea3de36d4e0999c92b4e9f45d7925ffbce8600f..dec5fc0980d532e3213ae06e81fd7e7b63d2260e 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-05  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * biblio.C:
+       * frnt_lang.C: re-add missing system headers, needed for 2.95.2.
+
 2003-09-05  Angus Leeming  <leeming@lyx.org>
 
        * GUI.h: ensure that the header file can be compiled stand-alone.

diff --git a/src/frontends/controllers/biblio.C b/src/frontends/controllers/biblio.C
index e77ba9557e3b5f6c98342e12ed2cb0932f13476e..3ee1568c370f2c1cdde6295c0c6fa4dded919a0d 100644 (file)
--- a/src/frontends/controllers/biblio.C
+++ b/src/frontends/controllers/biblio.C
@@ -21,6 +21,8 @@
 
 #include <boost/regex.hpp>
 
+#include <algorithm>
+
 using namespace lyx::support;
 
 using std::ostringstream;

diff --git a/src/frontends/controllers/frnt_lang.C b/src/frontends/controllers/frnt_lang.C
index 4be8a20cd7e99458f658b8c5a2a27e6de9a85738..9011a2d374d0343b13860b1578e4df389e7518e3 100644 (file)
--- a/src/frontends/controllers/frnt_lang.C
+++ b/src/frontends/controllers/frnt_lang.C
@@ -15,6 +15,8 @@
 #include "gettext.h"
 #include "language.h"
 
+#include <algorithm>
+
 using std::vector;
 
 namespace {

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 61e264b94a2e3df5f6cfdbc4c4c0dd2484b944ee..df860591874aa282fbbd6f497944d10c6cf6d44a 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-05  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * Color.C:
+       * ColorHandler.C:
+       * FontInfo.C:
+       * xfont_loader.C: re-add missing system headers, needed for 2.95.2.
+
 2003-09-05  Angus Leeming  <leeming@lyx.org>
 
        * combox.h:

diff --git a/src/frontends/xforms/Color.C b/src/frontends/xforms/Color.C
index 145241f8336ed8b36667c06e5e9fd15c5eeca372..102bfd818742cd60b68de46e093cf73c1df5589e 100644 (file)
--- a/src/frontends/xforms/Color.C
+++ b/src/frontends/xforms/Color.C
@@ -17,6 +17,8 @@
 #include "lyx_forms.h"
 
 #include "support/std_sstream.h"
+
+#include <cmath>
 #include <iomanip>
 
 namespace support = lyx::support;

diff --git a/src/frontends/xforms/ColorHandler.C b/src/frontends/xforms/ColorHandler.C
index 7ad8090a20d6189c8f3ba202ce91ad316524e797..aa2877ef1514c6c2fa6e2ac96d55e2211cac7749 100644 (file)
--- a/src/frontends/xforms/ColorHandler.C
+++ b/src/frontends/xforms/ColorHandler.C
@@ -22,6 +22,8 @@
 
 #include <boost/scoped_array.hpp>
 
+#include <cmath>
+
 using namespace lyx::support;
 
 #ifndef CXX_GLOBAL_CSTD

diff --git a/src/frontends/xforms/FontInfo.C b/src/frontends/xforms/FontInfo.C
index 262627f0edf7ff096b348a1038f1d2385cc0f55b..8d0eb0f902410d650dccd4e742eeb5a2cfd8a7b8 100644 (file)
--- a/src/frontends/xforms/FontInfo.C
+++ b/src/frontends/xforms/FontInfo.C
@@ -24,6 +24,8 @@
 
 #include "lyx_forms.h"
 
+#include <cmath>
+
 using namespace lyx::support;
 
 using std::abs;

diff --git a/src/frontends/xforms/xfont_loader.C b/src/frontends/xforms/xfont_loader.C
index 9a8e9b7a264f204db38541e1f19f17e8d5c76a93..67f91a4bd8cdf6ce23b68fc60d7777e9c270402e 100644 (file)
--- a/src/frontends/xforms/xfont_loader.C
+++ b/src/frontends/xforms/xfont_loader.C
@@ -23,6 +23,8 @@
 
 #include "lyx_forms.h"
 
+#include <algorithm>
+
 using namespace lyx::support;
 
 using std::endl;

diff --git a/src/graph.C b/src/graph.C
index b7db6c563379c2a9bc8bad9fe252260c16c98854..876394da753d095c7040d67c72ac2c6dfcfe250b 100644 (file)
--- a/src/graph.C
+++ b/src/graph.C
@@ -11,6 +11,7 @@
 #include "graph.h"
 #include "format.h"
 
+#include <algorithm>
 
 using std::queue;
 using std::vector;

diff --git a/src/ispell.C b/src/ispell.C
index 365522f8a496d64246555e0da27bfe648addf3ae..528a6130dc2ab784b17e27961cab2771ee2d479a 100644 (file)
--- a/src/ispell.C
+++ b/src/ispell.C
@@ -24,7 +24,9 @@
 
 // HP-UX 11.x doesn't have this header
 #ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
 #endif
+#include <sys/time.h>
 
 using namespace lyx::support;
 

diff --git a/src/lastfiles.C b/src/lastfiles.C
index 2011a7fb6c66d2a45c1bbab35cdc90fe5aec0189..2c30467384bc60c000833bf0244a1e0de28fc506 100644 (file)
--- a/src/lastfiles.C
+++ b/src/lastfiles.C
@@ -15,10 +15,10 @@
 
 #include "support/FileInfo.h"
 
+#include <algorithm>
 #include <fstream>
 #include <iterator>
 
-
 using namespace lyx::support;
 
 using std::ifstream;

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index ac77cea6c9cd4fd50bc1cb1e8aa012e092238724..54d331314569b9a4791023ac4fe44ca17edab87c 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -40,6 +40,7 @@
 #include "support/os.h"
 #include "support/systemcall.h"
 
+#include <cerrno>
 #include <fstream>
 
 using namespace lyx::support;

diff --git a/src/lyxserver.C b/src/lyxserver.C
index 0f38a4520472784cddbfd2f7bb93ea2d1e7e0604..aee81d0de593119131bd9bdb90107fe57c251dc1 100644 (file)
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -39,8 +39,6 @@
 
 #include <config.h>
 
-#include <fcntl.h>
-
 #include "lyxserver.h"
 #include "debug.h"
 #include "lyxfunc.h"
@@ -48,10 +46,18 @@
 #include "support/lyxlib.h"
 #include "frontends/lyx_gui.h"
 
+#include <cerrno>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 #ifdef __EMX__
+#include <cstdlib>
+#include <io.h>
 #define OS2EMX_PLAIN_CHAR
 #define INCL_DOSNMPIPES
 #define INCL_DOSERRORS
+#include <os2.h>
+#include "support/os2_errortable.h"
 #endif
 
 

diff --git a/src/texrow.C b/src/texrow.C
index 9b760772e2f74a5ab726e4f959ee34fec5fa5a38..de53933d2d304072463f305f9e2e47c104b2dccc 100644 (file)
--- a/src/texrow.C
+++ b/src/texrow.C
@@ -15,6 +15,7 @@
 #include "texrow.h"
 #include "debug.h"
 
+#include <algorithm>
 
 using std::find_if;
 using std::endl;

diff --git a/src/text3.C b/src/text3.C
index 4112c9bf5c9ea4b1924b6badf83966b53cf10b43..94b988f437e2ec9273685d8dc1e193998b4f9b2f 100644 (file)
--- a/src/text3.C
+++ b/src/text3.C
@@ -39,6 +39,7 @@
 #include "undo_funcs.h"
 #include "text_funcs.h"
 
+#include <clocale>
 
 using namespace lyx::support;
 using namespace bv_funcs;

diff --git a/src/vspace.C b/src/vspace.C
index 2fe08c4e1b403abe0aa4ea29465ba5d03a53ea34..7e44280950995bf6679c0cfc2be6fa4780fdd930 100644 (file)
--- a/src/vspace.C
+++ b/src/vspace.C
@@ -18,12 +18,8 @@
 
 #include "support/lstrings.h"
 
-
 using namespace lyx::support;
 
-#ifndef CXX_GLOBAL_CSTD
-using std::sscanf;
-#endif
 
 namespace {
 
@@ -357,7 +353,8 @@ VSpace::VSpace(string const & data)
        else if (prefixIs (input, "bigskip"))    kind_ = BIGSKIP;
        else if (prefixIs (input, "vfill"))      kind_ = VFILL;
        else if (isValidGlueLength(input, &len_)) kind_ = LENGTH;
-       else if (sscanf(input.c_str(), "%lf", &value) == 1) {
+       else if (isStrDbl(input)) {
+               value = strToDbl(input);
                // This last one is for reading old .lyx files
                // without units in added_space_top/bottom.
                // Let unit default to centimeters here.