diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-02-13 21:39:27 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-14 10:00:09 +0100 |
commit | 1b0397a519bf6923c2dae7919d73c0662d2da2af (patch) | |
tree | 998bb9612695c7a021273003a76adc9e4b8e3c05 | |
parent | 1e57442fc9f275828943d316ac4b64f1d29b3f9b (diff) |
use forward decls to reduce including unnecessary headers
Change-Id: Iaa25ac1ac99e0dcf09bce21f4bad8cb9b5568a1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88633
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | basctl/inc/pch/precompiled_basctl.hxx | 3 | ||||
-rw-r--r-- | dbaccess/source/ui/browser/brwview.cxx | 1 | ||||
-rw-r--r-- | dbaccess/source/ui/control/TableGrantCtrl.cxx | 1 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 1 | ||||
-rw-r--r-- | include/sfx2/infobar.hxx | 7 | ||||
-rw-r--r-- | include/svtools/editbrowsebox.hxx | 3 | ||||
-rw-r--r-- | include/svx/gridctrl.hxx | 6 | ||||
-rw-r--r-- | sd/inc/pch/precompiled_sd.hxx | 5 | ||||
-rw-r--r-- | sfx2/source/dialog/infobar.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/objserv.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/view/sfxbasecontroller.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/view/viewfrm.cxx | 1 | ||||
-rw-r--r-- | svtools/source/brwbox/ebbcontrols.cxx | 2 | ||||
-rw-r--r-- | svtools/source/brwbox/editbrowsebox.cxx | 1 | ||||
-rw-r--r-- | svx/inc/pch/precompiled_svxcore.hxx | 3 | ||||
-rw-r--r-- | svx/source/fmcomp/gridcell.cxx | 1 | ||||
-rw-r--r-- | svx/source/fmcomp/gridctrl.cxx | 2 | ||||
-rw-r--r-- | sw/inc/pch/precompiled_sw.hxx | 7 | ||||
-rw-r--r-- | vcl/inc/pch/precompiled_vcl.hxx | 4 |
19 files changed, 35 insertions, 17 deletions
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index 0eb4b291f5b4..ecd91070e149 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.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 2020-02-13 17:41:51 using: + Generated on 2020-02-13 21:29:21 using: ./bin/update_pch basctl basctl --cutoff=3 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -151,6 +151,7 @@ #include <vcl/salgtype.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/scopedbitmapaccess.hxx> +#include <vcl/scrbar.hxx> #include <vcl/settings.hxx> #include <vcl/status.hxx> #include <vcl/svapp.hxx> diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index b87d8c90666f..1bc1cd9b3386 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -22,6 +22,7 @@ #include <sbagrid.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/types.hxx> +#include <vcl/fixed.hxx> #include <vcl/split.hxx> #include "dbtreeview.hxx" #include <stringconstants.hxx> diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index 8ed237c98341..e32e0ef05345 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/sdbcx/PrivilegeObject.hpp> #include <com/sun/star/sdbcx/XUsersSupplier.hpp> #include <com/sun/star/sdbcx/XAuthorizable.hpp> +#include <vcl/button.hxx> #include <vcl/svapp.hxx> #include <osl/diagnose.h> #include <strings.hrc> diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 7fd11331b640..3c90b02df40a 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <stringconstants.hxx> #include "QTableWindow.hxx" +#include <vcl/button.hxx> #include <vcl/weld.hxx> #include <vcl/settings.hxx> #include "QueryDesignFieldUndoAct.hxx" diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx index f725a27044f2..0c866f70de5f 100644 --- a/include/sfx2/infobar.hxx +++ b/include/sfx2/infobar.hxx @@ -12,12 +12,15 @@ #include <vector> #include <basegfx/color/bcolor.hxx> -#include <vcl/button.hxx> -#include <vcl/fixed.hxx> #include <sfx2/childwin.hxx> #include <sfx2/dllapi.h> +class FixedImage; +class FixedText; +class Button; +class PushButton; + // These must match the values in offapi/com/sun/star/frame/InfobarType.idl enum class InfobarType { diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 213af400f35a..2ac388323e04 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -29,12 +29,13 @@ #include <vcl/lstbox.hxx> #include <vcl/spinfld.hxx> -#include <vcl/button.hxx> #include <svtools/brwbox.hxx> #include <svtools/brwhead.hxx> #include <svtools/svmedit.hxx> #include <o3tl/typed_flags_set.hxx> +class Button; +class CheckBox; // EditBrowseBoxFlags (EBBF) diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 33174e56aaef..28df7caf8ca8 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -20,10 +20,8 @@ #define INCLUDED_SVX_GRIDCTRL_HXX #include <com/sun/star/util/Date.hpp> -#include <vcl/fixed.hxx> #include <vcl/field.hxx> -#include <vcl/button.hxx> #include <tools/ref.hxx> #include <svtools/editbrowsebox.hxx> #include <osl/mutex.hxx> @@ -40,6 +38,10 @@ namespace com::sun::star::sdb { class XRowsChangeListener; } namespace com::sun::star::uno { class XComponentContext; } namespace com::sun::star::util { class XNumberFormatter; } +class Button; +class ImageButton; +class FixedText; + class CursorWrapper; bool CompareBookmark(const css::uno::Any& aLeft, const css::uno::Any& aRight); diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 8f64e17b59a1..672fbcd5f8d4 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.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 2020-02-05 20:47:11 using: + Generated on 2020-02-13 21:37:42 using: ./bin/update_pch sd sd --cutoff=4 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -73,17 +73,14 @@ #include <vcl/EnumContext.hxx> #include <vcl/bitmapex.hxx> #include <vcl/builderfactory.hxx> -#include <vcl/button.hxx> #include <vcl/commandevent.hxx> #include <vcl/commandinfoprovider.hxx> #include <vcl/ctrl.hxx> #include <vcl/customweld.hxx> #include <vcl/dllapi.h> -#include <vcl/edit.hxx> #include <vcl/errcode.hxx> #include <vcl/errinf.hxx> #include <vcl/event.hxx> -#include <vcl/fixed.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> #include <vcl/graph.hxx> diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index b3a9611e92f4..d73f71838ac3 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -19,6 +19,8 @@ #include <sfx2/objface.hxx> #include <sfx2/sfxsids.hrc> #include <sfx2/viewfrm.hxx> +#include <vcl/button.hxx> +#include <vcl/fixed.hxx> #include <vcl/decoview.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 275edbea273d..a0b7cb6b13f4 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -55,6 +55,7 @@ #include <svtools/DocumentToGraphicRenderer.hxx> #include <vcl/gdimtf.hxx> #include <vcl/svapp.hxx> +#include <vcl/button.hxx> #include <vcl/weld.hxx> #include <comphelper/documentconstants.hxx> #include <comphelper/storagehelper.hxx> diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 4d7f6001526b..28c41a714b0c 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -64,6 +64,7 @@ #include <toolkit/helper/convert.hxx> #include <framework/titlehelper.hxx> #include <comphelper/processfactory.hxx> +#include <vcl/button.hxx> #include <vcl/svapp.hxx> #include <tools/svborder.hxx> diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 63e7e83881c8..4d697710c0af 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -35,6 +35,7 @@ #include <officecfg/Office/Common.hxx> #include <officecfg/Setup.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <vcl/button.hxx> #include <vcl/wrkwin.hxx> #include <unotools/moduleoptions.hxx> #include <svl/intitem.hxx> diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index 157a6dc05590..822c6413e241 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -17,11 +17,11 @@ */ #include <svtools/editbrowsebox.hxx> +#include <vcl/button.hxx> #include <vcl/fmtfield.hxx> #include <vcl/xtextedt.hxx> #include <vcl/textview.hxx> - namespace svt { diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index ff76e1798531..ddf90b0305b4 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -23,6 +23,7 @@ #include <tools/debug.hxx> #include <vcl/window.hxx> +#include <vcl/button.hxx> #include <vcl/edit.hxx> #include <vcl/settings.hxx> diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index 5262f52a3f04..8a4f0d60d792 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.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 2020-02-13 17:41:00 using: + Generated on 2020-02-13 21:37:51 using: ./bin/update_pch svx svxcore --cutoff=7 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -119,7 +119,6 @@ #include <vcl/edit.hxx> #include <vcl/errcode.hxx> #include <vcl/event.hxx> -#include <vcl/fixed.hxx> #include <vcl/floatwin.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 0f58b708b2ba..1ad5422a01c8 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -62,6 +62,7 @@ #include <rtl/math.hxx> #include <svtools/calendar.hxx> +#include <vcl/button.hxx> #include <vcl/fmtfield.hxx> #include <svl/numuno.hxx> #include <svl/zforlist.hxx> diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index f0867f5743ed..e02056663d19 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -47,6 +47,8 @@ #include <tools/debug.hxx> #include <tools/fract.hxx> #include <vcl/builder.hxx> +#include <vcl/button.hxx> +#include <vcl/fixed.hxx> #include <vcl/menu.hxx> #include <vcl/settings.hxx> #include <vcl/commandevent.hxx> diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index c9c519136b7e..9784c56086a0 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.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 2020-02-13 15:23:10 using: + Generated on 2020-02-13 21:38:09 using: ./bin/update_pch sw sw --cutoff=7 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -68,6 +68,9 @@ #include <rtl/math.hxx> #include <rtl/ref.hxx> #include <rtl/strbuf.hxx> +#include <rtl/string.h> +#include <rtl/stringconcat.hxx> +#include <rtl/stringutils.hxx> #include <rtl/tencinfo.h> #include <rtl/textenc.h> #include <rtl/unload.h> @@ -87,7 +90,6 @@ #include <vcl/alpha.hxx> #include <vcl/bitmapex.hxx> #include <vcl/builderpage.hxx> -#include <vcl/button.hxx> #include <vcl/commandevent.hxx> #include <vcl/ctrl.hxx> #include <vcl/dllapi.h> @@ -97,7 +99,6 @@ #include <vcl/errcode.hxx> #include <vcl/errinf.hxx> #include <vcl/event.hxx> -#include <vcl/fixed.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> #include <vcl/graph.hxx> diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index da5d58564480..9c68ef68ce76 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 2020-02-05 20:48:33 using: + Generated on 2020-02-13 21:38:36 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: @@ -22,6 +22,7 @@ #if PCH_LEVEL >= 1 #include <algorithm> +#include <atomic> #include <cassert> #include <cstddef> #include <cstdlib> @@ -303,6 +304,7 @@ #include <vcl/outdev.hxx> #include <vcl/ptrstyle.hxx> #include <vcl/quickselectionengine.hxx> +#include <vcl/scrbar.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/svlbitm.hxx> |