diff options
| author | David Tardon <dtardon@redhat.com> | 2016-10-25 11:52:39 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-10-25 16:11:12 +0200 |
| commit | c5423234f329225036dc4360a02fec3e35fe733f (patch) | |
| tree | 9ec2bfb82f98720616dd443e5e553092c08044b8 /slideshow | |
| parent | d8ffe6c4d60f363bc60d7d299cd138adedab22e6 (diff) | |
remove unnecessary dir and name prefix
Change-Id: I57b8d8b187fe7b8a99f2f90d696cd8c97b8a07b6
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/Library_OGLTrans.mk | 6 | ||||
| -rw-r--r-- | slideshow/source/engine/OGLTrans/Operation.cxx (renamed from slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx) | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/OGLTrans/Operation.hxx (renamed from slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx) | 0 | ||||
| -rw-r--r-- | slideshow/source/engine/OGLTrans/TransitionImpl.cxx (renamed from slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx) | 4 | ||||
| -rw-r--r-- | slideshow/source/engine/OGLTrans/TransitionImpl.hxx (renamed from slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx) | 0 | ||||
| -rw-r--r-- | slideshow/source/engine/OGLTrans/TransitionerImpl.cxx (renamed from slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx) | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index 78d7188da09b..612f6defad28 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -62,9 +62,9 @@ $(eval $(call gb_Library_add_libs,OGLTrans,\ endif $(eval $(call gb_Library_add_exception_objects,OGLTrans,\ - slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl \ - slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl \ - slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation \ + slideshow/source/engine/OGLTrans/TransitionerImpl \ + slideshow/source/engine/OGLTrans/TransitionImpl \ + slideshow/source/engine/OGLTrans/Operation \ )) # vim: set noet sw=4 ts=4: diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx b/slideshow/source/engine/OGLTrans/Operation.cxx index c61209fea3e0..0888d6ae39bb 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx +++ b/slideshow/source/engine/OGLTrans/Operation.cxx @@ -31,7 +31,7 @@ #include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/type_ptr.hpp> -#include "OGLTrans_Operation.hxx" +#include "Operation.hxx" SRotate::SRotate(const glm::vec3& Axis, const glm::vec3& Origin, double Angle, bool bInter, double T0, double T1): diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx b/slideshow/source/engine/OGLTrans/Operation.hxx index 12d0a4842278..12d0a4842278 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx +++ b/slideshow/source/engine/OGLTrans/Operation.hxx diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/TransitionImpl.cxx index a7e398f8221e..33e7f4ba0f43 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx +++ b/slideshow/source/engine/OGLTrans/TransitionImpl.cxx @@ -37,8 +37,8 @@ #include <comphelper/random.hxx> -#include "OGLTrans_TransitionImpl.hxx" -#include "OGLTrans_Operation.hxx" +#include "TransitionImpl.hxx" +#include "Operation.hxx" #include <math.h> TransitionScene::TransitionScene(TransitionScene const& rOther) diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/TransitionImpl.hxx index 66ecb6b61a0c..66ecb6b61a0c 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx +++ b/slideshow/source/engine/OGLTrans/TransitionImpl.hxx diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/TransitionerImpl.cxx index 55859d28a30c..6e2f5a98a055 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/TransitionerImpl.cxx @@ -65,7 +65,7 @@ #include <vcl/opengl/OpenGLHelper.hxx> #include <vcl/window.hxx> -#include "OGLTrans_TransitionImpl.hxx" +#include "TransitionImpl.hxx" #include <vcl/sysdata.hxx> |