Change to use preffered calling of Boost.Function

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

diff --git a/src/ChangeLog b/src/ChangeLog
index c7cdd18082c7353026dca6488f989c6a5b5dceaa..5beb1f6a2f88ef0ac542d58012246a8e0e9bbe69 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2004-09-26  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
+       * pch.h: dont include <boost/function/function0.hpp>
+
        * Makefile.am (lyx_SOURCES): remove ShareContainer.h
 
        * paragraph_pimpl.h: remove usage of ShareContainer

diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog
index c15e84fc3c8c7ce4e905420541f7c9c95c091b8f..2f0c30b52844e8a7dea055ad1145d3ac43b824e6 100644 (file)
--- a/src/graphics/ChangeLog
+++ b/src/graphics/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-26  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * pch.h: include <boost/function.hpp> instead of
+       <boost/function/function0.hpp>
+
+       * GraphicsImage.C: Use preferred calling of boost::function
+       * GraphicsImage.h: ditto
+
 2004-08-16  José Matos  <jamatos@lyx.org>
 
        * PreviewLoader.C (Impl::startLoading): remove space at end of line.

diff --git a/src/graphics/GraphicsImage.C b/src/graphics/GraphicsImage.C
index 41fac6bb3c2140bea8cd1cdf6df801c59a4a4050..b1d7e60707e09c7e39ad530fa73640e149d05806 100644 (file)
--- a/src/graphics/GraphicsImage.C
+++ b/src/graphics/GraphicsImage.C
@@ -22,10 +22,10 @@ namespace graphics {
 
 // This is to be connected to a function that will return a new
 // instance of a viable derived class.
-boost::function0<Image::ImagePtr> Image::newImage;
+boost::function<Image::ImagePtr()> Image::newImage;
 
 /// Return the list of loadable formats.
-boost::function0<Image::FormatList> Image::loadableFormats;
+boost::function<Image::FormatList()> Image::loadableFormats;
 
 
 std::pair<unsigned int, unsigned int>

diff --git a/src/graphics/GraphicsImage.h b/src/graphics/GraphicsImage.h
index 9723d4388bf3a5b1afb63dfb87c371d5914101fe..00c42f63aaa34b047a4edaea811b9de4592d4d0e 100644 (file)
--- a/src/graphics/GraphicsImage.h
+++ b/src/graphics/GraphicsImage.h
@@ -24,8 +24,8 @@
 #ifndef GRAPHICSIMAGE_H
 #define GRAPHICSIMAGE_H
 
+#include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/function/function0.hpp>
 #include <boost/signals/signal1.hpp>
 
 #include <vector>
@@ -43,12 +43,12 @@ public:
         */
        typedef boost::shared_ptr<Image> ImagePtr;
        ///
-       static boost::function0<ImagePtr> newImage;
+       static boost::function<ImagePtr()> newImage;
 
        /// Return the list of loadable formats.
        typedef std::vector<std::string> FormatList;
        ///
-       static boost::function0<FormatList> loadableFormats;
+       static boost::function<FormatList()> loadableFormats;
 
        ///
        virtual ~Image() {}

diff --git a/src/graphics/pch.h b/src/graphics/pch.h
index 41fd54673de776b4e344c030402e9dc677d61e1f..866a4571617444a8326b314988cb7fd0b8853b9f 100644 (file)
--- a/src/graphics/pch.h
+++ b/src/graphics/pch.h
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <boost/function/function0.hpp>
+#include <boost/function.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/signals/signal0.hpp>

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 95dbd12efa5459b2063fd9875667651fb834b154..3c4199736656c2f20e7d510aadac9f36dafb3293 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-26  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * ExternalTransforms.h: User preferred calling of Boost.Function
+
 2004-09-24  Andreas Vox  <vox@isp.uni-luebeck.de>
 
        * insetref.C (docbook): fixing problem where Docbook XML output
@@ -28,7 +32,7 @@
 
        * pch.h: new file
 
-       * Makefile.am: support pch 
+       * Makefile.am: support pch
 
 2004-08-15  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 

diff --git a/src/insets/ExternalTransforms.h b/src/insets/ExternalTransforms.h
index f5ea527a7ca9bc205be7a55492caa49fdb8b32ba..5f9a85294bb00d053f6dd7ba96d36d210a599ced 100644 (file)
--- a/src/insets/ExternalTransforms.h
+++ b/src/insets/ExternalTransforms.h
@@ -314,17 +314,17 @@ enum TransformID {
 };
 
 
-typedef boost::function1<TransformOption::ptr_type, ClipData>
+typedef boost::function<TransformOption::ptr_type(ClipData)>
        ClipOptionFactory;
-typedef boost::function1<TransformOption::ptr_type, std::string>
+typedef boost::function<TransformOption::ptr_type(std::string)>
        ExtraOptionFactory;
-typedef boost::function1<TransformOption::ptr_type, ResizeData>
+typedef boost::function<TransformOption::ptr_type(ResizeData)>
        ResizeOptionFactory;
-typedef boost::function1<TransformOption::ptr_type, RotationData>
+typedef boost::function<TransformOption::ptr_type(RotationData)>
        RotationOptionFactory;
-typedef boost::function1<TransformCommand::ptr_type, ResizeData>
+typedef boost::function<TransformCommand::ptr_type(ResizeData)>
        ResizeCommandFactory;
-typedef boost::function1<TransformCommand::ptr_type, RotationData>
+typedef boost::function<TransformCommand::ptr_type(RotationData)>
        RotationCommandFactory;
 
 

diff --git a/src/pch.h b/src/pch.h
index 25d2b499311e79a211ee7362aa3b00ba06bd3a47..96a24fa00df3d4207f6f86d0fd60595722e1152e 100644 (file)
--- a/src/pch.h
+++ b/src/pch.h
@@ -7,7 +7,6 @@
 #include <boost/cregex.hpp>
 #include <boost/current_function.hpp>
 // #include <boost/format.hpp> // mult def symbols problem (_1, _2 etc)
-#include <boost/function/function0.hpp>
 #include <boost/function.hpp>
 #include <boost/iterator/indirect_iterator.hpp>
 #include <boost/optional.hpp>

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 83a80d30983b69609469b32dd8f3463c9a6bf26e..00868163bb5fd4599b384498206fa75702e20ad3 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-26  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * forkedcall.h: remove include of <boost/function/funtion0.hpp>
+       * pch.h: ditto
+
 2004-09-10  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * textutils.h (IsLetterCharOrDigit): remove

diff --git a/src/support/forkedcall.h b/src/support/forkedcall.h
index a3843e366ae47de223235a2c9ce62498a1af1d73..bb8ffeba0cb46a241792d120ba9ef50752d0e301 100644 (file)
--- a/src/support/forkedcall.h
+++ b/src/support/forkedcall.h
@@ -28,7 +28,6 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/signals/signal2.hpp>
-#include <boost/function/function0.hpp>
 
 #include <sys/types.h>
 

diff --git a/src/support/pch.h b/src/support/pch.h
index 1a5fc49beeee5d9e06cfe1a6a011076494df3014..b58906b3980a61c10be380377e76d0eb6a47519d 100644 (file)
--- a/src/support/pch.h
+++ b/src/support/pch.h
@@ -4,7 +4,6 @@
 #include <boost/assert.hpp>
 #include <boost/crc.hpp>
 // #include <boost/format.hpp> // mult def symbols problem (_1,_2 etc)
-#include <boost/function/function0.hpp>
 #include <boost/regex.hpp>
 #include <boost/scoped_array.hpp>
 #include <boost/scoped_ptr.hpp>