summaryrefslogtreecommitdiff
path: root/slideshow/source/engine/OGLTrans
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2016-04-13 10:07:19 +0200
committerMichael Stahl <mstahl@redhat.com>2016-04-13 11:34:32 +0000
commit0de868cd0f430efc6256926c2865530818d7b7dd (patch)
tree60e681b0e119d50022500fbc0f91cbdd4d7c979c /slideshow/source/engine/OGLTrans
parent19b34c0039c6293f9b37aa70f8055aa2be28ba09 (diff)
tdf#94306 replace boost::noncopyable in sfx2 to sot
Replace with C++11 delete copy-constructur and copy-assignment. Remove boost/noncopyable.hpp includes. Add missing default ctors. Make some overloaded ctors explicit, seems cppcheck doesn't flag: T(const template<X>& rx). Change-Id: I63c5a3ac84a33ea6d49868e2d9aa281ada79958e Reviewed-on: https://gerrit.libreoffice.org/24050 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'slideshow/source/engine/OGLTrans')
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx6
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx11
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx6
3 files changed, 13 insertions, 10 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx
index ad03f236e621..edc8a51fc199 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx
@@ -31,16 +31,16 @@
#include <config_lgpl.h>
#include <glm/gtc/type_ptr.hpp>
-#include <boost/noncopyable.hpp>
-
#include <memory>
/** This class is to be derived to make any operation (transform) you may need in order to construct your transitions
*/
-class Operation : private boost::noncopyable
+class Operation
{
public:
virtual ~Operation(){}
+ Operation(const Operation&) = delete;
+ Operation& operator=(const Operation&) = delete;
protected:
/** Should this operation be interpolated . If TRUE, the transform will smoothly move from making no difference from t = 0.0 to mnT0 to being completely transformed from t = mnT1 to 1. If FALSE, the transform will be ineffectual from t = 0 to mnT0, and completely transformed from t = mnT0 to 1.
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
index 449a72fc81f5..bf2f1c1e84d2 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
@@ -31,8 +31,6 @@
#include <config_lgpl.h>
#include <glm/gtc/type_ptr.hpp>
-#include <boost/noncopyable.hpp>
-
#include <GL/glew.h>
#include <memory>
@@ -133,11 +131,14 @@ private:
It holds Primitives and Operations on those primitives.
*/
-class OGLTransitionImpl : private boost::noncopyable
+class OGLTransitionImpl
{
public:
virtual ~OGLTransitionImpl();
+ OGLTransitionImpl(const OGLTransitionImpl&) = delete;
+ OGLTransitionImpl& operator=(const OGLTransitionImpl&) = delete;
+
/** Prepare transition.
*/
bool prepare( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex );
@@ -273,11 +274,13 @@ std::shared_ptr<OGLTransitionImpl> makeDiamond();
std::shared_ptr<OGLTransitionImpl> makeFadeSmoothly();
std::shared_ptr<OGLTransitionImpl> makeFadeThroughBlack();
-class SceneObject : private boost::noncopyable
+class SceneObject
{
public:
SceneObject();
virtual ~SceneObject();
+ SceneObject(const SceneObject&) = delete;
+ SceneObject& operator=(const SceneObject&) = delete;
virtual void prepare(GLuint /* program */) {}
virtual void display(GLint sceneTransformLocation, GLint primitiveTransformLocation, double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight ) const;
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 17e501af4118..c864f87d6d8f 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -65,8 +65,6 @@
#include <vcl/opengl/OpenGLHelper.hxx>
#include <vcl/window.hxx>
-#include <boost/noncopyable.hpp>
-
#include "OGLTrans_TransitionImpl.hxx"
#if defined( UNX ) && !defined( MACOSX )
@@ -171,10 +169,12 @@ int oglErrorHandler( Display* /*dpy*/, XErrorEvent* /*evnt*/ )
* slideshow. This class is implicitly
* constructed from XTransitionFactory.
*/
-class OGLTransitionerImpl : private cppu::BaseMutex, private boost::noncopyable, public OGLTransitionerImplBase
+class OGLTransitionerImpl : private cppu::BaseMutex, public OGLTransitionerImplBase
{
public:
OGLTransitionerImpl();
+ OGLTransitionerImpl(const OGLTransitionerImpl&) = delete;
+ OGLTransitionerImpl& operator=(const OGLTransitionerImpl&) = delete;
bool setTransition( std::shared_ptr<OGLTransitionImpl> pOGLTransition );
bool initialize( const Reference< presentation::XSlideShowView >& xView,
const Reference< rendering::XBitmap >& xLeavingSlide,