basctl/source/basicide/bastype2.hxx | 254 ----------------------------------- basctl/source/basicide/layout.hxx | 134 ------------------ basctl/source/basicide/objdlg.hxx | 61 -------- basctl/source/inc/baside3.hxx | 2 basctl/source/inc/basidesh.hxx | 2 basctl/source/inc/bastype2.hxx | 255 ++++++++++++++++++++++++++++++++++++ basctl/source/inc/layout.hxx | 134 ++++++++++++++++++ basctl/source/inc/objdlg.hxx | 61 ++++++++ 8 files changed, 452 insertions(+), 451 deletions(-)
New commits: commit 5eb7692ab845a879d265b2e4df48cb7e4536da33 Author: Tor Lillqvist <[email protected]> Date: Thu Oct 29 17:16:10 2015 +0200 tdf#95416: Get rid of #include "../foo/bar.hxx" style includes Sample commit of what should be done, for the basctl module. Change-Id: Ied47ea3129844179f2624c6870c05e48540fd0f6 diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx index 89a240f..ebafb49 100644 --- a/basctl/source/inc/baside3.hxx +++ b/basctl/source/inc/baside3.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_BASCTL_SOURCE_INC_BASIDE3_HXX #define INCLUDED_BASCTL_SOURCE_INC_BASIDE3_HXX -#include "../basicide/layout.hxx" +#include "layout.hxx" #include "bastypes.hxx" #include "propbrw.hxx" diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index 49ef450..ec835be 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -21,7 +21,7 @@ #include "doceventnotifier.hxx" #include "sbxitem.hxx" -#include "../basicide/objdlg.hxx" +#include "objdlg.hxx" #include <com/sun/star/container/XContainerListener.hpp> #include <sfx2/viewsh.hxx> diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/inc/bastype2.hxx similarity index 98% rename from basctl/source/basicide/bastype2.hxx rename to basctl/source/inc/bastype2.hxx index 1f111d8..48f9e20 100644 --- a/basctl/source/basicide/bastype2.hxx +++ b/basctl/source/inc/bastype2.hxx @@ -16,8 +16,9 @@ * 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_BASCTL_SOURCE_BASICIDE_BASTYPE2_HXX -#define INCLUDED_BASCTL_SOURCE_BASICIDE_BASTYPE2_HXX + +#ifndef INCLUDED_BASCTL_SOURCE_INC_BASTYPE2_HXX +#define INCLUDED_BASCTL_SOURCE_INC_BASTYPE2_HXX #include <sal/config.h> @@ -249,6 +250,6 @@ private: } // namespace basctl -#endif // INCLUDED_BASCTL_SOURCE_BASICIDE_BASTYPE2_HXX +#endif // INCLUDED_BASCTL_SOURCE_INC_BASTYPE2_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/layout.hxx b/basctl/source/inc/layout.hxx similarity index 96% rename from basctl/source/basicide/layout.hxx rename to basctl/source/inc/layout.hxx index 22762a0..0d1c573 100644 --- a/basctl/source/basicide/layout.hxx +++ b/basctl/source/inc/layout.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_LAYOUT_HXX -#define INCLUDED_BASCTL_SOURCE_BASICIDE_LAYOUT_HXX +#ifndef INCLUDED_BASCTL_SOURCE_INC_LAYOUT_HXX +#define INCLUDED_BASCTL_SOURCE_INC_LAYOUT_HXX #include <vcl/split.hxx> #include <vcl/vclptr.hxx> @@ -129,6 +129,6 @@ private: } // namespace basctl -#endif // INCLUDED_BASCTL_SOURCE_BASICIDE_LAYOUT_HXX +#endif // INCLUDED_BASCTL_SOURCE_INC_LAYOUT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/objdlg.hxx b/basctl/source/inc/objdlg.hxx similarity index 91% rename from basctl/source/basicide/objdlg.hxx rename to basctl/source/inc/objdlg.hxx index 48b2d15..3263f77 100644 --- a/basctl/source/basicide/objdlg.hxx +++ b/basctl/source/inc/objdlg.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_OBJDLG_HXX -#define INCLUDED_BASCTL_SOURCE_BASICIDE_OBJDLG_HXX +#ifndef INCLUDED_BASCTL_SOURCE_INC_OBJDLG_HXX +#define INCLUDED_BASCTL_SOURCE_INC_OBJDLG_HXX #include "bastype2.hxx" #include "bastypes.hxx" @@ -56,6 +56,6 @@ private: } // namespace basctl -#endif // INCLUDED_BASCTL_SOURCE_BASICIDE_OBJDLG_HXX +#endif // INCLUDED_BASCTL_SOURCE_INC_OBJDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
