diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2020-02-04 20:46:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-02-05 07:11:33 +0100 |
| commit | fcf39ae78e02db89dc5969b93a91c992c9924b57 (patch) | |
| tree | bacb089d3cf2039f9c07080bb66066491d1a5e89 | |
| parent | 7d886eec953efa593708db9560d0e69ac12c99cf (diff) | |
move some toolkit/ headers inside the module
Change-Id: I88badb1eb586db00a350afbcd6f4903a5623c724
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87988
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
65 files changed, 207 insertions, 282 deletions
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 43334663e7ff..998881576742 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -321,36 +321,10 @@ blacklist: include/toolkit/awt/vclxaccessiblecomponent.hxx: # base class has to be a complete type - com/sun/star/lang/XServiceInfo.hpp - include/toolkit/awt/animatedimagespeer.hxx: - # base class has to be a complete type - - com/sun/star/awt/XAnimation.hpp - - com/sun/star/container/XContainerListener.hpp - - com/sun/star/util/XModifyListener.hpp - - toolkit/awt/vclxwindow.hxx - include/toolkit/awt/vclxpointer.hxx: - # base class has to be a complete type - - com/sun/star/awt/XPointer.hpp - - com/sun/star/lang/XServiceInfo.hpp - - com/sun/star/lang/XUnoTunnel.hpp - include/toolkit/awt/vclxspinbutton.hxx: - # base class has to be a complete type - - com/sun/star/awt/XSpinValue.hpp - include/toolkit/awt/vclxprinter.hxx: - # base class has to be a complete type - - com/sun/star/awt/XPrinterPropertySet.hpp - - com/sun/star/awt/XInfoPrinter.hpp - - com/sun/star/awt/XPrinterPropertySet.hpp - - com/sun/star/awt/XPrinterServer.hpp - - com/sun/star/lang/XServiceInfo.hpp include/toolkit/awt/vclxtopwindow.hxx: # base class has to be a complete type - com/sun/star/awt/XTopWindow2.hpp - com/sun/star/awt/XSystemDependentWindowPeer.hpp - include/toolkit/awt/vclxtabpagecontainer.hxx: - # base class has to be a complete type - - com/sun/star/awt/tab/XTabPageContainer.hpp - - com/sun/star/container/XContainerListener.hpp - - toolkit/awt/vclxcontainer.hxx include/toolkit/awt/vclxwindow.hxx: # base class has to be a complete type - toolkit/awt/vclxdevice.hxx @@ -368,55 +342,6 @@ blacklist: - com/sun/star/awt/XToggleButton.hpp - com/sun/star/awt/XComboBox.hpp - com/sun/star/awt/XItemListListener.hpp - include/toolkit/controls/accessiblecontrolcontext.hxx: - # base class has to be a complete type - - com/sun/star/lang/XEventListener.hpp - include/toolkit/controls/animatedimages.hxx: - # base class has to be a complete type - - com/sun/star/awt/XAnimatedImages.hpp - - toolkit/controls/unocontrolmodel.hxx - include/toolkit/controls/controlmodelcontainerbase.hxx: - # base class has to be a complete type - - com/sun/star/awt/tab/XTabPageModel.hpp - - com/sun/star/awt/XTabControllerModel.hpp - - com/sun/star/beans/XPropertyChangeListener.hpp - - com/sun/star/container/XContainer.hpp - - com/sun/star/container/XNameContainer.hpp - - com/sun/star/lang/XInitialization.hpp - - com/sun/star/lang/XMultiServiceFactory.hpp - - com/sun/star/util/XChangesListener.hpp - - com/sun/star/util/XChangesNotifier.hpp - - toolkit/controls/unocontrolcontainer.hxx - include/toolkit/controls/dialogcontrol.hxx: - # base class has to be a complete type - - com/sun/star/awt/UnoControlDialog.hpp - include/toolkit/controls/eventcontainer.hxx: - # base class has to be a complete type - - com/sun/star/container/XContainer.hpp - - com/sun/star/container/XNameContainer.hpp - include/toolkit/controls/geometrycontrolmodel.hxx: - # base class has to be a complete type - - com/sun/star/script/XScriptEventsSupplier.hpp - - com/sun/star/util/XCloneable.hpp - # Needed for template classes - - toolkit/controls/geometrycontrolmodel_impl.hxx - include/toolkit/controls/roadmapcontrol.hxx: - # base class has to be a complete type - - com/sun/star/awt/XItemEventBroadcaster.hpp - - com/sun/star/awt/XItemListener.hpp - - com/sun/star/beans/XPropertyChangeListener.hpp - - com/sun/star/container/XContainerListener.hpp - include/toolkit/controls/roadmapentry.hxx: - # base class has to be a complete type - - com/sun/star/lang/XServiceInfo.hpp - include/toolkit/controls/tabpagecontainer.hxx: - # base class has to be a complete type - - com/sun/star/awt/tab/XTabPageContainer.hpp - - toolkit/controls/controlmodelcontainerbase.hxx - include/toolkit/controls/tabpagemodel.hxx: - # base class has to be a complete type - - com/sun/star/awt/tab/XTabPage.hpp - - toolkit/controls/unocontrolcontainer.hxx include/toolkit/controls/unocontrol.hxx: # base class has to be a complete type - com/sun/star/awt/XControl.hpp @@ -428,13 +353,6 @@ blacklist: - com/sun/star/awt/XStyleSettingsSupplier.hpp - com/sun/star/accessibility/XAccessible.hpp - com/sun/star/util/XModeChangeBroadcaster.hpp - include/toolkit/controls/unocontrolcontainer.hxx: - # base class has to be a complete type - - com/sun/star/awt/XControlContainer.hpp - - com/sun/star/awt/XUnoControlContainer.hpp - - com/sun/star/container/XContainer.hpp - - com/sun/star/container/XIdentifierContainer.hpp - - toolkit/controls/unocontrolbase.hxx include/toolkit/controls/unocontrolmodel.hxx: # base class has to be a complete type - com/sun/star/awt/XControlModel.hpp diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 789204888ac0..e5f6d3a7d853 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -7441,42 +7441,16 @@ include/test/util/xreplaceable.hxx include/test/util/xsearchable.hxx include/test/xmldiff.hxx include/test/xmltesttools.hxx -include/toolkit/awt/animatedimagespeer.hxx include/toolkit/awt/vclxaccessiblecomponent.hxx -include/toolkit/awt/vclxbitmap.hxx include/toolkit/awt/vclxcontainer.hxx include/toolkit/awt/vclxdevice.hxx include/toolkit/awt/vclxfont.hxx -include/toolkit/awt/vclxgraphics.hxx include/toolkit/awt/vclxmenu.hxx -include/toolkit/awt/vclxpointer.hxx -include/toolkit/awt/vclxprinter.hxx -include/toolkit/awt/vclxregion.hxx -include/toolkit/awt/vclxspinbutton.hxx -include/toolkit/awt/vclxsystemdependentwindow.hxx -include/toolkit/awt/vclxtabpagecontainer.hxx include/toolkit/awt/vclxtopwindow.hxx include/toolkit/awt/vclxwindow.hxx include/toolkit/awt/vclxwindows.hxx -include/toolkit/controls/accessiblecontrolcontext.hxx -include/toolkit/controls/animatedimages.hxx -include/toolkit/controls/controlmodelcontainerbase.hxx -include/toolkit/controls/dialogcontrol.hxx -include/toolkit/controls/eventcontainer.hxx -include/toolkit/controls/formattedcontrol.hxx -include/toolkit/controls/geometrycontrolmodel.hxx -include/toolkit/controls/geometrycontrolmodel_impl.hxx -include/toolkit/controls/roadmapcontrol.hxx -include/toolkit/controls/roadmapentry.hxx -include/toolkit/controls/stdtabcontroller.hxx -include/toolkit/controls/stdtabcontrollermodel.hxx -include/toolkit/controls/tabpagecontainer.hxx -include/toolkit/controls/tabpagemodel.hxx -include/toolkit/controls/tkscrollbar.hxx include/toolkit/controls/unocontrol.hxx include/toolkit/controls/unocontrolbase.hxx -include/toolkit/controls/unocontrolcontainer.hxx -include/toolkit/controls/unocontrolcontainermodel.hxx include/toolkit/controls/unocontrolmodel.hxx include/toolkit/controls/unocontrols.hxx include/toolkit/dllapi.h @@ -7489,7 +7463,6 @@ include/toolkit/helper/macros.hxx include/toolkit/helper/mutexandbroadcasthelper.hxx include/toolkit/helper/mutexhelper.hxx include/toolkit/helper/property.hxx -include/toolkit/helper/servicenames.hxx include/toolkit/helper/vclunohelper.hxx include/tools/b3dtrans.hxx include/tools/bigint.hxx @@ -16327,10 +16300,37 @@ testtools/source/bridgetest/multi.hxx testtools/source/performance/pseudo.cxx testtools/source/performance/ubobject.cxx testtools/source/performance/ubtest.cxx +toolkit/inc/awt/animatedimagespeer.hxx +toolkit/inc/awt/vclxbitmap.hxx +toolkit/inc/awt/vclxgraphics.hxx +toolkit/inc/awt/vclxpointer.hxx +toolkit/inc/awt/vclxprinter.hxx +toolkit/inc/awt/vclxregion.hxx +toolkit/inc/awt/vclxspinbutton.hxx +toolkit/inc/awt/vclxsystemdependentwindow.hxx +toolkit/inc/awt/vclxtabpagecontainer.hxx +toolkit/inc/controls/accessiblecontrolcontext.hxx +toolkit/inc/controls/animatedimages.hxx +toolkit/inc/controls/controlmodelcontainerbase.hxx +toolkit/inc/controls/dialogcontrol.hxx +toolkit/inc/controls/eventcontainer.hxx +toolkit/inc/controls/formattedcontrol.hxx +toolkit/inc/controls/geometrycontrolmodel.hxx +toolkit/inc/controls/geometrycontrolmodel_impl.hxx +toolkit/inc/controls/roadmapcontrol.hxx +toolkit/inc/controls/roadmapentry.hxx +toolkit/inc/controls/stdtabcontroller.hxx +toolkit/inc/controls/stdtabcontrollermodel.hxx +toolkit/inc/controls/tabpagecontainer.hxx +toolkit/inc/controls/tabpagemodel.hxx +toolkit/inc/controls/tkscrollbar.hxx +toolkit/inc/controls/unocontrolcontainer.hxx +toolkit/inc/controls/unocontrolcontainermodel.hxx toolkit/inc/helper/accessibilityclient.hxx toolkit/inc/helper/btndlg.hxx toolkit/inc/helper/imagealign.hxx toolkit/inc/helper/scrollabledialog.hxx +toolkit/inc/helper/servicenames.hxx toolkit/inc/helper/tkresmgr.hxx toolkit/inc/helper/unopropertyarrayhelper.hxx toolkit/inc/helper/unowrapper.hxx diff --git a/toolkit/IwyuFilter_toolkit.yaml b/toolkit/IwyuFilter_toolkit.yaml index b29efcf83049..1def465699bb 100644 --- a/toolkit/IwyuFilter_toolkit.yaml +++ b/toolkit/IwyuFilter_toolkit.yaml @@ -7,3 +7,85 @@ blacklist: toolkit/source/helper/servicenames.cxx: # Needed for extern array declarations - toolkit/helper/servicenames.hxx + toolkit/inc/awt/animatedimagespeer.hxx: + # base class has to be a complete type + - com/sun/star/awt/XAnimation.hpp + - com/sun/star/container/XContainerListener.hpp + - com/sun/star/util/XModifyListener.hpp + - toolkit/awt/vclxwindow.hxx + toolkit/inc/awt/vclxpointer.hxx: + # base class has to be a complete type + - com/sun/star/awt/XPointer.hpp + - com/sun/star/lang/XServiceInfo.hpp + - com/sun/star/lang/XUnoTunnel.hpp + toolkit/inc/awt/vclxspinbutton.hxx: + # base class has to be a complete type + - com/sun/star/awt/XSpinValue.hpp + toolkit/inc/awt/vclxprinter.hxx: + # base class has to be a complete type + - com/sun/star/awt/XPrinterPropertySet.hpp + - com/sun/star/awt/XInfoPrinter.hpp + - com/sun/star/awt/XPrinterPropertySet.hpp + - com/sun/star/awt/XPrinterServer.hpp + - com/sun/star/lang/XServiceInfo.hpp + toolkit/inc/awt/vclxtabpagecontainer.hxx: + # base class has to be a complete type + - com/sun/star/awt/tab/XTabPageContainer.hpp + - com/sun/star/container/XContainerListener.hpp + - toolkit/awt/vclxcontainer.hxx + toolkit/inc/controls/accessiblecontrolcontext.hxx: + # base class has to be a complete type + - com/sun/star/lang/XEventListener.hpp + toolkit/inc/controls/animatedimages.hxx: + # base class has to be a complete type + - com/sun/star/awt/XAnimatedImages.hpp + - toolkit/controls/unocontrolmodel.hxx + toolkit/inc/controls/controlmodelcontainerbase.hxx: + # base class has to be a complete type + - com/sun/star/awt/tab/XTabPageModel.hpp + - com/sun/star/awt/XTabControllerModel.hpp + - com/sun/star/beans/XPropertyChangeListener.hpp + - com/sun/star/container/XContainer.hpp + - com/sun/star/container/XNameContainer.hpp + - com/sun/star/lang/XInitialization.hpp + - com/sun/star/lang/XMultiServiceFactory.hpp + - com/sun/star/util/XChangesListener.hpp + - com/sun/star/util/XChangesNotifier.hpp + - toolkit/controls/unocontrolcontainer.hxx + toolkit/inc/controls/dialogcontrol.hxx: + # base class has to be a complete type + - com/sun/star/awt/UnoControlDialog.hpp + toolkit/inc/controls/eventcontainer.hxx: + # base class has to be a complete type + - com/sun/star/container/XContainer.hpp + - com/sun/star/container/XNameContainer.hpp + toolkit/inc/controls/geometrycontrolmodel.hxx: + # base class has to be a complete type + - com/sun/star/script/XScriptEventsSupplier.hpp + - com/sun/star/util/XCloneable.hpp + # Needed for template classes + - toolkit/controls/geometrycontrolmodel_impl.hxx + toolkit/inc/controls/roadmapcontrol.hxx: + # base class has to be a complete type + - com/sun/star/awt/XItemEventBroadcaster.hpp + - com/sun/star/awt/XItemListener.hpp + - com/sun/star/beans/XPropertyChangeListener.hpp + - com/sun/star/container/XContainerListener.hpp + toolkit/inc/controls/roadmapentry.hxx: + # base class has to be a complete type + - com/sun/star/lang/XServiceInfo.hpp + toolkit/inc/controls/tabpagecontainer.hxx: + # base class has to be a complete type + - com/sun/star/awt/tab/XTabPageContainer.hpp + - toolkit/controls/controlmodelcontainerbase.hxx + toolkit/inc/controls/tabpagemodel.hxx: + # base class has to be a complete type + - com/sun/star/awt/tab/XTabPage.hpp + - toolkit/controls/unocontrolcontainer.hxx + toolkit/inc/controls/unocontrolcontainer.hxx: + # base class has to be a complete type + - com/sun/star/awt/XControlContainer.hpp + - com/sun/star/awt/XUnoControlContainer.hpp + - com/sun/star/container/XContainer.hpp + - com/sun/star/container/XIdentifierContainer.hpp + - toolkit/controls/unocontrolbase.hxx diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/toolkit/inc/awt/animatedimagespeer.hxx index ee1747394ca6..ff07c291c237 100644 --- a/include/toolkit/awt/animatedimagespeer.hxx +++ b/toolkit/inc/awt/animatedimagespeer.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_AWT_ANIMATEDIMAGESPEER_HXX -#define INCLUDED_TOOLKIT_AWT_ANIMATEDIMAGESPEER_HXX +#pragma once #include <toolkit/awt/vclxwindow.hxx> #include <com/sun/star/container/XContainerListener.hpp> @@ -92,6 +91,4 @@ namespace toolkit } // namespace toolkit -#endif // INCLUDED_TOOLKIT_AWT_ANIMATEDIMAGESPEER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxbitmap.hxx b/toolkit/inc/awt/vclxbitmap.hxx index 40201ae82784..38ba3642678a 100644 --- a/include/toolkit/awt/vclxbitmap.hxx +++ b/toolkit/inc/awt/vclxbitmap.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_AWT_VCLXBITMAP_HXX -#define INCLUDED_TOOLKIT_AWT_VCLXBITMAP_HXX +#pragma once #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/awt/XDisplayBitmap.hpp> @@ -57,6 +56,4 @@ public: }; -#endif // INCLUDED_TOOLKIT_AWT_VCLXBITMAP_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxgraphics.hxx b/toolkit/inc/awt/vclxgraphics.hxx index 0689e48b9e56..4dc29e38e886 100644 --- a/include/toolkit/awt/vclxgraphics.hxx +++ b/toolkit/inc/awt/vclxgraphics.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_AWT_VCLXGRAPHICS_HXX -#define INCLUDED_TOOLKIT_AWT_VCLXGRAPHICS_HXX +#pragma once #include <com/sun/star/awt/XGraphics2.hpp> @@ -121,6 +120,4 @@ public: virtual void SAL_CALL drawImage( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, ::sal_Int16 nStyle, const css::uno::Reference< css::graphic::XGraphic >& aGraphic ) override; }; -#endif // INCLUDED_TOOLKIT_AWT_VCLXGRAPHICS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxpointer.hxx b/toolkit/inc/awt/vclxpointer.hxx index 8346637a074d..e1dabd2abe54 100644 --- a/include/toolkit/awt/vclxpointer.hxx +++ b/toolkit/inc/awt/vclxpointer.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_AWT_VCLXPOINTER_HXX -#define INCLUDED_TOOLKIT_AWT_VCLXPOINTER_HXX +#pragma once #include <com/sun/star/awt/XPointer.hpp> @@ -62,6 +61,4 @@ public: }; -#endif // INCLUDED_TOOLKIT_AWT_VCLXPOINTER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxprinter.hxx b/toolkit/inc/awt/vclxprinter.hxx index e03a3a7b2044..e440b312eb3b 100644 --- a/include/toolkit/awt/vclxprinter.hxx +++ b/toolkit/inc/awt/vclxprinter.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_AWT_VCLXPRINTER_HXX -#define INCLUDED_TOOLKIT_AWT_VCLXPRINTER_HXX +#pragma once #include <com/sun/star/awt/XPrinterPropertySet.hpp> @@ -190,6 +189,4 @@ public: css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; -#endif // INCLUDED_TOOLKIT_AWT_VCLXPRINTER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxregion.hxx b/toolkit/inc/awt/vclxregion.hxx index d4c43ef31730..4f59416ae77d 100644 --- a/include/toolkit/awt/vclxregion.hxx +++ b/toolkit/inc/awt/vclxregion.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_AWT_VCLXREGION_HXX -#define INCLUDED_TOOLKIT_AWT_VCLXREGION_HXX +#pragma once #include <com/sun/star/awt/XRegion.hpp> @@ -68,6 +67,4 @@ public: }; -#endif // INCLUDED_TOOLKIT_AWT_VCLXREGION_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxspinbutton.hxx b/toolkit/inc/awt/vclxspinbutton.hxx index 5074c591645c..acd7a68984b6 100644 --- a/include/toolkit/awt/vclxspinbutton.hxx +++ b/toolkit/inc/awt/vclxspinbutton.hxx @@ -16,8 +16,7 @@ * 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_TOOLKIT_AWT_VCLXSPINBUTTON_HXX -#define INCLUDED_TOOLKIT_AWT_VCLXSPINBUTTON_HXX +#pragma once #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/listenermultiplexer.hxx> @@ -86,6 +85,4 @@ namespace toolkit } // namespacetoolkit -#endif // TOOLKIT_INC_ INCLUDED_TOOLKIT_AWT_VCLXSPINBUTTON_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxsystemdependentwindow.hxx b/toolkit/inc/awt/vclxsystemdependentwindow.hxx index 04e65d1b5df6..7a1034fbaa89 100644 --- a/include/toolkit/awt/vclxsystemdependentwindow.hxx +++ b/toolkit/inc/awt/vclxsystemdependentwindow.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_AWT_VCLXSYSTEMDEPENDENTWINDOW_HXX -#define INCLUDED_TOOLKIT_AWT_VCLXSYSTEMDEPENDENTWINDOW_HXX +#pragma once #include <com/sun/star/awt/XSystemDependentWindowPeer.hpp> @@ -47,6 +46,4 @@ public: }; -#endif // INCLUDED_TOOLKIT_AWT_VCLXSYSTEMDEPENDENTWINDOW_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/awt/vclxtabpagecontainer.hxx b/toolkit/inc/awt/vclxtabpagecontainer.hxx index ffb6feb5ad73..fee096cc04ba 100644 --- a/include/toolkit/awt/vclxtabpagecontainer.hxx +++ b/toolkit/inc/awt/vclxtabpagecontainer.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX -#define INCLUDED_TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX +#pragma once #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/awt/tab/XTabPageContainer.hpp> @@ -65,6 +64,5 @@ private: TabPageListenerMultiplexer m_aTabPageListeners; ::std::vector< css::uno::Reference< css::awt::tab::XTabPage > > m_aTabPages; }; -#endif // INCLUDED_TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/toolkit/inc/controls/accessiblecontrolcontext.hxx index dfa6cf358ca5..32a23c23c841 100644 --- a/include/toolkit/controls/accessiblecontrolcontext.hxx +++ b/toolkit/inc/controls/accessiblecontrolcontext.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_CONTROLS_ACCESSIBLECONTROLCONTEXT_HXX -#define INCLUDED_TOOLKIT_CONTROLS_ACCESSIBLECONTROLCONTEXT_HXX +#pragma once #include <comphelper/accessiblecomponenthelper.hxx> #include <comphelper/accimplaccess.hxx> @@ -121,6 +120,4 @@ namespace toolkit } // namespace toolkit -#endif // INCLUDED_TOOLKIT_CONTROLS_ACCESSIBLECONTROLCONTEXT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/animatedimages.hxx b/toolkit/inc/controls/animatedimages.hxx index d6bac5fe6009..8953456f9066 100644 --- a/include/toolkit/controls/animatedimages.hxx +++ b/toolkit/inc/controls/animatedimages.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_CONTROLS_ANIMATEDIMAGES_HXX -#define INCLUDED_TOOLKIT_CONTROLS_ANIMATEDIMAGES_HXX +#pragma once #include <toolkit/controls/unocontrolmodel.hxx> #include <com/sun/star/awt/XAnimatedImages.hpp> @@ -86,6 +85,4 @@ namespace toolkit } // namespace toolkit -#endif // INCLUDED_TOOLKIT_CONTROLS_ANIMATEDIMAGES_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/toolkit/inc/controls/controlmodelcontainerbase.hxx index ae0b0b9ca9f5..6ce71a45c881 100644 --- a/include/toolkit/controls/controlmodelcontainerbase.hxx +++ b/toolkit/inc/controls/controlmodelcontainerbase.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_CONTROLS_CONTROLMODELCONTAINERBASE_HXX -#define INCLUDED_TOOLKIT_CONTROLS_CONTROLMODELCONTAINERBASE_HXX +#pragma once #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XContainer.hpp> @@ -33,7 +32,7 @@ #include <cppuhelper/weak.hxx> #include <toolkit/helper/listenermultiplexer.hxx> #include <toolkit/controls/unocontrolmodel.hxx> -#include <toolkit/controls/unocontrolcontainer.hxx> +#include <controls/unocontrolcontainer.hxx> #include <cppuhelper/propshlp.hxx> #include <cppuhelper/basemutex.hxx> #include <com/sun/star/awt/tab/XTabPageModel.hpp> @@ -268,6 +267,5 @@ protected: virtual void removingControl( const css::uno::Reference< css::awt::XControl >& _rxControl ) override; virtual void addingControl( const css::uno::Reference< css::awt::XControl >& _rxControl ) override; }; -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/dialogcontrol.hxx b/toolkit/inc/controls/dialogcontrol.hxx index 223c50e927da..197ee360f036 100644 --- a/include/toolkit/controls/dialogcontrol.hxx +++ b/toolkit/inc/controls/dialogcontrol.hxx @@ -17,10 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_CONTROLS_DIALOGCONTROL_HXX -#define INCLUDED_TOOLKIT_CONTROLS_DIALOGCONTROL_HXX +#pragma once -#include <toolkit/controls/controlmodelcontainerbase.hxx> +#include <controls/controlmodelcontainerbase.hxx> #include <com/sun/star/awt/UnoControlDialog.hpp> #include <com/sun/star/awt/XSimpleTabController.hpp> #include <toolkit/helper/macros.hxx> @@ -309,6 +308,4 @@ public: DECLIMPL_SERVICEINFO_DERIVED( UnoFrameControl, ControlContainerBase, "com.sun.star.awt.UnoControlFrame" ) }; -#endif // INCLUDED_TOOLKIT_CONTROLS_DIALOGCONTROL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/eventcontainer.hxx b/toolkit/inc/controls/eventcontainer.hxx index 4804a2f2588b..460ae6fe256f 100644 --- a/include/toolkit/controls/eventcontainer.hxx +++ b/toolkit/inc/controls/eventcontainer.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_CONTROLS_EVENTCONTAINER_HXX -#define INCLUDED_TOOLKIT_CONTROLS_EVENTCONTAINER_HXX +#pragma once #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XContainer.hpp> @@ -67,6 +66,4 @@ public: } // namespace toolkit_namecontainer -#endif // INCLUDED_TOOLKIT_CONTROLS_EVENTCONTAINER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/formattedcontrol.hxx b/toolkit/inc/controls/formattedcontrol.hxx index db75811b2cf7..b15836d6904f 100644 --- a/include/toolkit/controls/formattedcontrol.hxx +++ b/toolkit/inc/controls/formattedcontrol.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_CONTROLS_FORMATTEDCONTROL_HXX -#define INCLUDED_TOOLKIT_CONTROLS_FORMATTEDCONTROL_HXX +#pragma once #include <toolkit/controls/unocontrols.hxx> #include <toolkit/controls/unocontrolmodel.hxx> @@ -120,6 +119,4 @@ namespace toolkit } // namespace toolkit -#endif // INCLUDED_TOOLKIT_CONTROLS_FORMATTEDCONTROL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/toolkit/inc/controls/geometrycontrolmodel.hxx index ded5b2a268da..5fabc57ba434 100644 --- a/include/toolkit/controls/geometrycontrolmodel.hxx +++ b/toolkit/inc/controls/geometrycontrolmodel.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_CONTROLS_GEOMETRYCONTROLMODEL_HXX -#define INCLUDED_TOOLKIT_CONTROLS_GEOMETRYCONTROLMODEL_HXX +#pragma once #include <comphelper/broadcasthelper.hxx> #include <comphelper/propagg.hxx> @@ -240,12 +239,10 @@ namespace com { namespace sun { namespace star { sal_Int32 _nHandle, const css::uno::Any& _rValue) override; }; -#include <toolkit/controls/geometrycontrolmodel_impl.hxx> +#include <controls/geometrycontrolmodel_impl.hxx> // } // namespace toolkit -#endif // INCLUDED_TOOLKIT_CONTROLS_GEOMETRYCONTROLMODEL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/geometrycontrolmodel_impl.hxx b/toolkit/inc/controls/geometrycontrolmodel_impl.hxx index f19e84327c22..f19e84327c22 100644 --- a/include/toolkit/controls/geometrycontrolmodel_impl.hxx +++ b/toolkit/inc/controls/geometrycontrolmodel_impl.hxx diff --git a/include/toolkit/controls/roadmapcontrol.hxx b/toolkit/inc/controls/roadmapcontrol.hxx index e7b498fdb045..01e9773a1e7a 100644 --- a/include/toolkit/controls/roadmapcontrol.hxx +++ b/toolkit/inc/controls/roadmapcontrol.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_CONTROLS_ROADMAPCONTROL_HXX -#define INCLUDED_TOOLKIT_CONTROLS_ROADMAPCONTROL_HXX +#pragma once #include <toolkit/controls/unocontrols.hxx> @@ -181,6 +180,4 @@ namespace toolkit } // toolkit -#endif // _ INCLUDED_TOOLKIT_CONTROLS_ROADMAPCONTROL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/roadmapentry.hxx b/toolkit/inc/controls/roadmapentry.hxx index 7695ecffdcba..81aa9b74dff0 100644 --- a/include/toolkit/controls/roadmapentry.hxx +++ b/toolkit/inc/controls/roadmapentry.hxx @@ -16,8 +16,7 @@ * 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_TOOLKIT_CONTROLS_ROADMAPENTRY_HXX -#define INCLUDED_TOOLKIT_CONTROLS_ROADMAPENTRY_HXX +#pragma once #include <comphelper/uno3.hxx> #include <comphelper/broadcasthelper.hxx> @@ -67,6 +66,4 @@ private: bool m_bInteractive; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/stdtabcontroller.hxx b/toolkit/inc/controls/stdtabcontroller.hxx index b6b5b5ef762e..27f332e53330 100644 --- a/include/toolkit/controls/stdtabcontroller.hxx +++ b/toolkit/inc/controls/stdtabcontroller.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_CONTROLS_STDTABCONTROLLER_HXX -#define INCLUDED_TOOLKIT_CONTROLS_STDTABCONTROLLER_HXX +#pragma once #include <com/sun/star/lang/XServiceInfo.hpp> @@ -84,6 +83,4 @@ public: }; -#endif // _TOOLKIT_AWT_STDTABCONTROLLER_HXX_ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/stdtabcontrollermodel.hxx b/toolkit/inc/controls/stdtabcontrollermodel.hxx index e930ed159d7c..7208223d6c09 100644 --- a/include/toolkit/controls/stdtabcontrollermodel.hxx +++ b/toolkit/inc/controls/stdtabcontrollermodel.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_CONTROLS_STDTABCONTROLLERMODEL_HXX -#define INCLUDED_TOOLKIT_CONTROLS_STDTABCONTROLLERMODEL_HXX +#pragma once #include <com/sun/star/lang/XServiceInfo.hpp> @@ -121,6 +120,4 @@ public: }; -#endif // _TOOLKIT_HELPER_STDTABCONTROLLERMODEL_HXX_ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/tabpagecontainer.hxx b/toolkit/inc/controls/tabpagecontainer.hxx index 21808db7f37a..b24d5cba5d72 100644 --- a/include/toolkit/controls/tabpagecontainer.hxx +++ b/toolkit/inc/controls/tabpagecontainer.hxx @@ -17,15 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_CONTROLS_TABPAGECONTAINER_HXX -#define INCLUDED_TOOLKIT_CONTROLS_TABPAGECONTAINER_HXX +#pragma once #include <com/sun/star/awt/tab/XTabPageContainer.hpp> #include <com/sun/star/awt/tab/XTabPageContainerModel.hpp> #include <toolkit/controls/unocontrolbase.hxx> #include <toolkit/controls/unocontrolmodel.hxx> #include <cppuhelper/implbase1.hxx> -#include <toolkit/controls/controlmodelcontainerbase.hxx> +#include <controls/controlmodelcontainerbase.hxx> #include <toolkit/helper/listenermultiplexer.hxx> @@ -122,6 +121,4 @@ private: TabPageListenerMultiplexer m_aTabPageListeners; }; -#endif // _ INCLUDED_TOOLKIT_CONTROLS_TABPAGECONTAINER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/tabpagemodel.hxx b/toolkit/inc/controls/tabpagemodel.hxx index 862d690f0361..9aba10d08b5d 100644 --- a/include/toolkit/controls/tabpagemodel.hxx +++ b/toolkit/inc/controls/tabpagemodel.hxx @@ -17,10 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_CONTROLS_TABPAGEMODEL_HXX -#define INCLUDED_TOOLKIT_CONTROLS_TABPAGEMODEL_HXX +#pragma once -#include <toolkit/controls/controlmodelcontainerbase.hxx> +#include <controls/controlmodelcontainerbase.hxx> #include <com/sun/star/awt/tab/XTabPage.hpp> #include <cppuhelper/implbase2.hxx> @@ -78,6 +77,4 @@ public: virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; -#endif // INCLUDED_TOOLKIT_CONTROLS_TABPAGEMODEL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/tkscrollbar.hxx b/toolkit/inc/controls/tkscrollbar.hxx index a59f8f44d720..fa77c7651ff9 100644 --- a/include/toolkit/controls/tkscrollbar.hxx +++ b/toolkit/inc/controls/tkscrollbar.hxx @@ -16,8 +16,7 @@ * 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_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX -#define INCLUDED_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX +#pragma once #include <toolkit/controls/unocontrolmodel.hxx> #include <toolkit/controls/unocontrolbase.hxx> @@ -110,6 +109,4 @@ namespace toolkit } // namespacetoolkit -#endif // INCLUDED_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/unocontrolcontainer.hxx b/toolkit/inc/controls/unocontrolcontainer.hxx index fde6df733173..f8e9d10855aa 100644 --- a/include/toolkit/controls/unocontrolcontainer.hxx +++ b/toolkit/inc/controls/unocontrolcontainer.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINER_HXX -#define INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINER_HXX +#pragma once #include <com/sun/star/awt/XControlContainer.hpp> @@ -149,6 +148,4 @@ private: }; -#endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/controls/unocontrolcontainermodel.hxx b/toolkit/inc/controls/unocontrolcontainermodel.hxx index e27e38730255..4fe48cdcab6f 100644 --- a/include/toolkit/controls/unocontrolcontainermodel.hxx +++ b/toolkit/inc/controls/unocontrolcontainermodel.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINERMODEL_HXX -#define INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINERMODEL_HXX +#pragma once #include <toolkit/controls/unocontrolmodel.hxx> @@ -49,6 +48,4 @@ public: }; -#endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINERMODEL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/toolkit/helper/servicenames.hxx b/toolkit/inc/helper/servicenames.hxx index 662378bbd400..73e0a3260f51 100644 --- a/include/toolkit/helper/servicenames.hxx +++ b/toolkit/inc/helper/servicenames.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLKIT_HELPER_SERVICENAMES_HXX -#define INCLUDED_TOOLKIT_HELPER_SERVICENAMES_HXX +#pragma once #include <sal/types.h> @@ -101,6 +100,5 @@ extern const char szServiceName_UnoControlTabPageContainer[]; // ExtUnoWrapper: extern const char szServiceName_ImageProducer[], szServiceName2_ImageProducer[]; -#endif // INCLUDED_TOOLKIT_HELPER_SERVICENAMES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx index e833f366aa21..d621d1658fa5 100644 --- a/toolkit/source/awt/animatedimagespeer.cxx +++ b/toolkit/source/awt/animatedimagespeer.cxx @@ -18,7 +18,7 @@ */ -#include <toolkit/awt/animatedimagespeer.hxx> +#include <awt/animatedimagespeer.hxx> #include <toolkit/helper/property.hxx> #include <com/sun/star/awt/XAnimatedImages.hpp> diff --git a/toolkit/source/awt/vclxbitmap.cxx b/toolkit/source/awt/vclxbitmap.cxx index 397b1c0ef017..9bc045c2d1a1 100644 --- a/toolkit/source/awt/vclxbitmap.cxx +++ b/toolkit/source/awt/vclxbitmap.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <toolkit/awt/vclxbitmap.hxx> +#include <awt/vclxbitmap.hxx> #include <toolkit/helper/macros.hxx> #include <cppuhelper/queryinterface.hxx> #include <tools/stream.hxx> diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx index 5e88f31fb911..84e54e630453 100644 --- a/toolkit/source/awt/vclxdevice.cxx +++ b/toolkit/source/awt/vclxdevice.cxx @@ -24,7 +24,7 @@ #include <toolkit/awt/vclxdevice.hxx> #include <toolkit/awt/vclxfont.hxx> -#include <toolkit/awt/vclxbitmap.hxx> +#include <awt/vclxbitmap.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/macros.hxx> #include <cppuhelper/queryinterface.hxx> diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx index d0a25bfb6116..9fcb527a0970 100644 --- a/toolkit/source/awt/vclxgraphics.cxx +++ b/toolkit/source/awt/vclxgraphics.cxx @@ -19,7 +19,7 @@ #include <memory> -#include <toolkit/awt/vclxgraphics.hxx> +#include <awt/vclxgraphics.hxx> #include <toolkit/awt/vclxdevice.hxx> #include <toolkit/helper/macros.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index b970df47c2e0..28dddc7c9c95 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -19,7 +19,7 @@ #include <toolkit/awt/vclxmenu.hxx> #include <toolkit/helper/convert.hxx> -#include <toolkit/helper/servicenames.hxx> +#include <helper/servicenames.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/toolkit/source/awt/vclxpointer.cxx b/toolkit/source/awt/vclxpointer.cxx index 5323e077be08..2d382f5c5350 100644 --- a/toolkit/source/awt/vclxpointer.cxx +++ b/toolkit/source/awt/vclxpointer.cxx @@ -18,7 +18,7 @@ */ #include <com/sun/star/uno/XComponentContext.hpp> -#include <toolkit/awt/vclxpointer.hxx> +#include <awt/vclxpointer.hxx> #include <cppuhelper/supportsservice.hxx> VCLXPointer::VCLXPointer() : maPointer(PointerStyle::Arrow) diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index 23dce1b42823..6c9fa0e5f7ed 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -18,7 +18,7 @@ */ #include <com/sun/star/uno/XComponentContext.hpp> -#include <toolkit/awt/vclxprinter.hxx> +#include <awt/vclxprinter.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/toolkit/source/awt/vclxregion.cxx b/toolkit/source/awt/vclxregion.cxx index 61b71e63b8e3..f3356d300bfd 100644 --- a/toolkit/source/awt/vclxregion.cxx +++ b/toolkit/source/awt/vclxregion.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <toolkit/awt/vclxregion.hxx> +#include <awt/vclxregion.hxx> #include <toolkit/helper/macros.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/convert.hxx> diff --git a/toolkit/source/awt/vclxspinbutton.cxx b/toolkit/source/awt/vclxspinbutton.cxx index fc6819ef3eef..197997a12652 100644 --- a/toolkit/source/awt/vclxspinbutton.cxx +++ b/toolkit/source/awt/vclxspinbutton.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <toolkit/awt/vclxspinbutton.hxx> +#include <awt/vclxspinbutton.hxx> #include <toolkit/helper/property.hxx> #include <com/sun/star/awt/ScrollBarOrientation.hpp> diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index 01026907396f..2c53edf19b27 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -23,7 +23,7 @@ #include <com/sun/star/awt/SystemDependentXWindow.hpp> #endif -#include <toolkit/awt/vclxsystemdependentwindow.hxx> +#include <awt/vclxsystemdependentwindow.hxx> #include <toolkit/helper/macros.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx index 667797a47752..0bfacc695136 100644 --- a/toolkit/source/awt/vclxtabpagecontainer.cxx +++ b/toolkit/source/awt/vclxtabpagecontainer.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <toolkit/awt/vclxtabpagecontainer.hxx> +#include <awt/vclxtabpagecontainer.hxx> #include <com/sun/star/awt/tab/XTabPageModel.hpp> #include <com/sun/star/awt/XControl.hpp> #include <sal/log.hxx> diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 76a8e497abbc..8a61a99e3f3c 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -67,11 +67,11 @@ #include <vcl/vclmedit.hxx> #include <toolkit/awt/vclxwindows.hxx> -#include <toolkit/awt/vclxsystemdependentwindow.hxx> -#include <toolkit/awt/vclxregion.hxx> -#include <toolkit/awt/vclxtabpagecontainer.hxx> +#include <awt/vclxsystemdependentwindow.hxx> +#include <awt/vclxregion.hxx> +#include <awt/vclxtabpagecontainer.hxx> -#include <toolkit/awt/animatedimagespeer.hxx> +#include <awt/animatedimagespeer.hxx> #include <toolkit/awt/vclxtopwindow.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/vclunohelper.hxx> @@ -118,7 +118,7 @@ #if HAVE_FEATURE_OPENGL #include <vcl/opengl/OpenGLWrapper.hxx> #endif -#include <toolkit/awt/vclxspinbutton.hxx> +#include <awt/vclxspinbutton.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <comphelper/processfactory.hxx> diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 83b17f2fbf8e..1381a7fa3570 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/text/WritingMode2.hpp> #include <toolkit/awt/vclxwindow.hxx> -#include <toolkit/awt/vclxpointer.hxx> +#include <awt/vclxpointer.hxx> #include <toolkit/awt/vclxwindows.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/convert.hxx> diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index f5343b552088..c2d0b46db6a6 100644 --- a/toolkit/source/controls/accessiblecontrolcontext.cxx +++ b/toolkit/source/controls/accessiblecontrolcontext.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <toolkit/controls/accessiblecontrolcontext.hxx> +#include <controls/accessiblecontrolcontext.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <com/sun/star/awt/XControl.hpp> #include <com/sun/star/awt/XWindow.hpp> diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx index d35224d3ac93..c304782e8d1f 100644 --- a/toolkit/source/controls/animatedimages.cxx +++ b/toolkit/source/controls/animatedimages.cxx @@ -18,7 +18,7 @@ */ -#include <toolkit/controls/animatedimages.hxx> +#include <controls/animatedimages.hxx> #include <toolkit/helper/property.hxx> #include <com/sun/star/lang/DisposedException.hpp> diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index a3f79e893cff..eb39c1ba1b95 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -18,18 +18,18 @@ */ -#include <toolkit/controls/controlmodelcontainerbase.hxx> +#include <controls/controlmodelcontainerbase.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> #include <toolkit/helper/property.hxx> -#include <toolkit/helper/servicenames.hxx> -#include <toolkit/controls/geometrycontrolmodel.hxx> +#include <helper/servicenames.hxx> +#include <controls/geometrycontrolmodel.hxx> #include <toolkit/controls/unocontrols.hxx> -#include <toolkit/controls/formattedcontrol.hxx> -#include <toolkit/controls/roadmapcontrol.hxx> -#include <toolkit/controls/tkscrollbar.hxx> -#include <toolkit/controls/tabpagemodel.hxx> -#include <toolkit/controls/stdtabcontroller.hxx> +#include <controls/formattedcontrol.hxx> +#include <controls/roadmapcontrol.hxx> +#include <controls/tkscrollbar.hxx> +#include <controls/tabpagemodel.hxx> +#include <controls/stdtabcontroller.hxx> #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/resource/XStringResourceResolver.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -43,14 +43,14 @@ #include "tree/treecontrol.hxx" #include "grid/gridcontrol.hxx" -#include <toolkit/controls/tabpagecontainer.hxx> +#include <controls/tabpagecontainer.hxx> #include <map> #include <algorithm> #include <tools/urlobj.hxx> #include <osl/file.hxx> #include <sal/log.hxx> -#include <toolkit/controls/dialogcontrol.hxx> +#include <controls/dialogcontrol.hxx> #include <helper/unopropertyarrayhelper.hxx> #include "controlmodelcontainerbase_internal.hxx" diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index d9b0580aca3e..4ea2a81f4c76 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -20,10 +20,10 @@ #include <vcl/svapp.hxx> #include <osl/mutex.hxx> -#include <toolkit/controls/dialogcontrol.hxx> -#include <toolkit/controls/geometrycontrolmodel.hxx> +#include <controls/dialogcontrol.hxx> +#include <controls/geometrycontrolmodel.hxx> #include <toolkit/helper/property.hxx> -#include <toolkit/helper/servicenames.hxx> +#include <helper/servicenames.hxx> #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/awt/WindowAttribute.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/toolkit/source/controls/eventcontainer.cxx b/toolkit/source/controls/eventcontainer.cxx index 24b832020bbb..73701446384c 100644 --- a/toolkit/source/controls/eventcontainer.cxx +++ b/toolkit/source/controls/eventcontainer.cxx @@ -19,7 +19,7 @@ #include <cppuhelper/factory.hxx> -#include <toolkit/controls/eventcontainer.hxx> +#include <controls/eventcontainer.hxx> #include <com/sun/star/script/ScriptEventDescriptor.hpp> diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx index c7ff000eac80..52fc287b2dee 100644 --- a/toolkit/source/controls/formattedcontrol.cxx +++ b/toolkit/source/controls/formattedcontrol.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <toolkit/controls/formattedcontrol.hxx> +#include <controls/formattedcontrol.hxx> #include <toolkit/helper/property.hxx> -#include <toolkit/helper/servicenames.hxx> +#include <helper/servicenames.hxx> #include <com/sun/star/awt/XVclWindowPeer.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index 8bcc53aaccd0..fac21963a372 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <toolkit/controls/geometrycontrolmodel.hxx> +#include <controls/geometrycontrolmodel.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/resource/XStringResourceResolver.hpp> #include <osl/diagnose.h> #include <rtl/instance.hxx> #include <comphelper/sequence.hxx> -#include <toolkit/controls/eventcontainer.hxx> +#include <controls/eventcontainer.hxx> #include <toolkit/helper/property.hxx> #include <algorithm> #include <functional> diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx index 0c09f75ab428..a1e02bd94edb 100644 --- a/toolkit/source/controls/roadmapcontrol.cxx +++ b/toolkit/source/controls/roadmapcontrol.cxx @@ -18,10 +18,10 @@ */ -#include <toolkit/controls/roadmapcontrol.hxx> -#include <toolkit/controls/roadmapentry.hxx> +#include <controls/roadmapcontrol.hxx> +#include <controls/roadmapentry.hxx> #include <toolkit/helper/property.hxx> -#include <toolkit/helper/servicenames.hxx> +#include <helper/servicenames.hxx> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx index b79a23b2aa15..b7d12820238f 100644 --- a/toolkit/source/controls/roadmapentry.cxx +++ b/toolkit/source/controls/roadmapentry.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <toolkit/controls/roadmapentry.hxx> +#include <controls/roadmapentry.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <cppuhelper/supportsservice.hxx> diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx index af06ad1820c5..ccd295d1a988 100644 --- a/toolkit/source/controls/spinningprogress.cxx +++ b/toolkit/source/controls/spinningprogress.cxx @@ -18,7 +18,7 @@ */ #include <com/sun/star/uno/XComponentContext.hpp> -#include <toolkit/controls/animatedimages.hxx> +#include <controls/animatedimages.hxx> #include <tools/diagnose_ex.h> #include <vcl/toolkit/throbber.hxx> diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx index 8ef6d84302f3..5e4d81da4e77 100644 --- a/toolkit/source/controls/stdtabcontroller.cxx +++ b/toolkit/source/controls/stdtabcontroller.cxx @@ -22,8 +22,8 @@ #include <com/sun/star/awt/XVclContainerPeer.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <toolkit/controls/stdtabcontroller.hxx> -#include <toolkit/helper/servicenames.hxx> +#include <controls/stdtabcontroller.hxx> +#include <helper/servicenames.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/macros.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx index 83f9d9f6bee1..e675710b91f2 100644 --- a/toolkit/source/controls/stdtabcontrollermodel.cxx +++ b/toolkit/source/controls/stdtabcontrollermodel.cxx @@ -20,9 +20,9 @@ #include <com/sun/star/io/XMarkableStream.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <toolkit/controls/stdtabcontrollermodel.hxx> +#include <controls/stdtabcontrollermodel.hxx> #include <toolkit/helper/macros.hxx> -#include <toolkit/helper/servicenames.hxx> +#include <helper/servicenames.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/queryinterface.hxx> diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx index 87d6203ca7bb..b733ef56064e 100644 --- a/toolkit/source/controls/tabpagecontainer.cxx +++ b/toolkit/source/controls/tabpagecontainer.cxx @@ -18,9 +18,9 @@ */ -#include <toolkit/controls/geometrycontrolmodel.hxx> -#include <toolkit/controls/tabpagecontainer.hxx> -#include <toolkit/controls/tabpagemodel.hxx> +#include <controls/geometrycontrolmodel.hxx> +#include <controls/tabpagecontainer.hxx> +#include <controls/tabpagemodel.hxx> #include <toolkit/helper/property.hxx> #include <com/sun/star/awt/XControlModel.hpp> diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx index 8b9ebbc1036b..8a0856f2d08a 100644 --- a/toolkit/source/controls/tabpagemodel.cxx +++ b/toolkit/source/controls/tabpagemodel.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <toolkit/controls/tabpagemodel.hxx> +#include <controls/tabpagemodel.hxx> #include <vcl/svapp.hxx> #include <toolkit/helper/property.hxx> @@ -29,8 +29,8 @@ #include <tools/debug.hxx> #include <vcl/outdev.hxx> -#include <toolkit/controls/controlmodelcontainerbase.hxx> -#include <toolkit/controls/unocontrolcontainer.hxx> +#include <controls/controlmodelcontainerbase.hxx> +#include <controls/unocontrolcontainer.hxx> #include <helper/unopropertyarrayhelper.hxx> diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx index 5ca66a34ab9b..c45810420e68 100644 --- a/toolkit/source/controls/tkscrollbar.cxx +++ b/toolkit/source/controls/tkscrollbar.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <toolkit/controls/tkscrollbar.hxx> +#include <controls/tkscrollbar.hxx> #include <toolkit/helper/property.hxx> -#include <toolkit/helper/servicenames.hxx> +#include <helper/servicenames.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index c58faaed4b96..b501abf7eb29 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -37,7 +37,7 @@ #include <vcl/svapp.hxx> #include <toolkit/helper/property.hxx> #include <toolkit/awt/vclxwindow.hxx> -#include <toolkit/controls/accessiblecontrolcontext.hxx> +#include <controls/accessiblecontrolcontext.hxx> #include <algorithm> #include <map> diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index 46cfe583f673..956b5d542393 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -25,7 +25,7 @@ #include <cppuhelper/implbase.hxx> -#include <toolkit/controls/unocontrolcontainer.hxx> +#include <controls/unocontrolcontainer.hxx> #include <comphelper/sequence.hxx> #include <tools/debug.hxx> diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx index 64b99a1ff8a6..8487f55c18c2 100644 --- a/toolkit/source/controls/unocontrolcontainermodel.cxx +++ b/toolkit/source/controls/unocontrolcontainermodel.cxx @@ -18,9 +18,9 @@ */ #include <com/sun/star/uno/XComponentContext.hpp> -#include <toolkit/controls/unocontrolcontainermodel.hxx> +#include <controls/unocontrolcontainermodel.hxx> #include <toolkit/helper/property.hxx> -#include <toolkit/helper/servicenames.hxx> +#include <helper/servicenames.hxx> #include <helper/unopropertyarrayhelper.hxx> diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index b80d89f2d01b..268a619e4aed 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -29,10 +29,10 @@ #include <com/sun/star/awt/ImageScaleMode.hpp> #include <o3tl/safeint.hxx> -#include <toolkit/controls/formattedcontrol.hxx> +#include <controls/formattedcontrol.hxx> #include <toolkit/controls/unocontrols.hxx> #include <toolkit/helper/property.hxx> -#include <toolkit/helper/servicenames.hxx> +#include <helper/servicenames.hxx> #include <toolkit/helper/macros.hxx> // for introspection diff --git a/toolkit/source/helper/servicenames.cxx b/toolkit/source/helper/servicenames.cxx index c34f464c52da..49c5c4d69838 100644 --- a/toolkit/source/helper/servicenames.cxx +++ b/toolkit/source/helper/servicenames.cxx @@ -18,7 +18,7 @@ */ #include <sal/types.h> -#include <toolkit/helper/servicenames.hxx> +#include <helper/servicenames.hxx> const char szServiceName_Toolkit[] = "stardiv.vcl.VclToolkit"; const char szServiceName2_Toolkit[] = "com.sun.star.awt.Toolkit"; diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index ae6ba9ed801e..aae650261e2d 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -22,7 +22,7 @@ #include <toolkit/awt/vclxwindows.hxx> #include <toolkit/awt/vclxcontainer.hxx> #include <toolkit/awt/vclxtopwindow.hxx> -#include <toolkit/awt/vclxgraphics.hxx> +#include <awt/vclxgraphics.hxx> #include <toolkit/dllapi.h> #include <vcl/menu.hxx> diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx index 0c763099f41d..696ed16e1140 100644 --- a/toolkit/source/helper/vclunohelper.cxx +++ b/toolkit/source/helper/vclunohelper.cxx @@ -35,13 +35,13 @@ #include <com/sun/star/graphic/XGraphic.hpp> #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/convert.hxx> -#include <toolkit/awt/vclxbitmap.hxx> -#include <toolkit/awt/vclxregion.hxx> +#include <awt/vclxbitmap.hxx> +#include <awt/vclxregion.hxx> #include <toolkit/awt/vclxwindow.hxx> -#include <toolkit/awt/vclxgraphics.hxx> +#include <awt/vclxgraphics.hxx> #include <toolkit/awt/vclxfont.hxx> -#include <toolkit/controls/unocontrolcontainer.hxx> -#include <toolkit/controls/unocontrolcontainermodel.hxx> +#include <controls/unocontrolcontainer.hxx> +#include <controls/unocontrolcontainermodel.hxx> #include <vcl/graph.hxx> #include <comphelper/processfactory.hxx> |