From 482c04ecca95e00aaa649dc74f33ca33ad864e89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Wed, 22 May 2002 01:16:37 +0000 Subject: [PATCH] use more specific smart_ptr headers git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4183 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BufferView_pimpl.h | 4 +-- src/ChangeLog | 12 +++++++++ src/ColorHandler.C | 2 ++ src/ColorHandler.h | 6 ++--- src/FontInfo.h | 2 +- src/Painter.C | 2 +- src/ShareContainer.h | 5 ++-- src/font.C | 3 +-- src/frontends/ChangeLog | 4 +++ src/frontends/Dialogs.h | 10 ++++--- src/frontends/controllers/ChangeLog | 12 ++++++--- src/frontends/controllers/ControlCharacter.h | 4 +-- src/frontends/controllers/ControlExternal.C | 8 +++--- src/frontends/qt2/ChangeLog | 11 +++++--- src/frontends/qt2/QDocument.h | 7 ++--- src/frontends/qt2/Qt2Base.h | 12 ++++----- src/frontends/xforms/ChangeLog | 28 +++++++++++++++++--- src/frontends/xforms/FormAboutlyx.h | 8 +++--- src/frontends/xforms/FormBase.h | 7 ++--- src/frontends/xforms/FormCharacter.h | 4 +-- src/frontends/xforms/FormDocument.h | 7 ++--- src/frontends/xforms/FormGraphics.h | 7 ++--- src/frontends/xforms/FormMathsDeco.h | 4 +-- src/frontends/xforms/FormMathsDelim.h | 4 +-- src/frontends/xforms/FormMathsMatrix.h | 4 +-- src/frontends/xforms/FormMathsPanel.h | 3 ++- src/frontends/xforms/FormMathsSpace.h | 4 +-- src/frontends/xforms/FormMathsStyle.h | 4 +-- src/frontends/xforms/FormParagraph.h | 4 +-- src/frontends/xforms/FormPreferences.h | 7 ++--- src/frontends/xforms/FormPrint.h | 1 - src/frontends/xforms/FormTabular.h | 2 +- src/frontends/xforms/Menubar_pimpl.C | 6 +++-- src/frontends/xforms/Menubar_pimpl.h | 12 +++++---- src/gettext.C | 2 +- src/graphics/ChangeLog | 7 +++++ src/graphics/GraphicsCacheItem.h | 9 ++++--- src/graphics/GraphicsConverter.h | 6 ++++- src/graphics/GraphicsImage.h | 8 ++++-- src/graphics/GraphicsTypes.h | 2 +- src/insets/ChangeLog | 3 +++ src/insets/insettabular.h | 7 ++--- src/insets/insettext.h | 2 +- src/kbmap.h | 7 ++--- src/lyx_main.h | 6 ++--- src/mathed/ChangeLog | 4 +++ src/mathed/math_exintinset.C | 2 +- src/support/ChangeLog | 2 ++ src/support/forkedcall.h | 6 +++-- 49 files changed, 194 insertions(+), 99 deletions(-) diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h index 5ced20cb09..cc9929b4fe 100644 --- a/src/BufferView_pimpl.h +++ b/src/BufferView_pimpl.h @@ -3,8 +3,6 @@ #ifndef BUFFERVIEW_PIMPL_H #define BUFFERVIEW_PIMPL_H -#include - #include "BufferView.h" #include "commandtags.h" #include "frontends/Timeout.h" @@ -13,6 +11,8 @@ #include "insets/insetspecialchar.h" #include "support/types.h" +#include + #ifdef __GNUG__ #pragma interface #endif diff --git a/src/ChangeLog b/src/ChangeLog index 6d533d0bb4..3eef6f2b84 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,17 @@ 2002-05-22 Lars Gullik Bjønnes + * ColorHandler.C: include scoped_array.hpp + + * font.C: Use more specific smart_ptr header. + * Painter.C: ditto + * gettext.C: ditto + * ShareContainer.h: ditto + * lyx_main.h: ditto + * kbmap.h: ditto + * FontInfo.h: ditto + * BufferView_pimpl.h: ditto + * ColorHandler.h: ditto + * kbmap.C (defkey): change call to shared_ptr::reset 2002-05-21 Juergen Vigna diff --git a/src/ColorHandler.C b/src/ColorHandler.C index 6a1f333ab4..8cc5b96448 100644 --- a/src/ColorHandler.C +++ b/src/ColorHandler.C @@ -20,6 +20,8 @@ #include "frontends/GUIRunTime.h" +#include + #include using std::endl; diff --git a/src/ColorHandler.h b/src/ColorHandler.h index 185f03dcd7..db2d913d03 100644 --- a/src/ColorHandler.h +++ b/src/ColorHandler.h @@ -15,13 +15,13 @@ #pragma interface #endif -#include +#include "PainterBase.h" + +#include // This is only included to provide stuff for the non-public sections #include -#include "PainterBase.h" - class LyXFont; /** diff --git a/src/FontInfo.h b/src/FontInfo.h index 7f4af1d4c7..50ca92d6df 100644 --- a/src/FontInfo.h +++ b/src/FontInfo.h @@ -18,7 +18,7 @@ #include "LString.h" -#include +#include /** This class manages a font. The idea is to create a FontInfo object with a font name pattern with a diff --git a/src/Painter.C b/src/Painter.C index 6b8d760bbb..be7215ea5c 100644 --- a/src/Painter.C +++ b/src/Painter.C @@ -30,7 +30,7 @@ #include "support/LAssert.h" #include "support/lstrings.h" -#include +#include #include diff --git a/src/ShareContainer.h b/src/ShareContainer.h index 9374389882..084b044095 100644 --- a/src/ShareContainer.h +++ b/src/ShareContainer.h @@ -3,11 +3,12 @@ #ifndef SHARECONTAINER_H #define SHARECONTAINER_H +#include +#include + #include #include #include -#include -#include /// Share objects between several users. /** diff --git a/src/font.C b/src/font.C index f9bcb0ec80..3e63bff01a 100644 --- a/src/font.C +++ b/src/font.C @@ -21,8 +21,7 @@ #include "encoding.h" #include "language.h" -#include - +#include namespace { diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index 81f8af38a8..fe2eb681ff 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,3 +1,7 @@ +2002-05-22 Lars Gullik Bjønnes + + * Dialogs.h: use more specific smart_ptr header + 2002-04-08 Lars Gullik Bjønnes * Makefile.am (DIST_SUBDIRS): use this instead of EXTRA_DIST diff --git a/src/frontends/Dialogs.h b/src/frontends/Dialogs.h index 972c250955..923b58a0d4 100644 --- a/src/frontends/Dialogs.h +++ b/src/frontends/Dialogs.h @@ -18,12 +18,14 @@ #ifndef DIALOGS_H #define DIALOGS_H -#include +#include "LString.h" + +#include +#include + #include -#include "LString.h" -#include -#include +#include #ifdef __GNUG__ #pragma interface diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index 6014221a7b..013220b30c 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,9 @@ +2002-05-22 Lars Gullik Bjønnes + + * ControlExternal.C: add scoped_ptr.hpp + + * ControlCharacter.h: use more specific smart_ptr header. + 2002-05-21 Angus Leeming * frnt_lang.C (getLanguageData): change a couple of N_() to _(). @@ -6,7 +12,7 @@ * biblio.C (getAbbreviatedAuthor): fix bug with "and" for Authors like "Odland, G. and ... " - (parseBibTeX): fix bug with title and booktitle + (parseBibTeX): fix bug with title and booktitle and replace a \n with a space when one entry has more than one line @@ -31,7 +37,7 @@ 2002-04-30 John Levon * frnt_lang.C: fix build - + 2002-04-30 Angus Leeming * frnt_lang.[Ch] (getLanguageData): passed a bool character_dlg. @@ -109,7 +115,7 @@ * ControlGraphics.C: * ControlPrint.C: * ControlBibtex.C: make N_() be _() - + 2002-04-07 Herbert Voss * ControlGraphics.[C]: move readBB as readBB_from_PSFile into filetools diff --git a/src/frontends/controllers/ControlCharacter.h b/src/frontends/controllers/ControlCharacter.h index f6fc945db5..b8d3938849 100644 --- a/src/frontends/controllers/ControlCharacter.h +++ b/src/frontends/controllers/ControlCharacter.h @@ -10,8 +10,6 @@ #ifndef CONTROLCHARACTER_H #define CONTROLCHARACTER_H -#include - #ifdef __GNUG__ #pragma interface #endif @@ -19,6 +17,8 @@ #include "ControlDialog_impl.h" #include "character.h" +#include + /** A controller for Character dialogs. */ class ControlCharacter : public ControlDialogBD diff --git a/src/frontends/controllers/ControlExternal.C b/src/frontends/controllers/ControlExternal.C index e55f1b8a22..7de496d5b1 100644 --- a/src/frontends/controllers/ControlExternal.C +++ b/src/frontends/controllers/ControlExternal.C @@ -15,9 +15,6 @@ #include -#include -#include - #ifdef __GNUG__ #pragma implementation #endif @@ -38,6 +35,11 @@ #include "support/filetools.h" #include "support/lstrings.h" +#include + +#include +#include + using std::make_pair; using std::vector; diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 3527a2ac6c..b8d24b4bd0 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,18 +1,23 @@ +2002-05-22 Lars Gullik Bjønnes + + * QDocument.h: use more specific smart_ptr header. + * Qt2Base.h: ditto + 2002-04-30 John Levon * QCharacter.h: * QCharacter.C: update for language i18n change - + 2002-04-16 John Levon * Dialogs.C: add tooltipsEnabled() * QTeXInfo.C: include right header - + * moc/Makefile.am: add back missing moc files * xforms/Makefile.am: add missing FeedbackController - + 2002-04-08 Lars Gullik Bjønnes * xforms/Makefile.am (link_files): use correct _SOURCES variable. diff --git a/src/frontends/qt2/QDocument.h b/src/frontends/qt2/QDocument.h index 888d269d64..456a62e5ca 100644 --- a/src/frontends/qt2/QDocument.h +++ b/src/frontends/qt2/QDocument.h @@ -11,13 +11,14 @@ #ifndef QDOCUMENT_H #define QDOCUMENT_H -#include -#include - #include "Qt2Base.h" #include "Qt2BC.h" #include "QtLyXView.h" +#include + +#include + #ifdef __GNUG__ #pragma interface #endif diff --git a/src/frontends/qt2/Qt2Base.h b/src/frontends/qt2/Qt2Base.h index 2e2ba50ae7..71f8fb6242 100644 --- a/src/frontends/qt2/Qt2Base.h +++ b/src/frontends/qt2/Qt2Base.h @@ -16,11 +16,6 @@ #include -#include -#include -#include -#include - #ifdef __GNUG__ #pragma interface #endif @@ -31,7 +26,12 @@ #include "ButtonPolicies.h" #include "ControlButtons.h" -#include +#include + +#include +#include +#include +#include class Qt2BC; diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index e78a677d44..a69ad09b2c 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,8 +1,30 @@ +2002-05-22 Lars Gullik Bjønnes + + * Menubar_pimpl.C: add scoped_ptr.hpp + + * FormPrint.h: remove smart_ptr.hpp + + * FormBase.h: use more specific smart_ptr header + * FormCharacter.h: ditto + * FormMathsStyle.h: ditto + * FormAboutlyx.h: ditto + * Menubar_pimpl.h: ditto + * FormTabular.h: ditto + * FormPreferences.h: ditto + * FormParagraph.h: ditto + * FormMathsSpace.h: ditto + * FormMathsPanel.h: ditto + * FormMathsMatrix.h: ditto + * FormMathsDelim.h: ditto + * FormMathsDeco.h: ditto + * FormGraphics.h: ditto + * FormDocument.h: ditto + 2002-05-15 John Levon * FormCharacter.C: avoid mis-treating Combox as FL_OBJECT (bug 406) (from Angus) - + 2002-05-10 Dekel Tsur * FormDocument.C (language_apply): Fix language changing. @@ -39,8 +61,8 @@ * FormMathsDeco.C: fix offset to normal size decos. 2002-05-03 Angus Leeming - - * xformsGImage.C (rotate): work-around xforms bug when rotating by + + * xformsGImage.C (rotate): work-around xforms bug when rotating by 270 degs. 2002-05-02 Herbert Voss diff --git a/src/frontends/xforms/FormAboutlyx.h b/src/frontends/xforms/FormAboutlyx.h index f2474c88b0..540e01d766 100644 --- a/src/frontends/xforms/FormAboutlyx.h +++ b/src/frontends/xforms/FormAboutlyx.h @@ -11,16 +11,16 @@ #ifndef FORMABOUTLYX_H #define FORMABOUTLYX_H -#include -#include - #ifdef __GNUG__ #pragma interface #endif - #include "FormBase.h" +#include + +#include + class ControlAboutlyx; struct FD_form_aboutlyx; struct FD_form_tab_version; diff --git a/src/frontends/xforms/FormBase.h b/src/frontends/xforms/FormBase.h index 660b78b90b..0c962eb811 100644 --- a/src/frontends/xforms/FormBase.h +++ b/src/frontends/xforms/FormBase.h @@ -13,9 +13,6 @@ #ifndef FORMBASE_H #define FORMBASE_H -#include -#include FORMS_H_LOCATION // Can't forward-declare FL_FORM - #ifdef __GNUG__ #pragma interface #endif @@ -25,6 +22,10 @@ #include "ButtonPolicies.h" #include "FeedbackController.h" +#include + +#include FORMS_H_LOCATION // Can't forward-declare FL_FORM + class xformsBC; class Tooltips; diff --git a/src/frontends/xforms/FormCharacter.h b/src/frontends/xforms/FormCharacter.h index 715e28dd11..da290e13eb 100644 --- a/src/frontends/xforms/FormCharacter.h +++ b/src/frontends/xforms/FormCharacter.h @@ -11,8 +11,6 @@ #ifndef FORM_CHARACTER_H #define FORM_CHARACTER_H -#include - #ifdef __GNUG__ #pragma interface #endif @@ -23,6 +21,8 @@ #include "LColor.h" // for LColor enum #include "character.h" // for FONT_STATE enum +#include + class Combox; struct FD_form_character; diff --git a/src/frontends/xforms/FormDocument.h b/src/frontends/xforms/FormDocument.h index 503b880d43..de97f08934 100644 --- a/src/frontends/xforms/FormDocument.h +++ b/src/frontends/xforms/FormDocument.h @@ -10,15 +10,16 @@ #ifndef FORM_DOCUMENT_H #define FORM_DOCUMENT_H -#include -#include - #ifdef __GNUG__ #pragma interface #endif #include "FormBaseDeprecated.h" +#include + +#include + class Combox; class BufferParams; diff --git a/src/frontends/xforms/FormGraphics.h b/src/frontends/xforms/FormGraphics.h index 9aaf826b89..fc9bdec8f5 100644 --- a/src/frontends/xforms/FormGraphics.h +++ b/src/frontends/xforms/FormGraphics.h @@ -11,14 +11,15 @@ #ifndef FORMGRAPHICS_H #define FORMGRAPHICS_H -#include - #ifdef __GNUG__ #pragma interface #endif #include "FormBase.h" #include "RadioButtonGroup.h" + +#include + #include class ControlGraphics; @@ -48,7 +49,7 @@ private: /// Update dialog before/whilst showing it. virtual void update(); /// Update the BoundingBox info. - void updateBB(string const & filename, string const & bb_inset); + void updateBB(string const & filename, string const & bb_inset); /// Filter the inputs on callback from xforms virtual ButtonPolicy::SMInput input(FL_OBJECT *, long); diff --git a/src/frontends/xforms/FormMathsDeco.h b/src/frontends/xforms/FormMathsDeco.h index 329fdd7c55..64671282b5 100644 --- a/src/frontends/xforms/FormMathsDeco.h +++ b/src/frontends/xforms/FormMathsDeco.h @@ -12,14 +12,14 @@ #ifndef FORM_MATHSDECO_H #define FORM_MATHSDECO_H -#include - #ifdef __GNUG__ #pragma interface #endif #include "FormMathsPanel.h" +#include + struct FD_form_maths_deco; /** diff --git a/src/frontends/xforms/FormMathsDelim.h b/src/frontends/xforms/FormMathsDelim.h index b43748eaf1..d877f5902d 100644 --- a/src/frontends/xforms/FormMathsDelim.h +++ b/src/frontends/xforms/FormMathsDelim.h @@ -12,14 +12,14 @@ #ifndef FORM_MATHSDELIM_H #define FORM_MATHSDELIM_H -#include - #ifdef __GNUG__ #pragma interface #endif #include "FormMathsPanel.h" +#include + struct FD_form_maths_delim; /** diff --git a/src/frontends/xforms/FormMathsMatrix.h b/src/frontends/xforms/FormMathsMatrix.h index 7fcf3650c1..5581f8229f 100644 --- a/src/frontends/xforms/FormMathsMatrix.h +++ b/src/frontends/xforms/FormMathsMatrix.h @@ -12,14 +12,14 @@ #ifndef FORM_MATHSMATRIX_H #define FORM_MATHSMATRIX_H -#include - #ifdef __GNUG__ #pragma interface #endif #include "FormMathsPanel.h" +#include + struct FD_form_maths_matrix; /** diff --git a/src/frontends/xforms/FormMathsPanel.h b/src/frontends/xforms/FormMathsPanel.h index 83de610c53..75a6202e24 100644 --- a/src/frontends/xforms/FormMathsPanel.h +++ b/src/frontends/xforms/FormMathsPanel.h @@ -13,7 +13,6 @@ #define FORM_MATHSPANEL_H #include "commandtags.h" -#include #ifdef __GNUG__ #pragma interface @@ -22,6 +21,8 @@ #include "FormBaseDeprecated.h" #include "MathsSymbols.h" +#include + class FormMathsBitmap; class FormMathsDeco; class FormMathsDelim; diff --git a/src/frontends/xforms/FormMathsSpace.h b/src/frontends/xforms/FormMathsSpace.h index dc52482350..56f7930eac 100644 --- a/src/frontends/xforms/FormMathsSpace.h +++ b/src/frontends/xforms/FormMathsSpace.h @@ -12,14 +12,14 @@ #ifndef FORM_MATHSSPACE_H #define FORM_MATHSSPACE_H -#include - #ifdef __GNUG__ #pragma interface #endif #include "FormMathsPanel.h" +#include + struct FD_form_maths_space; /** diff --git a/src/frontends/xforms/FormMathsStyle.h b/src/frontends/xforms/FormMathsStyle.h index 2609919186..e50af20f9a 100644 --- a/src/frontends/xforms/FormMathsStyle.h +++ b/src/frontends/xforms/FormMathsStyle.h @@ -12,14 +12,14 @@ #ifndef FORM_MATHSSTYLE_H #define FORM_MATHSSTYLE_H -#include - #ifdef __GNUG__ #pragma interface #endif #include "FormMathsPanel.h" +#include + struct FD_form_maths_style; /** diff --git a/src/frontends/xforms/FormParagraph.h b/src/frontends/xforms/FormParagraph.h index bb0b55aed2..226b1ed98c 100644 --- a/src/frontends/xforms/FormParagraph.h +++ b/src/frontends/xforms/FormParagraph.h @@ -10,14 +10,14 @@ #ifndef FORM_PARAGRAPH_H #define FORM_PARAGRAPH_H -#include - #ifdef __GNUG__ #pragma interface #endif #include "FormBaseDeprecated.h" +#include + class Paragraph; struct FD_form_paragraph; diff --git a/src/frontends/xforms/FormPreferences.h b/src/frontends/xforms/FormPreferences.h index 92774ba81b..f06179de13 100644 --- a/src/frontends/xforms/FormPreferences.h +++ b/src/frontends/xforms/FormPreferences.h @@ -12,9 +12,6 @@ #ifndef FORMPREFERENCES_H #define FORMPREFERENCES_H -#include // pair -#include - #ifdef __GNUG__ #pragma interface #endif @@ -23,6 +20,10 @@ #include "Color.h" // NamedColor #include "xforms_helpers.h" // XformColor +#include + +#include // pair + class Combox; class Dialogs; class LyXView; diff --git a/src/frontends/xforms/FormPrint.h b/src/frontends/xforms/FormPrint.h index c056f526fb..837520d46d 100644 --- a/src/frontends/xforms/FormPrint.h +++ b/src/frontends/xforms/FormPrint.h @@ -12,7 +12,6 @@ #ifndef FORMPRINT_H #define FORMPRINT_H -#include #ifdef __GNUG__ #pragma interface diff --git a/src/frontends/xforms/FormTabular.h b/src/frontends/xforms/FormTabular.h index c6c49efae0..1fb0ddeabb 100644 --- a/src/frontends/xforms/FormTabular.h +++ b/src/frontends/xforms/FormTabular.h @@ -11,7 +11,7 @@ #ifndef FORMTABULAR_H #define FORMTABULAR_H -#include +#include #ifdef __GNUG__ #pragma interface diff --git a/src/frontends/xforms/Menubar_pimpl.C b/src/frontends/xforms/Menubar_pimpl.C index a9efd984aa..2316af0b48 100644 --- a/src/frontends/xforms/Menubar_pimpl.C +++ b/src/frontends/xforms/Menubar_pimpl.C @@ -8,8 +8,6 @@ #include -#include - #ifdef __GNUG__ #pragma implementation #endif @@ -28,6 +26,10 @@ #include "gettext.h" #include "debug.h" +#include + +#include + using std::endl; using std::vector; using std::max; diff --git a/src/frontends/xforms/Menubar_pimpl.h b/src/frontends/xforms/Menubar_pimpl.h index ae522dfbdf..eedba5acce 100644 --- a/src/frontends/xforms/Menubar_pimpl.h +++ b/src/frontends/xforms/Menubar_pimpl.h @@ -12,11 +12,6 @@ #ifndef MENUBAR_PIMPL_H #define MENUBAR_PIMPL_H -#include -#include -#include -#include FORMS_H_LOCATION - #ifdef __GNUG__ #pragma interface #endif @@ -26,6 +21,13 @@ #include "commandtags.h" #include "MenuBackend.h" +#include + +#include FORMS_H_LOCATION + +#include +#include + class LyXView; /** The LyX GUI independent menubar class diff --git a/src/gettext.C b/src/gettext.C index e65081c71c..1712961c45 100644 --- a/src/gettext.C +++ b/src/gettext.C @@ -16,7 +16,7 @@ #include "LString.h" -#include +#include #ifdef ENABLE_NLS diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog index 6f4eb7b79a..3b13db3b56 100644 --- a/src/graphics/ChangeLog +++ b/src/graphics/ChangeLog @@ -1,3 +1,10 @@ +2002-05-22 Lars Gullik Bjønnes + + * GraphicsCacheItem.h: use more specific smart_ptr header. + * GraphicsTypes.h: ditto + * GraphicsImage.h: ditto + * GraphicsConverter.h: ditto + 2002-04-28 John Levon * GraphicsImageXPM.C: understand convert's use of "opaque" diff --git a/src/graphics/GraphicsCacheItem.h b/src/graphics/GraphicsCacheItem.h index 70b3262218..493550252a 100644 --- a/src/graphics/GraphicsCacheItem.h +++ b/src/graphics/GraphicsCacheItem.h @@ -34,12 +34,15 @@ #endif #include "GraphicsTypes.h" -#include #include "LString.h" + #include -#include +#include + #include +#include + class InsetGraphics; namespace grfx { @@ -93,7 +96,7 @@ public: unsigned int raw_width() const; /// unsigned int raw_height() const; - + private: /** Start the image conversion process, checking first that it is * necessary. If it is necessary, then a conversion task is started. diff --git a/src/graphics/GraphicsConverter.h b/src/graphics/GraphicsConverter.h index 5ceeb27d7a..7563377ec6 100644 --- a/src/graphics/GraphicsConverter.h +++ b/src/graphics/GraphicsConverter.h @@ -21,10 +21,14 @@ #include "LString.h" #include "Lsstream.h" -#include + +#include #include + #include + #include + #include // needed for pid_t #ifdef __GNUG__ diff --git a/src/graphics/GraphicsImage.h b/src/graphics/GraphicsImage.h index 1afa3bf980..d9d49d8d21 100644 --- a/src/graphics/GraphicsImage.h +++ b/src/graphics/GraphicsImage.h @@ -24,11 +24,15 @@ #include "GraphicsTypes.h" #include "LString.h" -#include + +#include + #include + +#include + #include #include -#include #ifdef __GNUG__ #pragma interface diff --git a/src/graphics/GraphicsTypes.h b/src/graphics/GraphicsTypes.h index 81c2503593..c99187f8cb 100644 --- a/src/graphics/GraphicsTypes.h +++ b/src/graphics/GraphicsTypes.h @@ -14,7 +14,7 @@ #ifndef GRAPHICSTYPES_H #define GRAPHICSTYPES_H -#include +#include #ifdef __GNUG__ #pragma interface diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 1f475f2b88..4030580d04 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,5 +1,8 @@ 2002-05-22 Lars Gullik Bjønnes + * insettabular.h: use more specific smart_ptr header. + * insettext.h: ditto + * insetgraphics.C (InsetGraphics): change call of shared_ptr::reset (draw): ditto diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h index ccaa6a8a0e..cf81f37e1b 100644 --- a/src/insets/insettabular.h +++ b/src/insets/insettabular.h @@ -45,9 +45,6 @@ #ifndef INSETTABULAR_H #define INSETTABULAR_H -#include -#include - #ifdef __GNUG__ #pragma interface #endif @@ -58,6 +55,10 @@ #include "lyxcursor.h" #include "FuncStatus.h" +#include + +#include + class LyXLex; class Painter; class BufferView; diff --git a/src/insets/insettext.h b/src/insets/insettext.h index 1229044b52..df0ddc702a 100644 --- a/src/insets/insettext.h +++ b/src/insets/insettext.h @@ -25,7 +25,7 @@ #include "paragraph.h" #include "lyxcursor.h" -#include +#include class Painter; class BufferView; diff --git a/src/kbmap.h b/src/kbmap.h index 9c1ddecd22..3331a0a037 100644 --- a/src/kbmap.h +++ b/src/kbmap.h @@ -15,11 +15,12 @@ #pragma interface #endif -#include -#include - #include "LString.h" +#include + +#include + class kb_sequence; /// Defines key maps and actions for key sequences diff --git a/src/lyx_main.h b/src/lyx_main.h index c56d5ea9a7..5da9be0173 100644 --- a/src/lyx_main.h +++ b/src/lyx_main.h @@ -19,13 +19,13 @@ #pragma interface #endif -#include - #include "LString.h" -#include +#include #include +#include + class LyXGUI; class LyXRC; class LastFiles; diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 7851036735..20320422db 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,7 @@ +2002-05-22 Lars Gullik Bjønnes + + * math_exintinset.C: use more specific smart_ptr header. + 2002-05-15 John Levon * math_cursor.C: clear selection on paste (bug 393) diff --git a/src/mathed/math_exintinset.C b/src/mathed/math_exintinset.C index 663b527856..212e87eecd 100644 --- a/src/mathed/math_exintinset.C +++ b/src/mathed/math_exintinset.C @@ -7,7 +7,7 @@ #include "math_symbolinset.h" #include "debug.h" -#include +#include using std::endl; diff --git a/src/support/ChangeLog b/src/support/ChangeLog index 79814a38e8..84d8309590 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,5 +1,7 @@ 2002-05-22 Lars Gullik Bjønnes + * forkedcall.h: use more specific smart_ptr header. + * lyxsum.C: move some using declarations around. 2002-05-03 Herbert Voss diff --git a/src/support/forkedcall.h b/src/support/forkedcall.h index 4c24ae390f..2018513074 100644 --- a/src/support/forkedcall.h +++ b/src/support/forkedcall.h @@ -29,10 +29,12 @@ #endif #include "LString.h" -#include -#include + +#include + #include +#include class Forkedcall { public: