diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/vcl/toolkit/svlbitm.hxx | 2 | ||||
-rw-r--r-- | include/vcl/toolkit/svtabbx.hxx | 2 | ||||
-rw-r--r-- | include/vcl/toolkit/treelist.hxx (renamed from include/vcl/treelist.hxx) | 11 | ||||
-rw-r--r-- | include/vcl/toolkit/treelistbox.hxx (renamed from include/vcl/treelistbox.hxx) | 11 | ||||
-rw-r--r-- | include/vcl/toolkit/treelistentries.hxx (renamed from include/vcl/treelistentries.hxx) | 10 | ||||
-rw-r--r-- | include/vcl/toolkit/treelistentry.hxx (renamed from include/vcl/treelistentry.hxx) | 13 | ||||
-rw-r--r-- | include/vcl/toolkit/viewdataentry.hxx (renamed from include/vcl/viewdataentry.hxx) | 9 | ||||
-rw-r--r-- | include/vcl/uitest/uiobject.hxx | 1 |
8 files changed, 32 insertions, 27 deletions
diff --git a/include/vcl/toolkit/svlbitm.hxx b/include/vcl/toolkit/svlbitm.hxx index e4e6fbc57a7d..850763abf76d 100644 --- a/include/vcl/toolkit/svlbitm.hxx +++ b/include/vcl/toolkit/svlbitm.hxx @@ -27,7 +27,7 @@ #include <vcl/dllapi.h> #include <tools/link.hxx> #include <vcl/image.hxx> -#include <vcl/treelistbox.hxx> +#include <vcl/toolkit/treelistbox.hxx> #include <o3tl/typed_flags_set.hxx> class SvTreeListEntry; diff --git a/include/vcl/toolkit/svtabbx.hxx b/include/vcl/toolkit/svtabbx.hxx index 17a0b3282251..3e1a8a00b032 100644 --- a/include/vcl/toolkit/svtabbx.hxx +++ b/include/vcl/toolkit/svtabbx.hxx @@ -23,7 +23,7 @@ #endif #include <vcl/dllapi.h> -#include <vcl/treelistbox.hxx> +#include <vcl/toolkit/treelistbox.hxx> #include <vcl/accessibletableprovider.hxx> #include <tools/debug.hxx> diff --git a/include/vcl/treelist.hxx b/include/vcl/toolkit/treelist.hxx index 50698ec2b68b..3ca4a05b009b 100644 --- a/include/vcl/treelist.hxx +++ b/include/vcl/toolkit/treelist.hxx @@ -17,11 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_TREELIST_HXX -#define INCLUDED_VCL_TREELIST_HXX +#pragma once + +#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS) +#error "don't use this in new code" +#endif #include <vcl/dllapi.h> -#include <vcl/treelistentries.hxx> +#include <vcl/toolkit/treelistentries.hxx> #include <tools/solar.h> #include <tools/link.hxx> @@ -296,6 +299,4 @@ public: virtual void ModelHasEntryInvalidated( SvTreeListEntry* pEntry ); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/treelistbox.hxx b/include/vcl/toolkit/treelistbox.hxx index 578d815c641b..c8ccdd775ac3 100644 --- a/include/vcl/treelistbox.hxx +++ b/include/vcl/toolkit/treelistbox.hxx @@ -17,8 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_TREELISTBOX_HXX -#define INCLUDED_VCL_TREELISTBOX_HXX +#pragma once + +#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS) +#error "don't use this in new code" +#endif #include <vcl/dllapi.h> @@ -31,7 +34,7 @@ #include <vcl/image.hxx> #include <tools/gen.hxx> #include <tools/contnr.hxx> -#include <vcl/treelist.hxx> +#include <vcl/toolkit/treelist.hxx> #include <vcl/transfer.hxx> #include <vcl/menu.hxx> #include <o3tl/typed_flags_set.hxx> @@ -698,6 +701,4 @@ public: void SetDragHelper(rtl::Reference<TransferDataContainer>& rHelper, sal_uInt8 eDNDConstants); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/treelistentries.hxx b/include/vcl/toolkit/treelistentries.hxx index ffe0cb571c55..fdd86dbfaf5f 100644 --- a/include/vcl/treelistentries.hxx +++ b/include/vcl/toolkit/treelistentries.hxx @@ -7,8 +7,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_VCL_TREELISTENTRIES_HXX -#define INCLUDED_VCL_TREELISTENTRIES_HXX +#pragma once + +#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) \ + && !defined(VCL_INTERNALS) +#error "don't use this in new code" +#endif #include <vector> #include <memory> @@ -16,6 +20,4 @@ class SvTreeListEntry; typedef std::vector<std::unique_ptr<SvTreeListEntry>> SvTreeListEntries; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/treelistentry.hxx b/include/vcl/toolkit/treelistentry.hxx index 14a4dc486f44..dbfa87b204ac 100644 --- a/include/vcl/treelistentry.hxx +++ b/include/vcl/toolkit/treelistentry.hxx @@ -17,14 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_TREELISTENTRY_HXX -#define INCLUDED_VCL_TREELISTENTRY_HXX +#pragma once + +#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS) +#error "don't use this in new code" +#endif #include <vcl/dllapi.h> #include <tools/solar.h> #include <tools/color.hxx> -#include <vcl/treelistbox.hxx> -#include <vcl/treelistentries.hxx> +#include <vcl/toolkit/treelistbox.hxx> +#include <vcl/toolkit/treelistentries.hxx> #include <o3tl/typed_flags_set.hxx> #include <optional> @@ -126,6 +129,4 @@ public: SvTreeListEntry* LastSibling() const; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/viewdataentry.hxx b/include/vcl/toolkit/viewdataentry.hxx index c81ab05a97e3..daac693d8893 100644 --- a/include/vcl/viewdataentry.hxx +++ b/include/vcl/toolkit/viewdataentry.hxx @@ -17,8 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_VIEWDATAENTRY_HXX -#define INCLUDED_VCL_VIEWDATAENTRY_HXX +#pragma once + +#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS) +#error "don't use this in new code" +#endif #include <tools/solar.h> @@ -80,6 +83,4 @@ public: SvViewDataItem& GetItem(size_t nPos); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx index c5b3f07dbe75..50533157e19b 100644 --- a/include/vcl/uitest/uiobject.hxx +++ b/include/vcl/uitest/uiobject.hxx @@ -16,7 +16,6 @@ #include <vcl/window.hxx> #include <vcl/dllapi.h> -#include <vcl/treelistbox.hxx> #include <set> |