diff options
Diffstat (limited to 'include/vcl')
32 files changed, 15 insertions, 66 deletions
diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx index 8c168b64262c..76598cb80812 100644 --- a/include/vcl/BitmapTools.hxx +++ b/include/vcl/BitmapTools.hxx @@ -13,12 +13,10 @@ #include <config_cairo_canvas.h> #include <vcl/bitmapex.hxx> #include <vcl/ImageTree.hxx> -#include <vcl/BitmapColor.hxx> #if ENABLE_CAIRO_CANVAS #include <vcl/cairo.hxx> #endif #include <basegfx/range/b2drectangle.hxx> -#include <o3tl/safeint.hxx> #include <array> #include <vcl/RawBitmap.hxx> diff --git a/include/vcl/GraphicAttributes.hxx b/include/vcl/GraphicAttributes.hxx index 0908a8f56b9d..08b716b3db08 100644 --- a/include/vcl/GraphicAttributes.hxx +++ b/include/vcl/GraphicAttributes.hxx @@ -19,9 +19,7 @@ #pragma once -#include <memory> #include <vcl/dllapi.h> -#include <o3tl/typed_flags_set.hxx> #include <vcl/bitmap.hxx> enum class GraphicDrawMode diff --git a/include/vcl/NotebookBarAddonsMerger.hxx b/include/vcl/NotebookBarAddonsMerger.hxx index 325a6d387029..c1fea5391683 100644 --- a/include/vcl/NotebookBarAddonsMerger.hxx +++ b/include/vcl/NotebookBarAddonsMerger.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/uno/Sequence.h> #include <vector> -#include <map> class Menu; diff --git a/include/vcl/QueueInfo.hxx b/include/vcl/QueueInfo.hxx index 5817f5c06ee7..a011e125e27c 100644 --- a/include/vcl/QueueInfo.hxx +++ b/include/vcl/QueueInfo.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_VCL_QUEUEINFO_HXX #define INCLUDED_VCL_QUEUEINFO_HXX -#include <config_options.h> - #include <rtl/ustring.hxx> #include <vcl/dllapi.h> diff --git a/include/vcl/RawBitmap.hxx b/include/vcl/RawBitmap.hxx index aeb5dec9f3e1..92e903b4292d 100644 --- a/include/vcl/RawBitmap.hxx +++ b/include/vcl/RawBitmap.hxx @@ -9,6 +9,10 @@ #pragma once +#include <o3tl/safeint.hxx> +#include <vcl/BitmapColor.hxx> +#include <vcl/bitmapex.hxx> + namespace vcl::bitmap { /** diff --git a/include/vcl/animate/AnimationBitmap.hxx b/include/vcl/animate/AnimationBitmap.hxx index 5b438f8c4d6a..6f5aa1768629 100644 --- a/include/vcl/animate/AnimationBitmap.hxx +++ b/include/vcl/animate/AnimationBitmap.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_VCL_ANIMATE_ANIMATIONBITMAP_HXX #define INCLUDED_VCL_ANIMATE_ANIMATIONBITMAP_HXX -#include <vcl/dllapi.h> #include <vcl/bitmapex.hxx> enum class Disposal diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 820a8efe057a..9f0f7b9cf74f 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_VCL_DOCKWIN_HXX #define INCLUDED_VCL_DOCKWIN_HXX -#include <config_options.h> #include <vcl/dllapi.h> #include <o3tl/deleter.hxx> #include <vcl/builder.hxx> diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 7edc7686e1fb..0ad6203a10e9 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -27,7 +27,6 @@ #include <rtl/ustrbuf.hxx> #include <o3tl/deleter.hxx> -#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/menu.hxx> #include <vcl/dndhelp.hxx> diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx deleted file mode 100644 index b7cf238eb0c9..000000000000 --- a/include/vcl/field.hxx +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * 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_VCL_FIELD_HXX -#define INCLUDED_VCL_FIELD_HXX - -#include <config_options.h> -#include <memory> -#include <vcl/dllapi.h> -#endif // INCLUDED_VCL_FIELD_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/formatter.hxx b/include/vcl/formatter.hxx index fce7f5018aee..99d45fb40ea3 100644 --- a/include/vcl/formatter.hxx +++ b/include/vcl/formatter.hxx @@ -20,6 +20,8 @@ #pragma once #include <config_options.h> +#include <i18nlangtag/lang.h> +#include <tools/link.hxx> #include <vcl/settings.hxx> #include <map> #include <memory> diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx index 0e116234fcb5..72352f6902a1 100644 --- a/include/vcl/gfxlink.hxx +++ b/include/vcl/gfxlink.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_VCL_GFXLINK_HXX #define INCLUDED_VCL_GFXLINK_HXX -#include <rtl/ustring.hxx> #include <tools/gen.hxx> #include <vcl/dllapi.h> #include <vcl/mapmod.hxx> diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx index f01c1747280d..a77eb89e9f76 100644 --- a/include/vcl/image.hxx +++ b/include/vcl/image.hxx @@ -23,7 +23,6 @@ #include <vcl/dllapi.h> #include <tools/gen.hxx> #include <vcl/bitmapex.hxx> -#include <vcl/vclenum.hxx> #include <vcl/outdev.hxx> #include <memory> diff --git a/include/vcl/imapobj.hxx b/include/vcl/imapobj.hxx index 2310328904e9..902b5f908cdf 100644 --- a/include/vcl/imapobj.hxx +++ b/include/vcl/imapobj.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_VCL_IMAPOBJ_HXX #define INCLUDED_VCL_IMAPOBJ_HXX -#include <vcl/dllapi.h> #include <svl/macitem.hxx> #include <rtl/strbuf.hxx> diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index facf8854263b..3fcfd58c3f43 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -22,12 +22,7 @@ #include <vcl/vclptr.hxx> #include <vcl/IContext.hxx> #include <vcl/commandevent.hxx> -#include <tools/stream.hxx> -#include <vcl/cvtgrf.hxx> -#include <comphelper/base64.hxx> -#include <vcl/virdev.hxx> #include <set> -#include <boost/property_tree/json_parser.hpp> class ScrollBar; class ScrollBar; diff --git a/include/vcl/naturalsort.hxx b/include/vcl/naturalsort.hxx index 852c8472b68f..1883bb35701c 100644 --- a/include/vcl/naturalsort.hxx +++ b/include/vcl/naturalsort.hxx @@ -10,6 +10,7 @@ #pragma once #include <vcl/dllapi.h> +#include <rtl/ustring.hxx> namespace vcl { diff --git a/include/vcl/scopedbitmapaccess.hxx b/include/vcl/scopedbitmapaccess.hxx index f63bcc55f8a3..b06618091529 100644 --- a/include/vcl/scopedbitmapaccess.hxx +++ b/include/vcl/scopedbitmapaccess.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_VCL_SCOPEDBITMAPACCESS_HXX #define INCLUDED_VCL_SCOPEDBITMAPACCESS_HXX +#include <sal/types.h> + namespace vcl { diff --git a/include/vcl/specialchars.hxx b/include/vcl/specialchars.hxx index d310a92a6e0d..5a7fe8cd3f85 100644 --- a/include/vcl/specialchars.hxx +++ b/include/vcl/specialchars.hxx @@ -20,6 +20,9 @@ #ifndef INCLUDED_VCL_SPECIAL_CHARS_HXX #define INCLUDED_VCL_SPECIAL_CHARS_HXX +#include <vcl/dllapi.h> +#include <rtl/ustring.hxx> + namespace vcl { class Font; diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 422f8e23fb50..7102633f7a96 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -32,7 +32,6 @@ #include <osl/thread.h> #include <tools/gen.hxx> #include <tools/link.hxx> -#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/inputtypes.hxx> #include <vcl/exceptiontypes.hxx> diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx index 1be73fef8856..c4fae1adb8bc 100644 --- a/include/vcl/sysdata.hxx +++ b/include/vcl/sysdata.hxx @@ -22,10 +22,6 @@ #include <sal/types.h> -#include <vector> - -#include <config_cairo_canvas.h> - #ifdef MACOSX // predeclare the native classes to avoid header/include problems typedef struct CGContext *CGContextRef; diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index 32f07c111187..f694c4d64c8e 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -26,7 +26,6 @@ #include <vcl/vclenum.hxx> #include <vcl/window.hxx> #include <vcl/windowstate.hxx> -#include <o3tl/typed_flags_set.hxx> #include <memory> #include <vcl/NotebookBarAddonsMerger.hxx> diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index 798b5ac370dd..4fe386da3d15 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -26,7 +26,6 @@ #include <vcl/toolbox.hxx> #include <vcl/EnumContext.hxx> #include <vcl/NotebookbarContextControl.hxx> -#include <boost/property_tree/json_parser.hpp> class ImplTabItem; struct ImplTabCtrlData; diff --git a/include/vcl/toolkit/field.hxx b/include/vcl/toolkit/field.hxx index 705e734c20d9..714ff87de2c9 100644 --- a/include/vcl/toolkit/field.hxx +++ b/include/vcl/toolkit/field.hxx @@ -27,7 +27,6 @@ #include <tools/date.hxx> #include <tools/fldunit.hxx> #include <tools/time.hxx> -#include <tools/link.hxx> #include <vcl/toolkit/combobox.hxx> #include <vcl/toolkit/spinfld.hxx> diff --git a/include/vcl/toolkit/spinfld.hxx b/include/vcl/toolkit/spinfld.hxx index 7afe3e210af0..5eca1f13fbbe 100644 --- a/include/vcl/toolkit/spinfld.hxx +++ b/include/vcl/toolkit/spinfld.hxx @@ -26,7 +26,6 @@ #include <vcl/dllapi.h> #include <vcl/edit.hxx> #include <vcl/timer.hxx> -#include <config_options.h> class VCL_DLLPUBLIC SpinField : public Edit { diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx index ce45fab4a9ee..b7b5a4daa11d 100644 --- a/include/vcl/treelistbox.hxx +++ b/include/vcl/treelistbox.hxx @@ -27,7 +27,6 @@ #include <vector> #include <vcl/ctrl.hxx> -#include <vcl/accel.hxx> #include <vcl/mnemonicengine.hxx> #include <vcl/quickselectionengine.hxx> #include <vcl/image.hxx> @@ -35,7 +34,6 @@ #include <tools/contnr.hxx> #include <vcl/treelist.hxx> #include <vcl/transfer.hxx> -#include <vcl/idle.hxx> #include <vcl/menu.hxx> #include <o3tl/typed_flags_set.hxx> diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx index 36dd5488ce7a..1797c9156aba 100644 --- a/include/vcl/uitest/uiobject.hxx +++ b/include/vcl/uitest/uiobject.hxx @@ -16,6 +16,7 @@ #include <vcl/window.hxx> #include <vcl/dllapi.h> +#include <vcl/treelistbox.hxx> #include <set> diff --git a/include/vcl/uitest/uitest.hxx b/include/vcl/uitest/uitest.hxx index 4b9ca92f4465..53bdded590aa 100644 --- a/include/vcl/uitest/uitest.hxx +++ b/include/vcl/uitest/uitest.hxx @@ -12,8 +12,6 @@ #include <rtl/ustring.hxx> -#include <vcl/dllapi.h> - #include <memory> namespace com::sun::star::beans { struct PropertyValue; } diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx index 2daa23468bb7..ad24a61740a2 100644 --- a/include/vcl/vclevent.hxx +++ b/include/vcl/vclevent.hxx @@ -23,8 +23,6 @@ #include <vcl/dllapi.h> #include <vcl/vclptr.hxx> -#include <com/sun/star/uno/Reference.hxx> - class Menu; namespace com::sun::star::accessibility { diff --git a/include/vcl/viewdataentry.hxx b/include/vcl/viewdataentry.hxx index 6b7413f04a1f..c81ab05a97e3 100644 --- a/include/vcl/viewdataentry.hxx +++ b/include/vcl/viewdataentry.hxx @@ -20,9 +20,7 @@ #ifndef INCLUDED_VCL_VIEWDATAENTRY_HXX #define INCLUDED_VCL_VIEWDATAENTRY_HXX -#include <vcl/dllapi.h> #include <tools/solar.h> -#include <tools/gen.hxx> #include <vector> diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index c45a0cc35c54..8a796040bc78 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -17,7 +17,6 @@ #include <tools/fldunit.hxx> #include <tools/gen.hxx> #include <tools/link.hxx> -#include <tools/time.hxx> #include <vcl/dllapi.h> #include <vcl/vclenum.hxx> #include <vcl/font.hxx> diff --git a/include/vcl/weldutils.hxx b/include/vcl/weldutils.hxx index 75da11f586bd..8a57ecead9b8 100644 --- a/include/vcl/weldutils.hxx +++ b/include/vcl/weldutils.hxx @@ -14,7 +14,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <comphelper/interfacecontainer2.hxx> #include <cppuhelper/compbase.hxx> -#include <tools/link.hxx> +#include <tools/time.hxx> #include <vcl/dllapi.h> #include <vcl/formatter.hxx> #include <vcl/weld.hxx> diff --git a/include/vcl/windowstate.hxx b/include/vcl/windowstate.hxx index 3935512612cc..dcf0f4e9a394 100644 --- a/include/vcl/windowstate.hxx +++ b/include/vcl/windowstate.hxx @@ -22,6 +22,7 @@ #include <vcl/dllapi.h> #include <vcl/vclenum.hxx> +#include <rtl/string.hxx> class VCL_PLUGIN_PUBLIC WindowStateData { diff --git a/include/vcl/wizardmachine.hxx b/include/vcl/wizardmachine.hxx index 365f875f8783..a2ce936630c2 100644 --- a/include/vcl/wizardmachine.hxx +++ b/include/vcl/wizardmachine.hxx @@ -22,7 +22,6 @@ #include <memory> #include <vcl/dllapi.h> #include <vcl/builderpage.hxx> -#include <vcl/idle.hxx> namespace weld { class Builder; |