diff --git a/ChangeLog b/ChangeLog index e9d5589d5a..a8b5113dfd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,39 @@ +2000-10-02 John Levon + + * src/frontends/gnome/FormCitation.h: + * src/frontends/gnome/FormCopyright.h: + * src/frontends/gnome/FormIndex.h: + * src/frontends/gnome/FormPrint.h: + * src/frontends/gnome/FormToc.h: + * src/frontends/gnome/FormUrl.h: + * src/frontends/kde/FormCitation.h: + * src/frontends/kde/FormCopyright.h: + * src/frontends/kde/FormIndex.h: + * src/frontends/kde/FormRef.h: + * src/frontends/kde/FormToc.h: + * src/frontends/kde/FormUrl.h: fix remaining users of + support/utility.hpp + +2000-10-02 Jean-Marc Lasgouttes + + * src/buffer.C (linuxDocHandleFootnote): remove const modifier + from depth argument. + (DocBookHandleCaption): ditto. + (DocBookHandleFootnote): ditto. + (SimpleDocBookOnePar): ditto. + + * src/frontends/xforms/FormDocument.h (form): remove extra + FormDocument:: qualifier. + + * sigc++/macros/basic_signal.h.m4: remove erroneous virtual + destructor. + * sigc++/handle.h: ditto. + + * src/lyx_gui_misc.C: add "using" directive. + + * src/cheaders/cstddef: new file, needed by the boost library (for + compaq cxx). + 2000-10-02 Juergen Vigna * src/insets/insettext.C (SetFont): better support. @@ -157,7 +193,7 @@ * lib/images/*: rename a bunch of icons to match Dekel converter changes. - * src/buffer.C (SimpleLinuxDocOnePar): add a const qualifier to + * src/buffer.h (SimpleLinuxDocOnePar): remove const qualifier to last parameter. * src/frontends/xforms/FormBase.C (disconnect): remove bogus test. @@ -9806,4 +9842,3 @@ * po/pt.po: Three errors: l.533 and l.538 format specification error l. 402 duplicate entry, I just deleted it. - diff --git a/po/POTFILES.in b/po/POTFILES.in index dc947f955b..f9dcbb6ad1 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -64,19 +64,6 @@ src/frontends/xforms/FormPrint.C src/frontends/xforms/form_print.C src/frontends/xforms/FormRef.C src/frontends/xforms/form_ref.C -src/frontends/xforms/forms/form_citation.C -src/frontends/xforms/forms/form_copyright.C -src/frontends/xforms/forms/form_document.C -src/frontends/xforms/forms/form_error.C -src/frontends/xforms/forms/form_graphics.C -src/frontends/xforms/forms/form_index.C -src/frontends/xforms/forms/form_paragraph.C -src/frontends/xforms/forms/form_preferences.C -src/frontends/xforms/forms/form_print.C -src/frontends/xforms/forms/form_ref.C -src/frontends/xforms/forms/form_tabular.C -src/frontends/xforms/forms/form_toc.C -src/frontends/xforms/forms/form_url.C src/frontends/xforms/FormTabular.C src/frontends/xforms/form_tabular.C src/frontends/xforms/FormToc.C diff --git a/sigc++/handle.h b/sigc++/handle.h index cbacccf483..d440d82ae1 100644 --- a/sigc++/handle.h +++ b/sigc++/handle.h @@ -85,9 +85,6 @@ template scope_.set(o,o,false); } - // virtual destructor - virtual ~Handle() {} - }; #define HANDLE_CTORS(X,T,P) \ diff --git a/sigc++/macros/basic_signal.h.m4 b/sigc++/macros/basic_signal.h.m4 index 5b5eb6af79..3dfddad94e 100644 --- a/sigc++/macros/basic_signal.h.m4 +++ b/sigc++/macros/basic_signal.h.m4 @@ -61,7 +61,7 @@ class LIBSIGC_API Signal_ SlotData* out_connect(SlotData *s); Signal_(); - virtual ~Signal_(); + ~Signal_(); public: bool empty() const; diff --git a/src/buffer.C b/src/buffer.C index 034b7e787f..f5febe5f3c 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -2502,7 +2502,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) #ifndef NEW_INSETS void Buffer::linuxDocHandleFootnote(ostream & os, LyXParagraph * & par, - int const depth) + int depth) { string const tag = "footnote"; @@ -2517,7 +2517,7 @@ void Buffer::linuxDocHandleFootnote(ostream & os, LyXParagraph * & par, void Buffer::DocBookHandleCaption(ostream & os, string & inner_tag, - int const depth, int desc_on, + int depth, int desc_on, LyXParagraph * & par) { LyXParagraph * tpar = par; @@ -2544,7 +2544,7 @@ void Buffer::DocBookHandleCaption(ostream & os, string & inner_tag, #ifndef NEW_INSETS void Buffer::DocBookHandleFootnote(ostream & os, LyXParagraph * & par, - int const depth) + int depth) { string tag, inner_tag; string tmp_par, extra_par; @@ -2703,7 +2703,7 @@ void linux_doc_line_break(ostream & os, string::size_type & colcount, void Buffer::SimpleLinuxDocOnePar(ostream & os, LyXParagraph * par, - int desc_on, int const /*depth*/) + int desc_on, int /*depth*/) { LyXFont font1; char c; @@ -3215,7 +3215,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) void Buffer::SimpleDocBookOnePar(ostream & os, string & extra, LyXParagraph * par, int & desc_on, - int const depth) + int depth) { bool emph_flag = false; diff --git a/src/cheaders/cstddef b/src/cheaders/cstddef new file mode 100644 index 0000000000..0607a1ba8c --- /dev/null +++ b/src/cheaders/cstddef @@ -0,0 +1,15 @@ +// -*- C++ -*- forwarding header. +// This file is part of the GNU ANSI C++ Library. + +#ifndef __CSTDDEF__ +#define __CSTDDEF__ +#include + +// Add some types in the std namespace, since the boost library seems +// to look for them (JMarc) +namespace std { + typedef ::size_t size_t; + typedef ::ptrdiff_t ptrdiff_t; +} + +#endif diff --git a/src/frontends/gnome/FormCitation.h b/src/frontends/gnome/FormCitation.h index 9c6c8c5072..1335c2e361 100644 --- a/src/frontends/gnome/FormCitation.h +++ b/src/frontends/gnome/FormCitation.h @@ -18,7 +18,7 @@ #include "DialogBase.h" #include "LString.h" -#include "support/utility.hpp" +#include "boost/utility.hpp" #include "insets/insetcommand.h" #include diff --git a/src/frontends/gnome/FormCopyright.h b/src/frontends/gnome/FormCopyright.h index a21b48d51c..216fbd70bc 100644 --- a/src/frontends/gnome/FormCopyright.h +++ b/src/frontends/gnome/FormCopyright.h @@ -16,7 +16,7 @@ #include "DialogBase.h" #include -#include "support/utility.hpp" +#include "boost/utility.hpp" class Dialogs; // same arguement as in Dialogs.h s/LyX/UI/ diff --git a/src/frontends/gnome/FormIndex.h b/src/frontends/gnome/FormIndex.h index 864605033f..c79f405eee 100644 --- a/src/frontends/gnome/FormIndex.h +++ b/src/frontends/gnome/FormIndex.h @@ -18,7 +18,7 @@ #include "DialogBase.h" #include "LString.h" -#include "support/utility.hpp" +#include "boost/utility.hpp" #include "insets/insetcommand.h" #include diff --git a/src/frontends/gnome/FormPrint.h b/src/frontends/gnome/FormPrint.h index fcf95ec54e..b332ccaa41 100644 --- a/src/frontends/gnome/FormPrint.h +++ b/src/frontends/gnome/FormPrint.h @@ -15,7 +15,7 @@ #define FORMPRINT_H #include "DialogBase.h" -#include "support/utility.hpp" +#include "boost/utility.hpp" #include #include diff --git a/src/frontends/gnome/FormToc.h b/src/frontends/gnome/FormToc.h index a2356f28fc..cd472ef6e6 100644 --- a/src/frontends/gnome/FormToc.h +++ b/src/frontends/gnome/FormToc.h @@ -18,7 +18,7 @@ #include "DialogBase.h" #include "LString.h" -#include "support/utility.hpp" +#include "boost/utility.hpp" #include "insets/insetcommand.h" #include "buffer.h" diff --git a/src/frontends/gnome/FormUrl.h b/src/frontends/gnome/FormUrl.h index 572a8dd816..08607d629e 100644 --- a/src/frontends/gnome/FormUrl.h +++ b/src/frontends/gnome/FormUrl.h @@ -18,7 +18,7 @@ #include "DialogBase.h" #include "LString.h" -#include "support/utility.hpp" +#include "boost/utility.hpp" #include "insets/insetcommand.h" #include diff --git a/src/frontends/kde/FormCitation.h b/src/frontends/kde/FormCitation.h index aedf93d104..50ea6ccf95 100644 --- a/src/frontends/kde/FormCitation.h +++ b/src/frontends/kde/FormCitation.h @@ -17,7 +17,7 @@ #include "DialogBase.h" #include "support/lstrings.h" -#include "support/utility.hpp" +#include "boost/utility.hpp" #include "insets/insetcommand.h" #include diff --git a/src/frontends/kde/FormCopyright.h b/src/frontends/kde/FormCopyright.h index 0aabe4ea74..f443f6e4d2 100644 --- a/src/frontends/kde/FormCopyright.h +++ b/src/frontends/kde/FormCopyright.h @@ -19,7 +19,7 @@ #define FORMCOPYRIGHT_H #include "DialogBase.h" -#include "support/utility.hpp" +#include "boost/utility.hpp" class Dialogs; class LyXView; diff --git a/src/frontends/kde/FormIndex.h b/src/frontends/kde/FormIndex.h index 39fa9836f1..09d4b7b595 100644 --- a/src/frontends/kde/FormIndex.h +++ b/src/frontends/kde/FormIndex.h @@ -17,7 +17,7 @@ #include "DialogBase.h" #include "LString.h" -#include "support/utility.hpp" +#include "boost/utility.hpp" #include "insets/insetindex.h" class Dialogs; diff --git a/src/frontends/kde/FormRef.h b/src/frontends/kde/FormRef.h index f75fdf1e74..ffb364c354 100644 --- a/src/frontends/kde/FormRef.h +++ b/src/frontends/kde/FormRef.h @@ -17,7 +17,7 @@ #include "DialogBase.h" #include "LString.h" -#include "support/utility.hpp" +#include "boost/utility.hpp" #include "insets/insetcommand.h" class Dialogs; diff --git a/src/frontends/kde/FormToc.h b/src/frontends/kde/FormToc.h index 69a143ab32..d3e30e1236 100644 --- a/src/frontends/kde/FormToc.h +++ b/src/frontends/kde/FormToc.h @@ -17,7 +17,7 @@ #include "DialogBase.h" #include "LString.h" -#include "support/utility.hpp" +#include "boost/utility.hpp" #include "insets/insetcommand.h" #include "buffer.h" diff --git a/src/frontends/kde/FormUrl.h b/src/frontends/kde/FormUrl.h index 1e9614e9ce..f9519e2652 100644 --- a/src/frontends/kde/FormUrl.h +++ b/src/frontends/kde/FormUrl.h @@ -17,7 +17,7 @@ #include "DialogBase.h" #include "LString.h" -#include "support/utility.hpp" +#include "boost/utility.hpp" #include "insets/inseturl.h" class Dialogs; diff --git a/src/frontends/xforms/FormDocument.h b/src/frontends/xforms/FormDocument.h index efc22c0e09..a9ce3a02dd 100644 --- a/src/frontends/xforms/FormDocument.h +++ b/src/frontends/xforms/FormDocument.h @@ -113,7 +113,7 @@ private: /// Build the popup virtual void build(); /// - virtual FL_FORM * const FormDocument::form() const; + virtual FL_FORM * const form() const; /// Typedefinitions from the fdesign produced Header file FD_form_tabbed_document * build_tabbed_document(); diff --git a/src/lyx_gui_misc.C b/src/lyx_gui_misc.C index 53793e8923..678b03df87 100644 --- a/src/lyx_gui_misc.C +++ b/src/lyx_gui_misc.C @@ -38,6 +38,7 @@ using std::pair; using std::make_pair; +using std::endl; extern BufferView * current_view;