summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2019-04-27 14:20:10 +0900
committerTomaž Vajngerl <quikee@gmail.com>2019-04-28 04:14:09 +0200
commit18651dbc32a2d58191c81d738a765a1c83546e12 (patch)
tree6de53577c5b696e4db9774db697838830f5a5200 /include
parent13e716b2cfce4d093d74b3a552251deb9f3b6832 (diff)
rename animate.hxx to animate/Animation.hxx, more changes follow
This is the first step of refactoring Animation where it is needed to separate AnimationBitmap(s) from the Animation class, which is also responsible for displaying of animation. General idea is to make Graphic work only with AnimationBitmaps, which can be freely be swapped out and in, make copies - all transparantly from the actually displaying them and possibly it will also remove the need to copy the animation objects. Change-Id: If5d55ac1a5b26c3880d4f7602be57742b086f9da Reviewed-on: https://gerrit.libreoffice.org/71406 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include')
-rw-r--r--include/svx/bmpmask.hxx2
-rw-r--r--include/vcl/animate/Animation.hxx (renamed from include/vcl/animate.hxx)6
-rw-r--r--include/vcl/graph.hxx2
3 files changed, 5 insertions, 5 deletions
diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index 3c7387276835..6020133cd1e7 100644
--- a/include/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
@@ -26,7 +26,7 @@
#include <svl/poolitem.hxx>
#include <svx/svxdllapi.h>
#include <tools/color.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/gdimtf.hxx>
diff --git a/include/vcl/animate.hxx b/include/vcl/animate/Animation.hxx
index 98d1bb8a3b61..8b40ddeaa71a 100644
--- a/include/vcl/animate.hxx
+++ b/include/vcl/animate/Animation.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_ANIMATE_HXX
-#define INCLUDED_VCL_ANIMATE_HXX
+#ifndef INCLUDED_VCL_ANIMATE_ANIMATION_HXX
+#define INCLUDED_VCL_ANIMATE_ANIMATION_HXX
#include <vcl/dllapi.h>
#include <vcl/timer.hxx>
@@ -183,6 +183,6 @@ private:
};
-#endif // INCLUDED_VCL_ANIMATE_HXX
+#endif // INCLUDED_VCL_ANIMATE_ANIMATION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index 3b3e280ebd8c..f44858c88085 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -25,7 +25,7 @@
#include <tools/solar.h>
#include <rtl/ustring.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/animate.hxx>
+#include <vcl/animate/Animation.hxx>
#include <vcl/gfxlink.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <vcl/vectorgraphicdata.hxx>