diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-10-19 15:58:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-10-19 23:08:58 +0200 |
| commit | db90b1aa477baacf8cb85384343aba171b91eb5c (patch) | |
| tree | 1f4b3a074ad1fb149b6e0e263a090acf122c420c /slideshow/source | |
| parent | 8d3b8dd0b273f670baceaebdf4f66050e259c929 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'slideshow/source')
| -rw-r--r-- | slideshow/source/engine/effectrewinder.cxx | 2 | ||||
| -rw-r--r-- | slideshow/source/inc/basecontainernode.hxx (renamed from slideshow/source/engine/animationnodes/basecontainernode.hxx) | 6 | ||||
| -rw-r--r-- | slideshow/source/inc/basenode.hxx (renamed from slideshow/source/engine/animationnodes/basenode.hxx) | 6 |
3 files changed, 7 insertions, 7 deletions
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 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 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: */ |