diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2022-06-27 19:04:24 +1000 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2022-07-20 12:20:59 +0200 |
commit | 845393b9aa9057c5ace3c41ad5ac629b895d7f7f (patch) | |
tree | 86f6e1d8b69247c491eea72195cc1cdf5a40e4fb /include | |
parent | 6721eddbcfefd9503a49499956e53d1a76f6712f (diff) |
move wintypes.hxx from tools to vcl
Change-Id: Ief9949fd4252de9e33df172af07aa7ed097b5520
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136560
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/dbaccess/dataview.hxx | 2 | ||||
-rw-r--r-- | include/svtools/valueset.hxx | 2 | ||||
-rw-r--r-- | include/svx/fmgridif.hxx | 2 | ||||
-rw-r--r-- | include/vcl/builder.hxx | 2 | ||||
-rw-r--r-- | include/vcl/stdtext.hxx | 2 | ||||
-rw-r--r-- | include/vcl/toolkit/vclmedit.hxx | 2 | ||||
-rw-r--r-- | include/vcl/window.hxx | 2 | ||||
-rw-r--r-- | include/vcl/wintypes.hxx (renamed from include/tools/wintypes.hxx) | 6 |
8 files changed, 9 insertions, 11 deletions
diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx index 1c2cacdcf1c0..b6308663366a 100644 --- a/include/dbaccess/dataview.hxx +++ b/include/dbaccess/dataview.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <dbaccess/dbaccessdllapi.h> #include <rtl/ref.hxx> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> #include <vcl/outdev.hxx> #include <vcl/window.hxx> diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 9fe1b885e686..92c3e4e361cc 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -20,7 +20,7 @@ #pragma once #include <svtools/svtdllapi.h> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> #include <vcl/customweld.hxx> #include <vcl/image.hxx> #include <memory> diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index 668eb13350fe..f3e7f25cd32f 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -41,7 +41,7 @@ #include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> #include <toolkit/controls/unocontrol.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <comphelper/interfacecontainer3.hxx> diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index 041e4c5c3fd0..2baa0f520f59 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -19,7 +19,7 @@ #include <vcl/window.hxx> #include <vcl/vclptr.hxx> #include <vcl/toolboxid.hxx> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> #include <vcl/EnumContext.hxx> #include <memory> diff --git a/include/vcl/stdtext.hxx b/include/vcl/stdtext.hxx index c77e5ebfca42..561bbd18cb1d 100644 --- a/include/vcl/stdtext.hxx +++ b/include/vcl/stdtext.hxx @@ -25,7 +25,7 @@ #include <string_view> #include <rtl/ustring.hxx> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> #include <vcl/dllapi.h> class Image; diff --git a/include/vcl/toolkit/vclmedit.hxx b/include/vcl/toolkit/vclmedit.hxx index 3a7c4e274f2c..fedcb80687c7 100644 --- a/include/vcl/toolkit/vclmedit.hxx +++ b/include/vcl/toolkit/vclmedit.hxx @@ -24,7 +24,7 @@ #endif #include <tools/lineend.hxx> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> #include <vcl/toolkit/edit.hxx> #include <vcl/dllapi.h> #include <vcl/timer.hxx> diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 5ad39489f2cb..51324a2c8060 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -23,7 +23,7 @@ #include <vcl/dllapi.h> #include <vcl/outdev.hxx> #include <tools/link.hxx> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> #include <vcl/vclenum.hxx> #include <vcl/keycodes.hxx> #include <vcl/region.hxx> diff --git a/include/tools/wintypes.hxx b/include/vcl/wintypes.hxx index fcccd9a0d0fa..3a50b2eb3d61 100644 --- a/include/tools/wintypes.hxx +++ b/include/vcl/wintypes.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_TOOLS_WINTYPES_HXX -#define INCLUDED_TOOLS_WINTYPES_HXX + +#pragma once #include <sal/types.h> @@ -260,6 +260,4 @@ enum class StandardButtonType Count = 14, }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |