summaryrefslogtreecommitdiff
path: root/include/cppcanvas
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-14 09:21:33 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-09-14 12:54:25 +0000
commit22b80ac8e213ff63ce4f60e7d491f12cb42db313 (patch)
treeb00f1ed362747a05d79686a8709c3408cfdee59b /include/cppcanvas
parentd8026ad65c8d50868f0f2fc0d2bd95820cddea83 (diff)
boost->std
Change-Id: I3fd9e1599c5ad812879a58cf1dabbcd393105e1c Reviewed-on: https://gerrit.libreoffice.org/18564 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/cppcanvas')
-rw-r--r--include/cppcanvas/bitmap.hxx5
-rw-r--r--include/cppcanvas/bitmapcanvas.hxx5
-rw-r--r--include/cppcanvas/canvas.hxx8
-rw-r--r--include/cppcanvas/canvasgraphic.hxx7
-rw-r--r--include/cppcanvas/color.hxx6
-rw-r--r--include/cppcanvas/customsprite.hxx6
-rw-r--r--include/cppcanvas/font.hxx6
-rw-r--r--include/cppcanvas/polypolygon.hxx5
-rw-r--r--include/cppcanvas/renderer.hxx5
-rw-r--r--include/cppcanvas/sprite.hxx5
-rw-r--r--include/cppcanvas/spritecanvas.hxx9
11 files changed, 25 insertions, 42 deletions
diff --git a/include/cppcanvas/bitmap.hxx b/include/cppcanvas/bitmap.hxx
index 12eed6e30e8d..eed0607ecd5e 100644
--- a/include/cppcanvas/bitmap.hxx
+++ b/include/cppcanvas/bitmap.hxx
@@ -21,10 +21,9 @@
#define INCLUDED_CPPCANVAS_BITMAP_HXX
#include <com/sun/star/uno/Reference.hxx>
-
-#include <boost/shared_ptr.hpp>
#include <cppcanvas/canvasgraphic.hxx>
#include <cppcanvas/bitmapcanvas.hxx>
+#include <memory>
namespace com { namespace sun { namespace star { namespace rendering
{
@@ -66,7 +65,7 @@ namespace cppcanvas
::com::sun::star::rendering::XBitmap > getUNOBitmap() const = 0;
};
- typedef ::boost::shared_ptr< ::cppcanvas::Bitmap > BitmapSharedPtr;
+ typedef std::shared_ptr< ::cppcanvas::Bitmap > BitmapSharedPtr;
}
#endif // INCLUDED_CPPCANVAS_BITMAP_HXX
diff --git a/include/cppcanvas/bitmapcanvas.hxx b/include/cppcanvas/bitmapcanvas.hxx
index b47d438151e5..1d4775ccd0aa 100644
--- a/include/cppcanvas/bitmapcanvas.hxx
+++ b/include/cppcanvas/bitmapcanvas.hxx
@@ -22,10 +22,9 @@
#include <sal/types.h>
#include <osl/diagnose.h>
-
-#include <boost/shared_ptr.hpp>
#include <basegfx/vector/b2isize.hxx>
#include <cppcanvas/canvas.hxx>
+#include <memory>
/* Definition of BitmapCanvas */
@@ -35,7 +34,7 @@ namespace cppcanvas
class BitmapCanvas;
// forward declaration, since cloneBitmapCanvas() also references BitmapCanvas
- typedef ::boost::shared_ptr< BitmapCanvas > BitmapCanvasSharedPtr;
+ typedef std::shared_ptr< BitmapCanvas > BitmapCanvasSharedPtr;
/** BitmapCanvas interface
*/
diff --git a/include/cppcanvas/canvas.hxx b/include/cppcanvas/canvas.hxx
index 3538ffd619f3..caba56da59f3 100644
--- a/include/cppcanvas/canvas.hxx
+++ b/include/cppcanvas/canvas.hxx
@@ -21,11 +21,9 @@
#define INCLUDED_CPPCANVAS_CANVAS_HXX
#include <com/sun/star/uno/Reference.hxx>
-
-#include <boost/shared_ptr.hpp>
#include <cppcanvas/font.hxx>
#include <cppcanvas/color.hxx>
-
+#include <memory>
namespace basegfx
{
@@ -48,10 +46,10 @@ namespace cppcanvas
class Canvas;
// forward declaration, since tools::PolyPolygon also references Canvas
- typedef ::boost::shared_ptr< PolyPolygon > PolyPolygonSharedPtr;
+ typedef std::shared_ptr< PolyPolygon > PolyPolygonSharedPtr;
// forward declaration, since cloneCanvas() also references Canvas
- typedef ::boost::shared_ptr< Canvas > CanvasSharedPtr;
+ typedef std::shared_ptr< Canvas > CanvasSharedPtr;
/** Canvas interface
*/
diff --git a/include/cppcanvas/canvasgraphic.hxx b/include/cppcanvas/canvasgraphic.hxx
index 173ee466cef2..8792b6c4982e 100644
--- a/include/cppcanvas/canvasgraphic.hxx
+++ b/include/cppcanvas/canvasgraphic.hxx
@@ -21,10 +21,9 @@
#define INCLUDED_CPPCANVAS_CANVASGRAPHIC_HXX
#include <sal/types.h>
-
-#include <boost/shared_ptr.hpp>
#include <cppcanvas/color.hxx>
#include <cppcanvas/canvas.hxx>
+#include <memory>
namespace basegfx
{
@@ -38,7 +37,7 @@ namespace basegfx
namespace cppcanvas
{
// forward declaration, since tools::PolyPolygon also derives from CanvasGraphic
- typedef ::boost::shared_ptr< class PolyPolygon > PolyPolygonSharedPtr;
+ typedef std::shared_ptr< class PolyPolygon > PolyPolygonSharedPtr;
/** This interface defines basic properties of
@@ -138,7 +137,7 @@ namespace cppcanvas
};
- typedef ::boost::shared_ptr< ::cppcanvas::CanvasGraphic > CanvasGraphicSharedPtr;
+ typedef std::shared_ptr< ::cppcanvas::CanvasGraphic > CanvasGraphicSharedPtr;
}
#endif // INCLUDED_CPPCANVAS_CANVASGRAPHIC_HXX
diff --git a/include/cppcanvas/color.hxx b/include/cppcanvas/color.hxx
index b6ed71d823bf..e216203024c5 100644
--- a/include/cppcanvas/color.hxx
+++ b/include/cppcanvas/color.hxx
@@ -21,9 +21,7 @@
#define INCLUDED_CPPCANVAS_COLOR_HXX
#include <com/sun/star/uno/Sequence.hxx>
-
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
/* Definition of Color class */
@@ -44,7 +42,7 @@ namespace cppcanvas
virtual ::com::sun::star::uno::Sequence< double > getDeviceColor( IntSRGBA aSRGBA ) const = 0;
};
- typedef ::boost::shared_ptr< ::cppcanvas::Color > ColorSharedPtr;
+ typedef std::shared_ptr< ::cppcanvas::Color > ColorSharedPtr;
inline sal_uInt8 getRed( Color::IntSRGBA nCol )
{
diff --git a/include/cppcanvas/customsprite.hxx b/include/cppcanvas/customsprite.hxx
index 2b810ebfdaa7..f65943100df5 100644
--- a/include/cppcanvas/customsprite.hxx
+++ b/include/cppcanvas/customsprite.hxx
@@ -21,11 +21,9 @@
#define INCLUDED_CPPCANVAS_CUSTOMSPRITE_HXX
#include <sal/types.h>
-
-#include <boost/shared_ptr.hpp>
#include <cppcanvas/sprite.hxx>
#include <cppcanvas/canvas.hxx>
-
+#include <memory>
/* Definition of CustomSprite class */
@@ -39,7 +37,7 @@ namespace cppcanvas
virtual CanvasSharedPtr getContentCanvas() const = 0;
};
- typedef ::boost::shared_ptr< ::cppcanvas::CustomSprite > CustomSpriteSharedPtr;
+ typedef std::shared_ptr< ::cppcanvas::CustomSprite > CustomSpriteSharedPtr;
}
#endif // INCLUDED_CPPCANVAS_CUSTOMSPRITE_HXX
diff --git a/include/cppcanvas/font.hxx b/include/cppcanvas/font.hxx
index cbe30123f924..4aa786c33702 100644
--- a/include/cppcanvas/font.hxx
+++ b/include/cppcanvas/font.hxx
@@ -21,9 +21,7 @@
#define INCLUDED_CPPCANVAS_FONT_HXX
#include <com/sun/star/uno/Reference.hxx>
-
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
namespace com { namespace sun { namespace star { namespace rendering
{
@@ -41,7 +39,7 @@ namespace cppcanvas
virtual ~Font() {}
};
- typedef ::boost::shared_ptr< ::cppcanvas::Font > FontSharedPtr;
+ typedef std::shared_ptr< ::cppcanvas::Font > FontSharedPtr;
}
#endif // INCLUDED_CPPCANVAS_FONT_HXX
diff --git a/include/cppcanvas/polypolygon.hxx b/include/cppcanvas/polypolygon.hxx
index d8a2876522dd..e902a1fd952d 100644
--- a/include/cppcanvas/polypolygon.hxx
+++ b/include/cppcanvas/polypolygon.hxx
@@ -21,9 +21,8 @@
#define INCLUDED_CPPCANVAS_POLYPOLYGON_HXX
#include <com/sun/star/uno/Reference.hxx>
-
-#include <boost/shared_ptr.hpp>
#include <cppcanvas/canvasgraphic.hxx>
+#include <memory>
namespace basegfx
{
@@ -74,7 +73,7 @@ namespace cppcanvas
::com::sun::star::rendering::XPolyPolygon2D > getUNOPolyPolygon() const = 0;
};
- typedef ::boost::shared_ptr< ::cppcanvas::PolyPolygon > PolyPolygonSharedPtr;
+ typedef std::shared_ptr< ::cppcanvas::PolyPolygon > PolyPolygonSharedPtr;
}
#endif // INCLUDED_CPPCANVAS_POLYPOLYGON_HXX
diff --git a/include/cppcanvas/renderer.hxx b/include/cppcanvas/renderer.hxx
index 8d51071ba116..908c3d278d28 100644
--- a/include/cppcanvas/renderer.hxx
+++ b/include/cppcanvas/renderer.hxx
@@ -22,12 +22,11 @@
#include <sal/types.h>
#include <rtl/ustring.hxx>
-
-#include <boost/shared_ptr.hpp>
#include <boost/optional.hpp>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <cppcanvas/canvasgraphic.hxx>
#include <cppcanvas/color.hxx>
+#include <memory>
namespace basegfx
{
@@ -136,7 +135,7 @@ namespace cppcanvas
};
};
- typedef ::boost::shared_ptr< ::cppcanvas::Renderer > RendererSharedPtr;
+ typedef std::shared_ptr< ::cppcanvas::Renderer > RendererSharedPtr;
}
#endif // INCLUDED_CPPCANVAS_RENDERER_HXX
diff --git a/include/cppcanvas/sprite.hxx b/include/cppcanvas/sprite.hxx
index 3074ab515cce..867d13e75fb6 100644
--- a/include/cppcanvas/sprite.hxx
+++ b/include/cppcanvas/sprite.hxx
@@ -21,8 +21,7 @@
#define INCLUDED_CPPCANVAS_SPRITE_HXX
#include <com/sun/star/uno/Reference.hxx>
-
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace basegfx
{
@@ -102,7 +101,7 @@ namespace cppcanvas
::com::sun::star::rendering::XSprite > getUNOSprite() const = 0;
};
- typedef ::boost::shared_ptr< ::cppcanvas::Sprite > SpriteSharedPtr;
+ typedef std::shared_ptr< ::cppcanvas::Sprite > SpriteSharedPtr;
}
#endif // INCLUDED_CPPCANVAS_SPRITE_HXX
diff --git a/include/cppcanvas/spritecanvas.hxx b/include/cppcanvas/spritecanvas.hxx
index 1ac219e7a86f..c4152fbe498a 100644
--- a/include/cppcanvas/spritecanvas.hxx
+++ b/include/cppcanvas/spritecanvas.hxx
@@ -23,14 +23,11 @@
#include <sal/types.h>
#include <osl/diagnose.h>
#include <basegfx/vector/b2dsize.hxx>
-
-#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
-
-
#include <cppcanvas/canvas.hxx>
#include <cppcanvas/sprite.hxx>
#include <cppcanvas/customsprite.hxx>
+#include <boost/noncopyable.hpp>
+#include <memory>
namespace com { namespace sun { namespace star { namespace rendering
{
@@ -45,7 +42,7 @@ namespace cppcanvas
class SpriteCanvas;
// forward declaration, since cloneSpriteCanvas() also references SpriteCanvas
- typedef ::boost::shared_ptr< ::cppcanvas::SpriteCanvas > SpriteCanvasSharedPtr;
+ typedef std::shared_ptr< ::cppcanvas::SpriteCanvas > SpriteCanvasSharedPtr;
/** SpriteCanvas interface
*/