diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-02-13 12:08:13 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-14 09:59:12 +0100 |
commit | 29e9fe918d10001ddd2c7ce68064397ada98f4f6 (patch) | |
tree | f14625e61c63ff483a5ffea2f2ef75507c4130df /toolkit | |
parent | 3f893b52e726d96cb5dfebbc9afc88c28f0a8463 (diff) |
move dialog.hxx to vcl/include/toolkit
Change-Id: Ia3877f58b6e5ccc4fb1621e6b928638e0c850e7a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88602
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'toolkit')
-rw-r--r-- | toolkit/inc/helper/btndlg.hxx | 2 | ||||
-rw-r--r-- | toolkit/inc/helper/scrollabledialog.hxx | 3 | ||||
-rw-r--r-- | toolkit/source/awt/vclxaccessiblecomponent.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/awt/vclxwindows.cxx | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/toolkit/inc/helper/btndlg.hxx b/toolkit/inc/helper/btndlg.hxx index 46e6e9197004..5f3d994d4f81 100644 --- a/toolkit/inc/helper/btndlg.hxx +++ b/toolkit/inc/helper/btndlg.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_BTNDLG_HXX #define INCLUDED_VCL_BTNDLG_HXX -#include <vcl/dialog.hxx> +#include <vcl/toolkit/dialog.hxx> #include <o3tl/typed_flags_set.hxx> #include <vector> diff --git a/toolkit/inc/helper/scrollabledialog.hxx b/toolkit/inc/helper/scrollabledialog.hxx index 6dce324dbccb..099bbbd6045e 100644 --- a/toolkit/inc/helper/scrollabledialog.hxx +++ b/toolkit/inc/helper/scrollabledialog.hxx @@ -20,10 +20,9 @@ #ifndef INCLUDED_TOOLKIT_AWT_SCROLLABLEDIALOG_HXX #define INCLUDED_TOOLKIT_AWT_SCROLLABLEDIALOG_HXX -#include <vcl/dialog.hxx> +#include <vcl/toolkit/dialog.hxx> #include <vcl/scrbar.hxx> - namespace toolkit { class ScrollableDialog final : public Dialog diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index e2349b27ecc9..5e4002fb67f3 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -28,7 +28,7 @@ #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/convert.hxx> #include <toolkit/awt/vclxfont.hxx> -#include <vcl/dialog.hxx> +#include <vcl/toolkit/dialog.hxx> #include <vcl/vclevent.hxx> #include <vcl/window.hxx> #include <vcl/edit.hxx> diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index bf875134d9cf..cc3adf9c3cde 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -82,7 +82,7 @@ #include <vcl/button.hxx> #include <vcl/combobox.hxx> #include <vcl/ctrl.hxx> -#include <vcl/dialog.hxx> +#include <vcl/toolkit/dialog.hxx> #include <vcl/dockingarea.hxx> #include <vcl/dockwin.hxx> #include <vcl/edit.hxx> diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 1a500e869e7e..35bda5bf4580 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -49,7 +49,7 @@ #include <vcl/toolkit/fixedhyper.hxx> #include <vcl/longcurr.hxx> #include <vcl/toolkit/imgctrl.hxx> -#include <vcl/dialog.hxx> +#include <vcl/toolkit/dialog.hxx> #include <vcl/toolkit/prgsbar.hxx> #include <vcl/scrbar.hxx> #include <vcl/svapp.hxx> |