[Libreoffice-commits] core.git: 3 commits - slideshow/Library_OGLTrans.mk slideshow/source

David Tardon dtardon at redhat.com
Tue Oct 25 14:11:50 UTC 2016 

 slideshow/Library_OGLTrans.mk                                          |   27 
 slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx        |  223 
 slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx        |  272 -
 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx   | 2283 ----------
 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx   |  371 -
 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 1339 -----
 slideshow/source/engine/OGLTrans/ogltrans.component                    |   25 
 slideshow/source/engine/opengl/Operation.cxx                           |  223 
 slideshow/source/engine/opengl/Operation.hxx                           |  272 +
 slideshow/source/engine/opengl/TransitionImpl.cxx                      | 2283 ++++++++++
 slideshow/source/engine/opengl/TransitionImpl.hxx                      |  371 +
 slideshow/source/engine/opengl/TransitionerImpl.cxx                    | 1339 +++++
 slideshow/source/engine/opengl/ogltrans.component                      |   25 
 13 files changed, 4522 insertions(+), 4531 deletions(-)

New commits:
commit 093d7b1c6824c3512cd812c9ad5a661c4e0be892
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Oct 25 15:35:18 2016 +0200

    rename dir to follow suit
    
    Change-Id: I894e6a089e99ed6cec3a970ffa0cce9cbd9a9e1a

diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index 612f6de..3dce634 100644
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Library_use_externals,OGLTrans,\
 	glm_headers \
 ))
 
-$(eval $(call gb_Library_set_componentfile,OGLTrans,slideshow/source/engine/OGLTrans/ogltrans))
+$(eval $(call gb_Library_set_componentfile,OGLTrans,slideshow/source/engine/opengl/ogltrans))
 
 ifeq ($(strip $(OS)),MACOSX)
 
@@ -62,9 +62,9 @@ $(eval $(call gb_Library_add_libs,OGLTrans,\
 endif
 
 $(eval $(call gb_Library_add_exception_objects,OGLTrans,\
-    slideshow/source/engine/OGLTrans/TransitionerImpl \
-    slideshow/source/engine/OGLTrans/TransitionImpl \
-    slideshow/source/engine/OGLTrans/Operation \
+    slideshow/source/engine/opengl/TransitionerImpl \
+    slideshow/source/engine/opengl/TransitionImpl \
+    slideshow/source/engine/opengl/Operation \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/slideshow/source/engine/OGLTrans/Operation.cxx b/slideshow/source/engine/opengl/Operation.cxx
similarity index 100%
rename from slideshow/source/engine/OGLTrans/Operation.cxx
rename to slideshow/source/engine/opengl/Operation.cxx
diff --git a/slideshow/source/engine/OGLTrans/Operation.hxx b/slideshow/source/engine/opengl/Operation.hxx
similarity index 100%
rename from slideshow/source/engine/OGLTrans/Operation.hxx
rename to slideshow/source/engine/opengl/Operation.hxx
diff --git a/slideshow/source/engine/OGLTrans/TransitionImpl.cxx b/slideshow/source/engine/opengl/TransitionImpl.cxx
similarity index 100%
rename from slideshow/source/engine/OGLTrans/TransitionImpl.cxx
rename to slideshow/source/engine/opengl/TransitionImpl.cxx
diff --git a/slideshow/source/engine/OGLTrans/TransitionImpl.hxx b/slideshow/source/engine/opengl/TransitionImpl.hxx
similarity index 100%
rename from slideshow/source/engine/OGLTrans/TransitionImpl.hxx
rename to slideshow/source/engine/opengl/TransitionImpl.hxx
diff --git a/slideshow/source/engine/OGLTrans/TransitionerImpl.cxx b/slideshow/source/engine/opengl/TransitionerImpl.cxx
similarity index 100%
rename from slideshow/source/engine/OGLTrans/TransitionerImpl.cxx
rename to slideshow/source/engine/opengl/TransitionerImpl.cxx
diff --git a/slideshow/source/engine/OGLTrans/ogltrans.component b/slideshow/source/engine/opengl/ogltrans.component
similarity index 100%
rename from slideshow/source/engine/OGLTrans/ogltrans.component
rename to slideshow/source/engine/opengl/ogltrans.component
commit c5423234f329225036dc4360a02fec3e35fe733f
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Oct 25 11:52:39 2016 +0200

    remove unnecessary dir and name prefix
    
    Change-Id: I57b8d8b187fe7b8a99f2f90d696cd8c97b8a07b6

diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index 78d7188..612f6de 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
similarity index 99%
rename from slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.cxx
rename to slideshow/source/engine/OGLTrans/Operation.cxx
index c61209f..0888d6a 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
similarity index 100%
rename from slideshow/source/engine/OGLTrans/generic/OGLTrans_Operation.hxx
rename to slideshow/source/engine/OGLTrans/Operation.hxx
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/TransitionImpl.cxx
similarity index 99%
rename from slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
rename to slideshow/source/engine/OGLTrans/TransitionImpl.cxx
index a7e398f..33e7f4b 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
similarity index 100%
rename from slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
rename to slideshow/source/engine/OGLTrans/TransitionImpl.hxx
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/TransitionerImpl.cxx
similarity index 99%
rename from slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
rename to slideshow/source/engine/OGLTrans/TransitionerImpl.cxx
index 55859d2..6e2f5a9 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>
 
commit d8ffe6c4d60f363bc60d7d299cd138adedab22e6
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Oct 25 11:50:05 2016 +0200

    merge duplicate source file lists
    
    Change-Id: I55c746c92a6803a67e7129c43d2acd94aa7cbf8e

diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index db1c788..78d7188 100644
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -38,12 +38,6 @@ $(eval $(call gb_Library_set_componentfile,OGLTrans,slideshow/source/engine/OGLT
 
 ifeq ($(strip $(OS)),MACOSX)
 
-$(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 \
-))
-
 $(eval $(call gb_Library_use_system_darwin_frameworks,OGLTrans,\
     Cocoa \
     GLUT \
@@ -51,29 +45,26 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,OGLTrans,\
 ))
 
 else ifeq ($(strip $(OS)),WNT)
+
 $(eval $(call gb_Library_use_system_win32_libs,OGLTrans,\
     gdi32 \
     glu32 \
     opengl32 \
 ))
 
-$(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 \
-))
-
 else
-$(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 \
-))
 
 $(eval $(call gb_Library_add_libs,OGLTrans,\
 	-lGL \
 	-lX11 \
 ))
+
 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 \
+))
+
 # vim: set noet sw=4 ts=4:

More information about the Libreoffice-commits mailing list