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

@@ -3,8 +3,6 @@
 #ifndef BUFFERVIEW_PIMPL_H
 #define BUFFERVIEW_PIMPL_H
 
-#include <boost/smart_ptr.hpp>
-
 #include "BufferView.h"
 #include "commandtags.h"
 #include "frontends/Timeout.h"
@@ -13,6 +11,8 @@
 #include "insets/insetspecialchar.h"
 #include "support/types.h"
 
+#include <boost/scoped_ptr.hpp>
+
 #ifdef __GNUG__
 #pragma interface
 #endif

src/ChangeLog

@@ -1,5 +1,17 @@
 2002-05-22  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
+	* 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  <jug@sad.it>

src/ColorHandler.C

@@ -20,6 +20,8 @@
 
 #include "frontends/GUIRunTime.h"
 
+#include <boost/scoped_array.hpp>
+
 #include <cmath>
 
 using std::endl;

src/ColorHandler.h

@@ -15,13 +15,13 @@
 #pragma interface
 #endif
 
-#include <boost/smart_ptr.hpp>
+#include "PainterBase.h"
+
+#include <boost/scoped_ptr.hpp>
 
 // This is only included to provide stuff for the non-public sections
 #include <X11/Xlib.h>
 
-#include "PainterBase.h"
-
 class LyXFont;
 
 /**

src/FontInfo.h

@@ -18,7 +18,7 @@
 
 #include "LString.h"
 
-#include <boost/smart_ptr.hpp>
+#include <boost/scoped_array.hpp>
 
 /** This class manages a font.
     The idea is to create a FontInfo object with a font name pattern with a

src/Painter.C

@@ -30,7 +30,7 @@
 #include "support/LAssert.h"
 #include "support/lstrings.h"
 
-#include <boost/smart_ptr.hpp>
+#include <boost/scoped_array.hpp>
 
 #include <cmath>
 

src/ShareContainer.h

@@ -3,11 +3,12 @@
 #ifndef SHARECONTAINER_H
 #define SHARECONTAINER_H
 
+#include <boost/utility.hpp>
+#include <boost/shared_ptr.hpp>
+
 #include <vector>
 #include <algorithm>
 #include <functional>
-#include <boost/utility.hpp>
-#include <boost/smart_ptr.hpp>
 
 /// Share objects between several users.
 /**

src/font.C

@@ -21,8 +21,7 @@
 #include "encoding.h"
 #include "language.h"
 
-#include <boost/smart_ptr.hpp>
+#include <boost/scoped_array.hpp>
-
 
 namespace {
 

src/frontends/ChangeLog

@@ -1,3 +1,7 @@
+2002-05-22  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* Dialogs.h: use more specific smart_ptr header
+
 2002-04-08  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
 	* Makefile.am (DIST_SUBDIRS): use this instead of EXTRA_DIST

src/frontends/Dialogs.h

@@ -18,12 +18,14 @@
 #ifndef DIALOGS_H
 #define DIALOGS_H
 
-#include <vector>
+#include "LString.h"
+
+#include <boost/utility.hpp>
+#include <boost/shared_ptr.hpp>
+
 #include <sigc++/signal_system.h>
 
-#include "LString.h"
+#include <vector>
-#include <boost/utility.hpp>
-#include <boost/smart_ptr.hpp>
 
 #ifdef __GNUG__
 #pragma interface

src/frontends/controllers/ChangeLog

@@ -1,3 +1,9 @@
+2002-05-22  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* ControlExternal.C: add scoped_ptr.hpp
+
+	* ControlCharacter.h: use more specific smart_ptr header.
+
 2002-05-21  Angus Leeming  <a.leeming@ic.ac.uk>
 
 	* frnt_lang.C (getLanguageData): change a couple of N_() to _().

src/frontends/controllers/ControlCharacter.h

@@ -10,8 +10,6 @@
 #ifndef CONTROLCHARACTER_H
 #define CONTROLCHARACTER_H
 
-#include <boost/smart_ptr.hpp>
-
 #ifdef __GNUG__
 #pragma interface
 #endif
@@ -19,6 +17,8 @@
 #include "ControlDialog_impl.h"
 #include "character.h"
 
+#include <boost/scoped_ptr.hpp>
+
 /** A controller for Character dialogs.
  */
 class ControlCharacter : public ControlDialogBD

src/frontends/controllers/ControlExternal.C

@@ -15,9 +15,6 @@
 
 #include <config.h>
 
-#include <utility>
-#include <vector>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -38,6 +35,11 @@
 #include "support/filetools.h"
 #include "support/lstrings.h"
 
+#include <boost/scoped_ptr.hpp>
+
+#include <utility>
+#include <vector>
+
 using std::make_pair;
 using std::vector;
 

src/frontends/qt2/ChangeLog

@@ -1,3 +1,8 @@
+2002-05-22  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* QDocument.h: use more specific smart_ptr header.
+	* Qt2Base.h: ditto
+
 2002-04-30  John Levon  <moz@compsoc.man.ac.uk>
 
 	* QCharacter.h:

src/frontends/qt2/QDocument.h

@@ -11,13 +11,14 @@
 #ifndef QDOCUMENT_H
 #define QDOCUMENT_H
 
-#include <vector>
-#include <boost/smart_ptr.hpp>
-
 #include "Qt2Base.h"
 #include "Qt2BC.h"
 #include "QtLyXView.h"
 
+#include <boost/scoped_ptr.hpp>
+
+#include <vector>
+
 #ifdef __GNUG__
 #pragma interface
 #endif

src/frontends/qt2/Qt2Base.h

@@ -16,11 +16,6 @@
 
 #include <config.h>
 
-#include <qfont.h>
-#include <qdialog.h>
-#include <qobject.h>
-#include <qapplication.h>
-
 #ifdef __GNUG__
 #pragma interface
 #endif
@@ -31,7 +26,12 @@
 #include "ButtonPolicies.h"
 #include "ControlButtons.h"
 
-#include <boost/smart_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
+
+#include <qfont.h>
+#include <qdialog.h>
+#include <qobject.h>
+#include <qapplication.h>
 
 class Qt2BC;
 

src/frontends/xforms/ChangeLog

@@ -1,3 +1,25 @@
+2002-05-22  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* 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  <moz@compsoc.man.ac.uk>
 
 	* FormCharacter.C: avoid mis-treating Combox as FL_OBJECT
@@ -40,7 +62,7 @@
 
 2002-05-03  Angus Leeming  <a.leeming@ic.ac.uk>
 
- 	* 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  <voss@perce.de>

src/frontends/xforms/FormAboutlyx.h

@@ -11,16 +11,16 @@
 #ifndef FORMABOUTLYX_H
 #define FORMABOUTLYX_H
 
-#include <vector>
-#include <boost/smart_ptr.hpp>
-
 #ifdef __GNUG__
 #pragma interface
 #endif
 
-
 #include "FormBase.h"
 
+#include <vector>
+
+#include <boost/scoped_ptr.hpp>
+
 class ControlAboutlyx;
 struct FD_form_aboutlyx;
 struct FD_form_tab_version;

src/frontends/xforms/FormBase.h

@@ -13,9 +13,6 @@
 #ifndef FORMBASE_H
 #define FORMBASE_H
 
-#include <boost/smart_ptr.hpp>
-#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 <boost/scoped_ptr.hpp>
+
+#include FORMS_H_LOCATION // Can't forward-declare FL_FORM
+
 class xformsBC;
 class Tooltips;
 

src/frontends/xforms/FormCharacter.h

@@ -11,8 +11,6 @@
 #ifndef FORM_CHARACTER_H
 #define FORM_CHARACTER_H
 
-#include <boost/smart_ptr.hpp>
-
 #ifdef __GNUG__
 #pragma interface
 #endif
@@ -23,6 +21,8 @@
 #include "LColor.h"           // for LColor enum
 #include "character.h"        // for FONT_STATE enum
 
+#include <boost/scoped_ptr.hpp>
+
 class Combox;
 struct FD_form_character;
 

src/frontends/xforms/FormDocument.h

@@ -10,15 +10,16 @@
 #ifndef FORM_DOCUMENT_H
 #define FORM_DOCUMENT_H
 
-#include <vector>
-#include <boost/smart_ptr.hpp>
-
 #ifdef __GNUG__
 #pragma interface
 #endif
 
 #include "FormBaseDeprecated.h"
 
+#include <boost/scoped_ptr.hpp>
+
+#include <vector>
+
 class Combox;
 class BufferParams;
 

src/frontends/xforms/FormGraphics.h

@@ -11,14 +11,15 @@
 #ifndef FORMGRAPHICS_H
 #define FORMGRAPHICS_H
 
-#include <boost/smart_ptr.hpp>
-
 #ifdef __GNUG__
 #pragma interface
 #endif
 
 #include "FormBase.h"
 #include "RadioButtonGroup.h"
+
+#include <boost/scoped_ptr.hpp>
+
 #include <vector>
 
 class ControlGraphics;

src/frontends/xforms/FormMathsDeco.h

@@ -12,14 +12,14 @@
 #ifndef FORM_MATHSDECO_H
 #define FORM_MATHSDECO_H
 
-#include <boost/smart_ptr.hpp>
-
 #ifdef __GNUG__
 #pragma interface
 #endif
 
 #include "FormMathsPanel.h"
 
+#include <boost/scoped_ptr.hpp>
+
 struct FD_form_maths_deco;
 
 /**

src/frontends/xforms/FormMathsDelim.h

@@ -12,14 +12,14 @@
 #ifndef FORM_MATHSDELIM_H
 #define FORM_MATHSDELIM_H
 
-#include <boost/smart_ptr.hpp>
-
 #ifdef __GNUG__
 #pragma interface
 #endif
 
 #include "FormMathsPanel.h"
 
+#include <boost/scoped_ptr.hpp>
+
 struct FD_form_maths_delim;
 
 /**

src/frontends/xforms/FormMathsMatrix.h

@@ -12,14 +12,14 @@
 #ifndef FORM_MATHSMATRIX_H
 #define FORM_MATHSMATRIX_H
 
-#include <boost/smart_ptr.hpp>
-
 #ifdef __GNUG__
 #pragma interface
 #endif
 
 #include "FormMathsPanel.h"
 
+#include <boost/scoped_ptr.hpp>
+
 struct FD_form_maths_matrix;
 
 /**

src/frontends/xforms/FormMathsPanel.h

@@ -13,7 +13,6 @@
 #define FORM_MATHSPANEL_H
 
 #include "commandtags.h"
-#include <boost/smart_ptr.hpp>
 
 #ifdef __GNUG__
 #pragma interface
@@ -22,6 +21,8 @@
 #include "FormBaseDeprecated.h"
 #include "MathsSymbols.h"
 
+#include <boost/scoped_ptr.hpp>
+
 class FormMathsBitmap;
 class FormMathsDeco;
 class FormMathsDelim;

src/frontends/xforms/FormMathsSpace.h

@@ -12,14 +12,14 @@
 #ifndef FORM_MATHSSPACE_H
 #define FORM_MATHSSPACE_H
 
-#include <boost/smart_ptr.hpp>
-
 #ifdef __GNUG__
 #pragma interface
 #endif
 
 #include "FormMathsPanel.h"
 
+#include <boost/scoped_ptr.hpp>
+
 struct FD_form_maths_space;
 
 /**

src/frontends/xforms/FormMathsStyle.h

@@ -12,14 +12,14 @@
 #ifndef FORM_MATHSSTYLE_H
 #define FORM_MATHSSTYLE_H
 
-#include <boost/smart_ptr.hpp>
-
 #ifdef __GNUG__
 #pragma interface
 #endif
 
 #include "FormMathsPanel.h"
 
+#include <boost/scoped_ptr.hpp>
+
 struct FD_form_maths_style;
 
 /**

src/frontends/xforms/FormParagraph.h

@@ -10,14 +10,14 @@
 #ifndef FORM_PARAGRAPH_H
 #define FORM_PARAGRAPH_H
 
-#include <boost/smart_ptr.hpp>
-
 #ifdef __GNUG__
 #pragma interface
 #endif
 
 #include "FormBaseDeprecated.h"
 
+#include <boost/scoped_ptr.hpp>
+
 class Paragraph;
 struct FD_form_paragraph;
 

src/frontends/xforms/FormPreferences.h

@@ -12,9 +12,6 @@
 #ifndef FORMPREFERENCES_H
 #define FORMPREFERENCES_H
 
-#include <utility> // pair
-#include <boost/smart_ptr.hpp>
-
 #ifdef __GNUG__
 #pragma interface
 #endif
@@ -23,6 +20,10 @@
 #include "Color.h" // NamedColor
 #include "xforms_helpers.h" // XformColor
 
+#include <boost/scoped_ptr.hpp>
+
+#include <utility> // pair
+
 class Combox;
 class Dialogs;
 class LyXView;

src/frontends/xforms/FormPrint.h

@@ -12,7 +12,6 @@
 #ifndef FORMPRINT_H
 #define FORMPRINT_H
 
-#include <boost/smart_ptr.hpp>
 
 #ifdef __GNUG__
 #pragma interface

src/frontends/xforms/FormTabular.h

@@ -11,7 +11,7 @@
 #ifndef FORMTABULAR_H
 #define FORMTABULAR_H
 
-#include <boost/smart_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
 
 #ifdef __GNUG__
 #pragma interface

src/frontends/xforms/Menubar_pimpl.C

@@ -8,8 +8,6 @@
 
 #include <config.h>
 
-#include <algorithm>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -28,6 +26,10 @@
 #include "gettext.h"
 #include "debug.h"
 
+#include <boost/scoped_ptr.hpp>
+
+#include <algorithm>
+
 using std::endl;
 using std::vector;
 using std::max;

src/frontends/xforms/Menubar_pimpl.h

@@ -12,11 +12,6 @@
 #ifndef MENUBAR_PIMPL_H
 #define MENUBAR_PIMPL_H
 
-#include <vector>
-#include <map>
-#include <boost/smart_ptr.hpp>
-#include FORMS_H_LOCATION
-
 #ifdef __GNUG__
 #pragma interface
 #endif
@@ -26,6 +21,13 @@
 #include "commandtags.h"
 #include "MenuBackend.h"
 
+#include <boost/shared_ptr.hpp>
+
+#include FORMS_H_LOCATION
+
+#include <vector>
+#include <map>
+
 class LyXView;
 
 /** The LyX GUI independent menubar class

src/gettext.C

@@ -16,7 +16,7 @@
 
 #include "LString.h"
 
-#include <boost/smart_ptr.hpp>
+#include <boost/scoped_array.hpp>
 
 #ifdef ENABLE_NLS
 

src/graphics/ChangeLog

@@ -1,3 +1,10 @@
+2002-05-22  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* GraphicsCacheItem.h: use more specific smart_ptr header.
+	* GraphicsTypes.h: ditto
+	* GraphicsImage.h: ditto
+	* GraphicsConverter.h: ditto
+
 2002-04-28  John Levon  <moz@compsoc.man.ac.uk>
 
 	* GraphicsImageXPM.C: understand convert's use of "opaque"

src/graphics/GraphicsCacheItem.h

@@ -34,12 +34,15 @@
 #endif
 
 #include "GraphicsTypes.h"
-#include <list>
 #include "LString.h"
+
 #include <boost/utility.hpp>
-#include <boost/smart_ptr.hpp>
+#include <boost/shared_ptr.hpp>
+
 #include <sigc++/signal_system.h>
 
+#include <list>
+
 class InsetGraphics;
 
 namespace grfx {

src/graphics/GraphicsConverter.h

@@ -21,10 +21,14 @@
 
 #include "LString.h"
 #include "Lsstream.h"
-#include <boost/smart_ptr.hpp>
+
+#include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
+
 #include <sigc++/signal_system.h>
+
 #include <list>
+
 #include <sys/types.h> // needed for pid_t
 
 #ifdef __GNUG__

src/graphics/GraphicsImage.h

@@ -24,11 +24,15 @@
 
 #include "GraphicsTypes.h"
 #include "LString.h"
-#include <boost/smart_ptr.hpp>
+
+#include <boost/shared_ptr.hpp>
+
 #include <sigc++/signal_system.h>
+
+#include <X11/X.h>
+
 #include <vector>
 #include <utility>
-#include <X11/X.h>
 
 #ifdef __GNUG__
 #pragma interface

src/graphics/GraphicsTypes.h

@@ -14,7 +14,7 @@
 #ifndef GRAPHICSTYPES_H
 #define GRAPHICSTYPES_H
 
-#include <boost/smart_ptr.hpp>
+#include <boost/shared_ptr.hpp>
 
 #ifdef __GNUG__
 #pragma interface

src/insets/ChangeLog

@@ -1,5 +1,8 @@
 2002-05-22  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
+	* insettabular.h: use more specific smart_ptr header.
+	* insettext.h: ditto
+
 	* insetgraphics.C (InsetGraphics): change call of shared_ptr::reset
 	(draw): ditto
 

src/insets/insettabular.h

@@ -45,9 +45,6 @@
 #ifndef INSETTABULAR_H
 #define INSETTABULAR_H
 
-#include <sigc++/signal_system.h>
-#include <boost/smart_ptr.hpp>
-
 #ifdef __GNUG__
 #pragma interface
 #endif
@@ -58,6 +55,10 @@
 #include "lyxcursor.h"
 #include "FuncStatus.h"
 
+#include <boost/scoped_ptr.hpp>
+
+#include <sigc++/signal_system.h>
+
 class LyXLex;
 class Painter;
 class BufferView;

src/insets/insettext.h

@@ -25,7 +25,7 @@
 #include "paragraph.h"
 #include "lyxcursor.h"
 
-#include <boost/smart_ptr.hpp>
+#include <boost/shared_ptr.hpp>
 
 class Painter;
 class BufferView;

src/kbmap.h

@@ -15,11 +15,12 @@
 #pragma interface
 #endif
 
-#include <list>
-#include <boost/smart_ptr.hpp>
-
 #include "LString.h"
 
+#include <boost/shared_ptr.hpp>
+
+#include <list>
+
 class kb_sequence;
 
 /// Defines key maps and actions for key sequences

src/lyx_main.h

@@ -19,13 +19,13 @@
 #pragma interface
 #endif
 
-#include <csignal>
-
 #include "LString.h"
 
-#include <boost/smart_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
 #include <boost/utility.hpp>
 
+#include <csignal>
+
 class LyXGUI;
 class LyXRC;
 class LastFiles;

src/mathed/ChangeLog

@@ -1,3 +1,7 @@
+2002-05-22  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* math_exintinset.C: use more specific smart_ptr header.
+
 2002-05-15  John Levon  <moz@compsoc.man.ac.uk>
 
 	* math_cursor.C: clear selection on paste (bug 393)

src/mathed/math_exintinset.C

@@ -7,7 +7,7 @@
 #include "math_symbolinset.h"
 #include "debug.h"
 
-#include <boost/smart_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
 
 using std::endl;
 

src/support/ChangeLog

@@ -1,5 +1,7 @@
 2002-05-22  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
+	* forkedcall.h: use more specific smart_ptr header.
+
 	* lyxsum.C: move some using declarations around.
 
 2002-05-03  Herbert Voss  <voss@perce.de>

src/support/forkedcall.h

@@ -29,10 +29,12 @@
 #endif
 
 #include "LString.h"
-#include <sys/types.h>
+
-#include <boost/smart_ptr.hpp>
+#include <boost/shared_ptr.hpp>
+
 #include <sigc++/signal_system.h>
 
+#include <sys/types.h>
 
 class Forkedcall {
 public: