diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2020-02-01 11:00:54 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2020-02-01 20:12:21 +0100 |
commit | 69e0d871ec1de2260f9213d3113464155eac173c (patch) | |
tree | 8e2d70bcd7eaef2c0dec275dd89050bf499e17b9 /framework/inc | |
parent | 961f7e8ec8ef188c361b2b20b60b95e78ecccd33 (diff) |
make update_pch also consider files in <module>/src/**/inc
With --enable-pch=full there's not much difference between a "public"
header in <module>/inc and a private one in <module>/src/somewhere/inc .
And since the script searches recursively, this apparently helps to
find even more headers for lower pch levels.
Change-Id: I8483d0aa5b4fea5a59107c20a8aa5f1ef694af0a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87799
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'framework/inc')
-rw-r--r-- | framework/inc/pch/precompiled_fwe.hxx | 15 | ||||
-rw-r--r-- | framework/inc/pch/precompiled_fwk.hxx | 62 | ||||
-rw-r--r-- | framework/inc/pch/precompiled_fwl.hxx | 61 |
3 files changed, 15 insertions, 123 deletions
diff --git a/framework/inc/pch/precompiled_fwe.hxx b/framework/inc/pch/precompiled_fwe.hxx index 11810cf2cd53..7317f6a31440 100644 --- a/framework/inc/pch/precompiled_fwe.hxx +++ b/framework/inc/pch/precompiled_fwe.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 2019-10-17 15:14:47 using: + Generated on 2020-01-22 15:57:45 using: ./bin/update_pch framework fwe --cutoff=10 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -44,21 +44,17 @@ #include <type_traits> #include <utility> #include <vector> -#include <o3tl/optional.hxx> -#include <boost/property_tree/ptree.hpp> +#include <boost/property_tree/ptree_fwd.hpp> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/conditn.hxx> #include <osl/diagnose.h> -#include <osl/doublecheckedlocking.h> #include <osl/endian.h> -#include <osl/getglobalmutex.hxx> #include <osl/interlck.h> #include <osl/mutex.h> #include <osl/mutex.hxx> #include <osl/thread.h> #include <rtl/alloc.h> -#include <rtl/instance.hxx> #include <rtl/math.h> #include <rtl/math.hxx> #include <rtl/ref.hxx> @@ -127,7 +123,6 @@ #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> #include <com/sun/star/drawing/LineCap.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.h> @@ -139,19 +134,15 @@ #include <com/sun/star/uno/Type.hxx> #include <com/sun/star/uno/TypeClass.hdl> #include <com/sun/star/uno/XInterface.hpp> -#include <com/sun/star/uno/XWeak.hpp> #include <com/sun/star/uno/genfunc.h> #include <com/sun/star/uno/genfunc.hxx> #include <comphelper/comphelperdllapi.h> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> #include <cppuhelper/cppuhelperdllapi.h> -#include <cppuhelper/implbase_ex.hxx> -#include <cppuhelper/implbase_ex_post.hxx> -#include <cppuhelper/implbase_ex_pre.hxx> -#include <cppuhelper/weak.hxx> #include <i18nlangtag/lang.h> #include <o3tl/cow_wrapper.hxx> +#include <o3tl/optional.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx index 9f48848a1327..6095da597bc4 100644 --- a/framework/inc/pch/precompiled_fwk.hxx +++ b/framework/inc/pch/precompiled_fwk.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 2019-10-17 15:14:52 using: + Generated on 2020-01-22 15:57:46 using: ./bin/update_pch framework fwk --cutoff=7 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -44,16 +44,13 @@ #include <unordered_map> #include <utility> #include <vector> -#include <o3tl/optional.hxx> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/conditn.h> #include <osl/conditn.hxx> #include <osl/diagnose.h> -#include <osl/doublecheckedlocking.h> #include <osl/endian.h> #include <osl/file.hxx> -#include <osl/getglobalmutex.hxx> #include <osl/interlck.h> #include <osl/mutex.hxx> #include <osl/security.h> @@ -62,7 +59,6 @@ #include <osl/time.h> #include <rtl/alloc.h> #include <rtl/bootstrap.hxx> -#include <rtl/instance.hxx> #include <rtl/locale.h> #include <rtl/math.h> #include <rtl/math.hxx> @@ -75,8 +71,6 @@ #include <rtl/stringutils.hxx> #include <rtl/textcvt.h> #include <rtl/textenc.h> -#include <rtl/unload.h> -#include <rtl/uri.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.h> #include <rtl/ustring.hxx> @@ -100,15 +94,14 @@ #include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> #include <vcl/dndhelp.hxx> -#include <vcl/evntpost.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> +#include <vcl/image.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/mapmod.hxx> #include <vcl/menu.hxx> #include <vcl/metaactiontypes.hxx> -#include <vcl/mnemonic.hxx> #include <vcl/outdev.hxx> #include <vcl/outdevmap.hxx> #include <vcl/outdevstate.hxx> @@ -116,9 +109,7 @@ #include <vcl/salnativewidgets.hxx> #include <vcl/scopedbitmapaccess.hxx> #include <vcl/settings.hxx> -#include <vcl/status.hxx> #include <vcl/svapp.hxx> -#include <vcl/syswin.hxx> #include <vcl/task.hxx> #include <vcl/textfilter.hxx> #include <vcl/timer.hxx> @@ -147,28 +138,9 @@ #include <basegfx/vector/b2ivector.hxx> #include <classes/fwkresid.hxx> #include <com/sun/star/awt/Key.hpp> +#include <com/sun/star/awt/KeyEvent.hpp> #include <com/sun/star/awt/KeyGroup.hpp> -#include <com/sun/star/awt/XActionListener.hpp> -#include <com/sun/star/awt/XAdjustmentListener.hpp> -#include <com/sun/star/awt/XFocusListener.hpp> -#include <com/sun/star/awt/XItemListener.hpp> -#include <com/sun/star/awt/XKeyListener.hpp> -#include <com/sun/star/awt/XMenuBar.hpp> -#include <com/sun/star/awt/XMenuListener.hpp> -#include <com/sun/star/awt/XMouseListener.hpp> -#include <com/sun/star/awt/XMouseMotionListener.hpp> -#include <com/sun/star/awt/XPaintListener.hpp> -#include <com/sun/star/awt/XSpinListener.hpp> -#include <com/sun/star/awt/XTabListener.hpp> -#include <com/sun/star/awt/XTextListener.hpp> -#include <com/sun/star/awt/XTopWindow.hpp> -#include <com/sun/star/awt/XTopWindowListener.hpp> -#include <com/sun/star/awt/XVclContainerListener.hpp> -#include <com/sun/star/awt/XWindowListener.hpp> -#include <com/sun/star/awt/grid/XGridSelectionListener.hpp> -#include <com/sun/star/awt/tab/XTabPageContainerListener.hpp> -#include <com/sun/star/awt/tree/XTreeEditListener.hpp> -#include <com/sun/star/awt/tree/XTreeExpansionListener.hpp> +#include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -177,11 +149,8 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetOption.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> -#include <com/sun/star/container/XContainer.hpp> -#include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp> #include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp> #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> @@ -197,23 +166,16 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XFrameActionListener.hpp> #include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/XStatusbarController.hpp> #include <com/sun/star/frame/XUIControllerFactory.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> +#include <com/sun/star/task/XInteractionRequest.hpp> #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/XImageManager.hpp> -#include <com/sun/star/ui/XUIConfiguration.hpp> #include <com/sun/star/ui/XUIConfigurationListener.hpp> -#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XUIElement.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> @@ -235,13 +197,10 @@ #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/util/XUpdatable.hpp> -#include <com/sun/star/view/XSelectionChangeListener.hpp> #include <comphelper/comphelperdllapi.h> -#include <comphelper/interfacecontainer2.hxx> #include <comphelper/propertysequence.hxx> #include <comphelper/sequence.hxx> #include <comphelper/sequenceashashmap.hxx> -#include <comphelper/servicehelper.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> #include <cppuhelper/basemutex.hxx> @@ -258,6 +217,7 @@ #include <i18nlangtag/lang.h> #include <o3tl/cow_wrapper.hxx> #include <o3tl/deleter.hxx> +#include <o3tl/optional.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> @@ -265,11 +225,7 @@ #include <svtools/miscopt.hxx> #include <svtools/svtdllapi.h> #include <svtools/toolboxcontroller.hxx> -#include <threadhelp/gate.hxx> -#include <threadhelp/transactionmanager.hxx> -#include <toolkit/dllapi.h> -#include <toolkit/helper/macros.hxx> -#include <toolkit/helper/mutexhelper.hxx> +#include <toolkit/awt/vclxmenu.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/color.hxx> #include <tools/diagnose_ex.h> @@ -289,7 +245,6 @@ #include <uno/any2.h> #include <uno/data.h> #include <uno/sequence2.h> -#include <unotools/configmgr.hxx> #include <unotools/fontdefs.hxx> #include <unotools/options.hxx> #include <unotools/unotoolsdllapi.h> @@ -299,8 +254,7 @@ #include <framework/fwedllapi.h> #include <fwidllapi.h> #include <properties.h> -#include <services.h> -#include <stdtypes.h> +#include <targets.h> #endif // PCH_LEVEL >= 4 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/pch/precompiled_fwl.hxx b/framework/inc/pch/precompiled_fwl.hxx index 103c91fd472a..9d09880ad525 100644 --- a/framework/inc/pch/precompiled_fwl.hxx +++ b/framework/inc/pch/precompiled_fwl.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 2019-10-17 15:14:54 using: + Generated on 2020-01-22 15:57:46 using: ./bin/update_pch framework fwl --cutoff=5 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -24,7 +24,6 @@ #include <algorithm> #include <cassert> #include <cstddef> -#include <cstdlib> #include <cstring> #include <float.h> #include <functional> @@ -36,8 +35,6 @@ #include <memory> #include <new> #include <ostream> -#include <queue> -#include <sstream> #include <stddef.h> #include <string.h> #include <string> @@ -46,16 +43,13 @@ #include <unordered_map> #include <utility> #include <vector> -#include <o3tl/optional.hxx> -#include <boost/property_tree/ptree.hpp> +#include <boost/property_tree/ptree_fwd.hpp> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 -#include <osl/conditn.h> #include <osl/conditn.hxx> #include <osl/diagnose.h> #include <osl/doublecheckedlocking.h> #include <osl/endian.h> -#include <osl/file.hxx> #include <osl/getglobalmutex.hxx> #include <osl/interlck.h> #include <osl/mutex.hxx> @@ -76,10 +70,10 @@ #include <rtl/textcvt.h> #include <rtl/textenc.h> #include <rtl/unload.h> +#include <rtl/ustrbuf.h> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.h> #include <rtl/ustring.hxx> -#include <rtl/uuid.h> #include <sal/config.h> #include <sal/detail/log.h> #include <sal/log.hxx> @@ -91,15 +85,12 @@ #include <vcl/Scanline.hxx> #include <vcl/alpha.hxx> #include <vcl/bitmap.hxx> -#include <vcl/bitmapex.hxx> #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> #include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> -#include <vcl/i18nhelp.hxx> -#include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/mapmod.hxx> #include <vcl/menu.hxx> @@ -110,7 +101,6 @@ #include <vcl/region.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/scopedbitmapaccess.hxx> -#include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/vclenum.hxx> #include <vcl/vclptr.hxx> @@ -134,56 +124,24 @@ #include <basegfx/vector/b2enums.hxx> #include <basegfx/vector/b2ivector.hxx> #include <com/sun/star/awt/Key.hpp> -#include <com/sun/star/awt/KeyEvent.hpp> #include <com/sun/star/awt/KeyGroup.hpp> -#include <com/sun/star/awt/MenuItemStyle.hpp> -#include <com/sun/star/awt/XActionListener.hpp> -#include <com/sun/star/awt/XAdjustmentListener.hpp> -#include <com/sun/star/awt/XDevice.hpp> -#include <com/sun/star/awt/XFocusListener.hpp> -#include <com/sun/star/awt/XItemListener.hpp> -#include <com/sun/star/awt/XKeyListener.hpp> -#include <com/sun/star/awt/XMenuBar.hpp> -#include <com/sun/star/awt/XMenuListener.hpp> -#include <com/sun/star/awt/XMouseListener.hpp> -#include <com/sun/star/awt/XMouseMotionListener.hpp> -#include <com/sun/star/awt/XPaintListener.hpp> -#include <com/sun/star/awt/XPopupMenu.hpp> -#include <com/sun/star/awt/XSpinListener.hpp> -#include <com/sun/star/awt/XTabListener.hpp> -#include <com/sun/star/awt/XTextListener.hpp> -#include <com/sun/star/awt/XTopWindowListener.hpp> -#include <com/sun/star/awt/XVclContainerListener.hpp> -#include <com/sun/star/awt/XWindowListener.hpp> -#include <com/sun/star/awt/grid/XGridSelectionListener.hpp> -#include <com/sun/star/awt/tab/XTabPageContainerListener.hpp> -#include <com/sun/star/awt/tree/XTreeEditListener.hpp> -#include <com/sun/star/awt/tree/XTreeExpansionListener.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/container/XContainerListener.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/drawing/LineCap.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> -#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/RuntimeException.hpp> @@ -200,25 +158,20 @@ #include <com/sun/star/uno/genfunc.hxx> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/view/XSelectionChangeListener.hpp> #include <comphelper/comphelperdllapi.h> -#include <comphelper/interfacecontainer2.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/servicehelper.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/compbase_ex.hxx> #include <cppuhelper/cppuhelperdllapi.h> -#include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase_ex.hxx> #include <cppuhelper/implbase_ex_post.hxx> #include <cppuhelper/implbase_ex_pre.hxx> #include <cppuhelper/interfacecontainer.h> -#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> @@ -227,6 +180,7 @@ #include <i18nlangtag/lang.h> #include <macros/xserviceinfo.hxx> #include <o3tl/cow_wrapper.hxx> +#include <o3tl/optional.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> @@ -234,12 +188,7 @@ #include <svtools/popupmenucontrollerbase.hxx> #include <svtools/svtdllapi.h> #include <toolkit/awt/vclxmenu.hxx> -#include <toolkit/dllapi.h> -#include <toolkit/helper/listenermultiplexer.hxx> -#include <toolkit/helper/macros.hxx> -#include <toolkit/helper/mutexhelper.hxx> #include <tools/color.hxx> -#include <tools/diagnose_ex.h> #include <tools/fontenum.hxx> #include <tools/gen.hxx> #include <tools/link.hxx> @@ -260,9 +209,7 @@ #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 #include <framework/fwedllapi.h> -#include <fwidllapi.h> #include <services.h> -#include <stdtypes.h> #endif // PCH_LEVEL >= 4 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |