diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-03-02 09:41:26 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-03-03 15:54:56 +0100 |
commit | f645d4c35eebb5674a7e698c1db425afcf0784a5 (patch) | |
tree | f81443cc23c1ac609aaad0a0366bdb348b4c0043 /vcl/inc | |
parent | 93a8247598bae20a2d9b3eb9abc2578fd2e4a712 (diff) |
vcl/floatwin.hxx can be toolkit only now
Change-Id: Ifd8f58771ea6f9212a0dca7d4550c86ebecd9333
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111814
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/inc')
-rw-r--r-- | vcl/inc/NotebookbarPopup.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/bubblewindow.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/helpwin.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/listbox.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/pch/precompiled_vcl.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/scrwnd.hxx | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/vcl/inc/NotebookbarPopup.hxx b/vcl/inc/NotebookbarPopup.hxx index c417a75f4328..8d5a00cdd226 100644 --- a/vcl/inc/NotebookbarPopup.hxx +++ b/vcl/inc/NotebookbarPopup.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SFX2_NOTEBOOKBAR_NOTEBOOKBARPOPUP_HXX #include <vcl/layout.hxx> -#include <vcl/floatwin.hxx> +#include <vcl/toolkit/floatwin.hxx> /* * Popup - shows hidden content, controls are moved to this popup diff --git a/vcl/inc/bubblewindow.hxx b/vcl/inc/bubblewindow.hxx index 2583885b8d5a..b80cdfd7b1d1 100644 --- a/vcl/inc/bubblewindow.hxx +++ b/vcl/inc/bubblewindow.hxx @@ -19,7 +19,7 @@ #pragma once -#include <vcl/floatwin.hxx> +#include <vcl/toolkit/floatwin.hxx> #include <vcl/image.hxx> #include <vcl/menu.hxx> diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx index 089f7417c45f..db8456fd2103 100644 --- a/vcl/inc/helpwin.hxx +++ b/vcl/inc/helpwin.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_INC_HELPWIN_HXX #define INCLUDED_VCL_INC_HELPWIN_HXX -#include <vcl/floatwin.hxx> +#include <vcl/toolkit/floatwin.hxx> #include <vcl/timer.hxx> enum class QuickHelpFlags; diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx index 816e7ff50c56..95c2ed959627 100644 --- a/vcl/inc/listbox.hxx +++ b/vcl/inc/listbox.hxx @@ -24,7 +24,7 @@ #include <o3tl/safeint.hxx> #include <vcl/toolkit/button.hxx> -#include <vcl/floatwin.hxx> +#include <vcl/toolkit/floatwin.hxx> #include <vcl/quickselectionengine.hxx> #include <vcl/glyphitem.hxx> #include <vcl/vcllayout.hxx> diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index 5aecf7ceaf3a..6306a6f4c8ae 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2021-02-19 15:35:44 using: + Generated on 2021-03-02 09:40:57 using: ./bin/update_pch vcl vcl --cutoff=6 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -299,7 +299,6 @@ #include <vcl/dllapi.h> #include <vcl/dockwin.hxx> #include <vcl/event.hxx> -#include <vcl/floatwin.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> #include <vcl/gdimtf.hxx> @@ -332,6 +331,7 @@ #include <vcl/toolkit/dialog.hxx> #include <vcl/toolkit/edit.hxx> #include <vcl/toolkit/fixed.hxx> +#include <vcl/toolkit/floatwin.hxx> #include <vcl/toolkit/lstbox.hxx> #include <vcl/toolkit/spinfld.hxx> #include <vcl/toolkit/svlbitm.hxx> diff --git a/vcl/inc/scrwnd.hxx b/vcl/inc/scrwnd.hxx index 879daa9c5021..a8c897bc95e2 100644 --- a/vcl/inc/scrwnd.hxx +++ b/vcl/inc/scrwnd.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_INC_SCRWND_HXX #define INCLUDED_VCL_INC_SCRWND_HXX -#include <vcl/floatwin.hxx> +#include <vcl/toolkit/floatwin.hxx> #include <vcl/bitmap.hxx> #include <vcl/image.hxx> |