diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2012-12-27 20:36:21 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2012-12-27 20:36:21 +0100 |
| commit | a1ff0ec108822d593bb293b6d37a34e6e7c012e5 (patch) | |
| tree | 20ffd5ab6509e4af7ab16b37e74e82f1a2471096 /slideshow | |
| parent | 8068f50276659058ef02958996d8ef84cd89017f (diff) | |
Fix 'Primitive::operator=' should return 'Primitive &
I applied the same for Windows part, hope there won't be any building pb
Change-Id: Id62c8c5f60e7a525d82c36ced944b71cc5c28b78
Diffstat (limited to 'slideshow')
4 files changed, 4 insertions, 4 deletions
diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx index dda915456f35..1142f61ce164 100644 --- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx +++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx @@ -1011,7 +1011,7 @@ void SEllipseTranslate::interpolate(double t,double /* SlideWidthScale */,double glTranslated(x, 0, y); } -const Primitive& Primitive::operator=(const Primitive& rvalue) +Primitive& Primitive::operator=(const Primitive& rvalue) { Primitive aTmp(rvalue); swap(aTmp); diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.hxx index 0724de5d8c3d..3760683790ac 100644 --- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.hxx +++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.hxx @@ -272,7 +272,7 @@ public: Primitive() {} // making copy constructor explicit makes the class un-suitable for use with stl containers Primitive(const Primitive& rvalue); - const Primitive& operator=(const Primitive& rvalue); + Primitive& operator=(const Primitive& rvalue); void swap(Primitive& rOther); diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx index 66773c4eadf3..fdf575d94faf 100644 --- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx +++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx @@ -859,7 +859,7 @@ RotateAndScaleDepthByHeight* RotateAndScaleDepthByHeight::clone() return new RotateAndScaleDepthByHeight(*this); } -const Primitive& Primitive::operator=(const Primitive& rvalue) +Primitive& Primitive::operator=(const Primitive& rvalue) { for(unsigned int i( 0 ); i < rvalue.Operations.size(); ++i) Operations.push_back(rvalue.Operations[i]->clone()); diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx index d9cb6ca6c16a..9ad9fb05d1b0 100644 --- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx +++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx @@ -224,7 +224,7 @@ public: void applyOperations(double nTime, double SlideWidthScale, double SlideHeightScale); void display(double nTime, double SlideWidthScale, double SlideHeightScale); - const Primitive& operator=(const Primitive& rvalue); + Primitive& operator=(const Primitive& rvalue); /** PushBack a vertex,normal, and tex coord. Each SlideLocation is where on the slide is mapped to this location ( from (0,0) to (1,1) ). This will make sure the correct aspect ratio is used, and helps to make slides begin and end at the correct position. (0,0) is the top left of the slide, and (1,1) is the bottom right. |