summaryrefslogtreecommitdiff
path: root/include/canvas
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-28 16:14:12 +0200
committerNoel Grandin <noel@peralex.com>2015-10-29 08:51:55 +0200
commit5d5c4686badbf67aa25b18701f25d90fa8b4e42a (patch)
tree39d10e1f40b12ee20c50d5eed313d46df054783d /include/canvas
parentfbff75a64c7449aac85d640f67b1de147db35c3e (diff)
remove boost::noncopyable from /include
Change-Id: I9fa22b06fabf79043ebc68be7afebc6e810f4db1
Diffstat (limited to 'include/canvas')
-rw-r--r--include/canvas/parametricpolypolygon.hxx6
-rw-r--r--include/canvas/rendering/irendermodule.hxx5
-rw-r--r--include/canvas/spriteredrawmanager.hxx6
3 files changed, 9 insertions, 8 deletions
diff --git a/include/canvas/parametricpolypolygon.hxx b/include/canvas/parametricpolypolygon.hxx
index b3cda554e7de..481729bbc10c 100644
--- a/include/canvas/parametricpolypolygon.hxx
+++ b/include/canvas/parametricpolypolygon.hxx
@@ -27,7 +27,6 @@
#include <comphelper/broadcasthelper.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
-#include <boost/noncopyable.hpp>
#include <canvas/canvastoolsdllapi.h>
namespace basegfx
@@ -45,8 +44,7 @@ namespace canvas
css::lang::XServiceInfo > ParametricPolyPolygon_Base;
class CANVASTOOLS_DLLPUBLIC ParametricPolyPolygon : public ::comphelper::OBaseMutex,
- public ParametricPolyPolygon_Base,
- private ::boost::noncopyable
+ public ParametricPolyPolygon_Base
{
public:
enum GradientType
@@ -117,6 +115,8 @@ namespace canvas
protected:
virtual ~ParametricPolyPolygon(); // we're a ref-counted UNO class. _We_ destroy ourselves.
+ ParametricPolyPolygon(const ParametricPolyPolygon&) = delete;
+ ParametricPolyPolygon& operator=( const ParametricPolyPolygon& ) = delete;
private:
static ParametricPolyPolygon* createLinearHorizontalGradient( const css::uno::Reference<
diff --git a/include/canvas/rendering/irendermodule.hxx b/include/canvas/rendering/irendermodule.hxx
index 2e78d1ee2f19..9eeffa57c828 100644
--- a/include/canvas/rendering/irendermodule.hxx
+++ b/include/canvas/rendering/irendermodule.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_CANVAS_RENDERING_IRENDERMODULE_HXX
#include <sal/types.h>
-#include <boost/noncopyable.hpp>
#include <memory>
namespace basegfx
@@ -117,7 +116,7 @@ namespace canvas
typedef std::shared_ptr< IRenderModule > IRenderModuleSharedPtr;
/// Little RAII wrapper for guarding access to IRenderModule interface
- class RenderModuleGuard : private ::boost::noncopyable
+ class RenderModuleGuard
{
public:
explicit RenderModuleGuard( const IRenderModuleSharedPtr& rRenderModule ) :
@@ -131,6 +130,8 @@ namespace canvas
mpRenderModule->unlock();
}
+ RenderModuleGuard(const RenderModuleGuard&) = delete;
+ RenderModuleGuard& operator=( const RenderModuleGuard& ) = delete;
private:
const IRenderModuleSharedPtr mpRenderModule;
};
diff --git a/include/canvas/spriteredrawmanager.hxx b/include/canvas/spriteredrawmanager.hxx
index e34d127b2836..7a35527f3fc6 100644
--- a/include/canvas/spriteredrawmanager.hxx
+++ b/include/canvas/spriteredrawmanager.hxx
@@ -32,8 +32,6 @@
#include <vector>
#include <algorithm>
-#include <boost/noncopyable.hpp>
-
#include <canvas/canvastoolsdllapi.h>
/* Definition of SpriteRedrawManager class */
@@ -58,7 +56,7 @@ namespace canvas
there) will reside in a common sprite area and handled
together in the forEachSpriteArea functor call.
*/
- class CANVASTOOLS_DLLPUBLIC SpriteRedrawManager : private ::boost::noncopyable
+ class CANVASTOOLS_DLLPUBLIC SpriteRedrawManager
{
public:
/** Data container for the connected components list
@@ -195,6 +193,8 @@ namespace canvas
typedef ::std::vector< Sprite::Reference > VectorOfSprites;
SpriteRedrawManager();
+ SpriteRedrawManager(const SpriteRedrawManager&) = delete;
+ SpriteRedrawManager& operator=( const SpriteRedrawManager& ) = delete;
/** Must be called when user of this object gets
disposed. Frees all internal references.