From cba1fa5848f23cdddfe5f7b1d98f00a0039b2170 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Fri, 5 Sep 2003 22:17:02 +0000 Subject: [PATCH] Add missing headers. With thanks to Martin... git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7688 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BranchList.C | 1 + src/ChangeLog | 18 ++++++++++++++++++ src/factory.C | 11 +++++++---- src/frontends/Alert_pimpl.h | 2 +- src/frontends/ChangeLog | 4 ++++ src/frontends/controllers/ChangeLog | 5 +++++ src/frontends/controllers/biblio.C | 2 ++ src/frontends/controllers/frnt_lang.C | 2 ++ src/frontends/xforms/ChangeLog | 7 +++++++ src/frontends/xforms/Color.C | 2 ++ src/frontends/xforms/ColorHandler.C | 2 ++ src/frontends/xforms/FontInfo.C | 2 ++ src/frontends/xforms/xfont_loader.C | 2 ++ src/graph.C | 1 + src/ispell.C | 2 ++ src/lastfiles.C | 2 +- src/lyx_cb.C | 1 + src/lyxserver.C | 10 ++++++++-- src/texrow.C | 1 + src/text3.C | 1 + src/vspace.C | 7 ++----- 21 files changed, 72 insertions(+), 13 deletions(-) diff --git a/src/BranchList.C b/src/BranchList.C index b1183c7312..2198a7cc70 100644 --- a/src/BranchList.C +++ b/src/BranchList.C @@ -13,6 +13,7 @@ #include "BranchList.h" #include "support/LAssert.h" +#include using std::bind2nd; using std::remove_if; diff --git a/src/ChangeLog b/src/ChangeLog index 9c6a3df65c..0faef9cb16 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,21 @@ +2003-09-05 Angus Leeming + + * 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 + + * 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 Changes most place everywhere due to the removal of using directives diff --git a/src/factory.C b/src/factory.C index e7fbcee7f5..5fad59694e 100644 --- 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 8be61575f2..fa153a23ce 100644 --- 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 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 fdeda321ef..d71ea59e04 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,3 +1,7 @@ +2003-09-05 Martin Vermeer + + * Alert_pimpl.h: re-add missing system headers, needed for 2.95.2. + 2003-09-05 Angus Leeming * WorkArea.C: removed. It was entirely empty. diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index fea3de36d4..dec5fc0980 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,8 @@ +2003-09-05 Martin Vermeer + + * biblio.C: + * frnt_lang.C: re-add missing system headers, needed for 2.95.2. + 2003-09-05 Angus Leeming * 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 e77ba9557e..3ee1568c37 100644 --- a/src/frontends/controllers/biblio.C +++ b/src/frontends/controllers/biblio.C @@ -21,6 +21,8 @@ #include +#include + using namespace lyx::support; using std::ostringstream; diff --git a/src/frontends/controllers/frnt_lang.C b/src/frontends/controllers/frnt_lang.C index 4be8a20cd7..9011a2d374 100644 --- 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 + using std::vector; namespace { diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 61e264b94a..df86059187 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,10 @@ +2003-09-05 Martin Vermeer + + * Color.C: + * ColorHandler.C: + * FontInfo.C: + * xfont_loader.C: re-add missing system headers, needed for 2.95.2. + 2003-09-05 Angus Leeming * combox.h: diff --git a/src/frontends/xforms/Color.C b/src/frontends/xforms/Color.C index 145241f833..102bfd8187 100644 --- 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 #include namespace support = lyx::support; diff --git a/src/frontends/xforms/ColorHandler.C b/src/frontends/xforms/ColorHandler.C index 7ad8090a20..aa2877ef15 100644 --- a/src/frontends/xforms/ColorHandler.C +++ b/src/frontends/xforms/ColorHandler.C @@ -22,6 +22,8 @@ #include +#include + using namespace lyx::support; #ifndef CXX_GLOBAL_CSTD diff --git a/src/frontends/xforms/FontInfo.C b/src/frontends/xforms/FontInfo.C index 262627f0ed..8d0eb0f902 100644 --- a/src/frontends/xforms/FontInfo.C +++ b/src/frontends/xforms/FontInfo.C @@ -24,6 +24,8 @@ #include "lyx_forms.h" +#include + using namespace lyx::support; using std::abs; diff --git a/src/frontends/xforms/xfont_loader.C b/src/frontends/xforms/xfont_loader.C index 9a8e9b7a26..67f91a4bd8 100644 --- a/src/frontends/xforms/xfont_loader.C +++ b/src/frontends/xforms/xfont_loader.C @@ -23,6 +23,8 @@ #include "lyx_forms.h" +#include + using namespace lyx::support; using std::endl; diff --git a/src/graph.C b/src/graph.C index b7db6c5633..876394da75 100644 --- a/src/graph.C +++ b/src/graph.C @@ -11,6 +11,7 @@ #include "graph.h" #include "format.h" +#include using std::queue; using std::vector; diff --git a/src/ispell.C b/src/ispell.C index 365522f8a4..528a6130dc 100644 --- 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 #endif +#include using namespace lyx::support; diff --git a/src/lastfiles.C b/src/lastfiles.C index 2011a7fb6c..2c30467384 100644 --- a/src/lastfiles.C +++ b/src/lastfiles.C @@ -15,10 +15,10 @@ #include "support/FileInfo.h" +#include #include #include - using namespace lyx::support; using std::ifstream; diff --git a/src/lyx_cb.C b/src/lyx_cb.C index ac77cea6c9..54d3313145 100644 --- a/src/lyx_cb.C +++ b/src/lyx_cb.C @@ -40,6 +40,7 @@ #include "support/os.h" #include "support/systemcall.h" +#include #include using namespace lyx::support; diff --git a/src/lyxserver.C b/src/lyxserver.C index 0f38a45204..aee81d0de5 100644 --- a/src/lyxserver.C +++ b/src/lyxserver.C @@ -39,8 +39,6 @@ #include -#include - #include "lyxserver.h" #include "debug.h" #include "lyxfunc.h" @@ -48,10 +46,18 @@ #include "support/lyxlib.h" #include "frontends/lyx_gui.h" +#include +#include +#include + #ifdef __EMX__ +#include +#include #define OS2EMX_PLAIN_CHAR #define INCL_DOSNMPIPES #define INCL_DOSERRORS +#include +#include "support/os2_errortable.h" #endif diff --git a/src/texrow.C b/src/texrow.C index 9b760772e2..de53933d2d 100644 --- a/src/texrow.C +++ b/src/texrow.C @@ -15,6 +15,7 @@ #include "texrow.h" #include "debug.h" +#include using std::find_if; using std::endl; diff --git a/src/text3.C b/src/text3.C index 4112c9bf5c..94b988f437 100644 --- a/src/text3.C +++ b/src/text3.C @@ -39,6 +39,7 @@ #include "undo_funcs.h" #include "text_funcs.h" +#include using namespace lyx::support; using namespace bv_funcs; diff --git a/src/vspace.C b/src/vspace.C index 2fe08c4e1b..7e44280950 100644 --- 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. -- 2.39.2