summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <emmanuel.peyrot@collabora.com>2015-11-23 21:53:20 +0000
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2015-11-23 23:06:38 +0100
commit2a81e30c596a0cd253093d338368b3aad11eb166 (patch)
tree173420219c90267e9dbf962909a6efc6887fc836 /slideshow
parent4c749b121c8b415ef2b7b0445ede1dc4ccc0e6d0 (diff)
slideshow: Make the Iris class private to the TransitionImpl translation unit
Change-Id: I9bf701a7f19d0f778b8fec7a39b762cc89b061b7
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx20
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx13
2 files changed, 16 insertions, 17 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
index 0b342cde2579..3f4f1f69bdb4 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
@@ -327,11 +327,21 @@ SceneObject::~SceneObject()
{
}
-Iris::Iris()
- : SceneObject()
- , maTexture(0)
+namespace
{
-}
+
+class Iris : public SceneObject
+{
+public:
+ Iris() = default;
+
+ virtual void prepare() override;
+ virtual void display(double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight) const override;
+ virtual void finish() override;
+
+private:
+ GLuint maTexture = 0;
+};
void Iris::display(double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight ) const
{
@@ -362,6 +372,8 @@ void Iris::finish()
CHECK_GL_ERROR();
}
+}
+
namespace
{
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
index c941ba2c955d..1d58348b7845 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
@@ -263,19 +263,6 @@ protected:
Primitives_t maPrimitives;
};
-class Iris : public SceneObject
-{
-public:
- Iris ();
-
- virtual void prepare() override;
- virtual void display(double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight) const override;
- virtual void finish() override;
-
-private:
- GLuint maTexture;
-};
-
struct Vertex
{
glm::vec3 position;