summaryrefslogtreecommitdiff
path: root/slideshow/source/engine/opengl
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-10-08 10:28:45 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-10-09 08:10:11 +0200
commit56940b766e5d52cb1c17b4250e4c7e2c375b7b65 (patch)
treebad2be3f62ee00ebc7a0c4efa24b9e5a78621859 /slideshow/source/engine/opengl
parente9a3b06f4e2b22f26006e0df730ad23d715ecbb6 (diff)
loplugin:constfields in slideshow
Change-Id: Ieeda808ad8e7fe500a2142c779529ca190725f6a Reviewed-on: https://gerrit.libreoffice.org/61548 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'slideshow/source/engine/opengl')
-rw-r--r--slideshow/source/engine/opengl/Operation.hxx34
-rw-r--r--slideshow/source/engine/opengl/TransitionerImpl.cxx6
2 files changed, 20 insertions, 20 deletions
diff --git a/slideshow/source/engine/opengl/Operation.hxx b/slideshow/source/engine/opengl/Operation.hxx
index 0ee818f24574..f26fd193f16d 100644
--- a/slideshow/source/engine/opengl/Operation.hxx
+++ b/slideshow/source/engine/opengl/Operation.hxx
@@ -45,15 +45,15 @@ public:
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.
*/
- bool mbInterpolate;
+ bool const mbInterpolate;
/** time to begin the transformation
*/
- double mnT0;
+ double const mnT0;
/** time to finish the transformation
*/
- double mnT1;
+ double const mnT1;
public:
/** this is the function that is called to give the Operation to OpenGL.
@@ -107,15 +107,15 @@ public:
private:
/** axis to rotate CCW about
*/
- glm::vec3 axis;
+ glm::vec3 const axis;
/** position that rotation axis runs through
*/
- glm::vec3 origin;
+ glm::vec3 const origin;
/** angle in degrees of CCW rotation
*/
- double angle;
+ double const angle;
};
std::shared_ptr<SRotate>
@@ -149,8 +149,8 @@ public:
*/
SScale(const glm::vec3& Scale, const glm::vec3& Origin,bool bInter, double T0, double T1);
private:
- glm::vec3 scale;
- glm::vec3 origin;
+ glm::vec3 const scale;
+ glm::vec3 const origin;
};
std::shared_ptr<SScale>
@@ -182,7 +182,7 @@ public:
private:
/** vector to translate by
*/
- glm::vec3 vector;
+ glm::vec3 const vector;
};
std::shared_ptr<STranslate>
@@ -234,10 +234,10 @@ public:
RotateAndScaleDepthByWidth(const glm::vec3& Axis,const glm::vec3& Origin,double Angle, bool bScale, bool bInter, double T0, double T1);
private:
- glm::vec3 axis;
- glm::vec3 origin;
- double angle;
- bool scale;
+ glm::vec3 const axis;
+ glm::vec3 const origin;
+ double const angle;
+ bool const scale;
};
std::shared_ptr<RotateAndScaleDepthByWidth>
@@ -252,10 +252,10 @@ public:
RotateAndScaleDepthByHeight(const glm::vec3& Axis,const glm::vec3& Origin,double Angle, bool bScale, bool bInter, double T0, double T1);
private:
- glm::vec3 axis;
- glm::vec3 origin;
- double angle;
- bool scale;
+ glm::vec3 const axis;
+ glm::vec3 const origin;
+ double const angle;
+ bool const scale;
};
std::shared_ptr<RotateAndScaleDepthByHeight>
diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx b/slideshow/source/engine/opengl/TransitionerImpl.cxx
index 663efa8a8710..6fe8c08772ee 100644
--- a/slideshow/source/engine/opengl/TransitionerImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx
@@ -109,9 +109,9 @@ private:
struct OGLFormat
{
- GLint nInternalFormat;
- GLenum eFormat;
- GLenum eType;
+ GLint const nInternalFormat;
+ GLenum const eFormat;
+ GLenum const eType;
};
/* channel ordering: (0:rgba, 1:bgra, 2:argb, 3:abgr)