summaryrefslogtreecommitdiff
path: root/basctl
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-10-29 17:16:10 +0200
committerTor Lillqvist <tml@collabora.com>2015-10-29 17:19:33 +0200
commit5eb7692ab845a879d265b2e4df48cb7e4536da33 (patch)
tree57b8a8d15f20dd0d045b5ed71f90d138f2a44882 /basctl
parentee73a6c5573391f5f8e2f100f8392c34d6c61344 (diff)
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
Diffstat (limited to 'basctl')
-rw-r--r--basctl/source/inc/baside3.hxx2
-rw-r--r--basctl/source/inc/basidesh.hxx2
-rw-r--r--basctl/source/inc/bastype2.hxx (renamed from basctl/source/basicide/bastype2.hxx)7
-rw-r--r--basctl/source/inc/layout.hxx (renamed from basctl/source/basicide/layout.hxx)6
-rw-r--r--basctl/source/inc/objdlg.hxx (renamed from basctl/source/basicide/objdlg.hxx)6
5 files changed, 12 insertions, 11 deletions
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index 89a240fd9a8e..ebafb496eb1d 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 49ef4509b6d1..ec835be4700f 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
index 1f111d8a7db7..48f9e202f4dd 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
index 22762a0bdd7a..0d1c573c1dbb 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
index 48b2d15feb94..3263f777b463 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: */