slideshow/source/engine/effectrewinder.cxx | 2 +-
slideshow/source/inc/basecontainernode.hxx | 6 +++---
slideshow/source/inc/basenode.hxx | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit db90b1aa477baacf8cb85384343aba171b91eb5c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Oct 19 15:58:04 2017 +0200
Move slideshow include files to common include directory
...that are included from various places. Change done in preparation of
loplugin:includeform.
Change-Id: I6507189a380a547321903d71e3cb425c37bb16ad
Reviewed-on: https://gerrit.libreoffice.org/43563
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/slideshow/source/engine/effectrewinder.cxx
b/slideshow/source/engine/effectrewinder.cxx
index 96ba0e048281..cdf1a02f7685 100644
--- a/slideshow/source/engine/effectrewinder.cxx
+++ b/slideshow/source/engine/effectrewinder.cxx
@@ -22,7 +22,7 @@
#include "eventqueue.hxx"
#include "usereventqueue.hxx"
#include "mouseeventhandler.hxx"
-#include "animationnodes/basecontainernode.hxx"
+#include "basecontainernode.hxx"
#include "delayevent.hxx"
#include <com/sun/star/awt/MouseEvent.hpp>
diff --git a/slideshow/source/engine/animationnodes/basecontainernode.hxx
b/slideshow/source/inc/basecontainernode.hxx
similarity index 93%
rename from slideshow/source/engine/animationnodes/basecontainernode.hxx
rename to slideshow/source/inc/basecontainernode.hxx
index 3d6e568d5e0f..6338fb026c7c 100644
--- a/slideshow/source/engine/animationnodes/basecontainernode.hxx
+++ b/slideshow/source/inc/basecontainernode.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_BASECONTAINERNODE_HXX
-#define INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_BASECONTAINERNODE_HXX
+#ifndef INCLUDED_SLIDESHOW_SOURCE_INC_BASECONTAINERNODE_HXX
+#define INCLUDED_SLIDESHOW_SOURCE_INC_BASECONTAINERNODE_HXX
#include "basenode.hxx"
@@ -96,6 +96,6 @@ typedef ::std::shared_ptr< BaseContainerNode >
BaseContainerNodeSharedPtr;
} // namespace interface
} // namespace presentation
-#endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_BASECONTAINERNODE_HXX
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/basenode.hxx
b/slideshow/source/inc/basenode.hxx
similarity index 97%
rename from slideshow/source/engine/animationnodes/basenode.hxx
rename to slideshow/source/inc/basenode.hxx
index 495e03f9ee5c..9798aa11a171 100644
--- a/slideshow/source/engine/animationnodes/basenode.hxx
+++ b/slideshow/source/inc/basenode.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_BASENODE_HXX
-#define INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_BASENODE_HXX
+#ifndef INCLUDED_SLIDESHOW_SOURCE_INC_BASENODE_HXX
+#define INCLUDED_SLIDESHOW_SOURCE_INC_BASENODE_HXX
#include <tools/diagnose_ex.h>
#include <osl/diagnose.hxx>
@@ -205,6 +205,6 @@ typedef ::std::shared_ptr< BaseNode > BaseNodeSharedPtr;
} // namespace internal
} // namespace slideshow
-#endif // INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_BASENODE_HXX
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
