diff options
71 files changed, 51 insertions, 292 deletions
diff --git a/vcl/IwyuFilter_vcl.yaml b/vcl/IwyuFilter_vcl.yaml index e05f26754123..d15761b63c82 100644 --- a/vcl/IwyuFilter_vcl.yaml +++ b/vcl/IwyuFilter_vcl.yaml @@ -56,3 +56,18 @@ blacklist: vcl/source/window/event.cxx: # comphelper::ScopeGuard is actually used - comphelper/scopeguard.hxx + vcl/unx/generic/app/saldisp.cxx: + # needed for transitive cursor includes + - unx/x11_cursors/salcursors.h + vcl/unx/generic/gdi/font.cxx: + # Complete type needed for implicit dtor + - vcl/fontcharmap.hxx + vcl/unx/generic/gdi/salbmp.cxx: + # OSL_BIGENDIAN is being checked + - osl/endian.h + vcl/unx/generic/glyphs/freetype_glyphcache.cxx: + # Needed for FreeType header macros + - ft2build.h + vcl/unx/generic/print/genpspgraphics.cxx: + # Complete type needed for implicit dtor + - vcl/fontcharmap.hxx diff --git a/vcl/inc/unx/i18n_cb.hxx b/vcl/inc/unx/i18n_cb.hxx index 5ba32eea0fb0..d6a505e0dc5e 100644 --- a/vcl/inc/unx/i18n_cb.hxx +++ b/vcl/inc/unx/i18n_cb.hxx @@ -19,6 +19,8 @@ #ifndef INCLUDED_VCL_INC_UNX_I18N_CB_HXX #define INCLUDED_VCL_INC_UNX_I18N_CB_HXX +#include <X11/Xlib.h> + #include <salwtype.hxx> #include <vector> diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx index f38c1b794802..c9302c5eb97b 100644 --- a/vcl/inc/unx/i18n_ic.hxx +++ b/vcl/inc/unx/i18n_ic.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_VCL_INC_UNX_I18N_IC_HXX #define INCLUDED_VCL_INC_UNX_I18N_IC_HXX -#include <i18nlangtag/lang.h> #include "i18n_cb.hxx" enum class EndExtTextInputFlags; diff --git a/vcl/inc/unx/i18n_im.hxx b/vcl/inc/unx/i18n_im.hxx index fa5b3b4a5dcc..eb4b774f21d3 100644 --- a/vcl/inc/unx/i18n_im.hxx +++ b/vcl/inc/unx/i18n_im.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_VCL_INC_UNX_I18N_IM_HXX #define INCLUDED_VCL_INC_UNX_I18N_IM_HXX +#include <X11/Xlib.h> + #include <vclpluginapi.h> #define bUseInputMethodDefault True diff --git a/vcl/inc/unx/i18n_keysym.hxx b/vcl/inc/unx/i18n_keysym.hxx index ae9c4ae30a2e..3189087398f4 100644 --- a/vcl/inc/unx/i18n_keysym.hxx +++ b/vcl/inc/unx/i18n_keysym.hxx @@ -20,6 +20,10 @@ #ifndef INCLUDED_VCL_INC_UNX_I18N_KEYSYM_HXX #define INCLUDED_VCL_INC_UNX_I18N_KEYSYM_HXX +#include <X11/X.h> + +#include <sal/types.h> + /* convert a keysym as defined in /usr/{X11R6|openwin}/include/X11/keysymdef.h to unicode diff --git a/vcl/inc/unx/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx index 312e1be9283c..69baaf32c756 100644 --- a/vcl/inc/unx/i18n_xkb.hxx +++ b/vcl/inc/unx/i18n_xkb.hxx @@ -20,7 +20,8 @@ #ifndef INCLUDED_VCL_INC_UNX_I18N_XKB_HXX #define INCLUDED_VCL_INC_UNX_I18N_XKB_HXX -#include <sal/types.h> +#include <X11/Xlib.h> + #include <vclpluginapi.h> class VCLPLUG_GEN_PUBLIC SalI18N_KeyboardExtension diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index c9a9a5120a82..b93d263f33e7 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -24,19 +24,16 @@ #include <X11/Xutil.h> #include <X11/extensions/Xrender.h> -#include <tools/fract.hxx> - #include <vcl/salgtype.hxx> #include <vcl/vclenum.hxx> -#include <vcl/metric.hxx> +#include <unx/saldisp.hxx> #include <salgdi.hxx> #include <salgeom.hxx> #include <sallayout.hxx> #include <vclpluginapi.h> #include <ControlCacheKey.hxx> -#include <deque> #include <memory> /* From <X11/Intrinsic.h> */ diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h index bef98cbbdf6e..a07a8453d3b7 100644 --- a/vcl/inc/unx/salobj.h +++ b/vcl/inc/unx/salobj.h @@ -20,6 +20,8 @@ #ifndef INCLUDED_VCL_INC_UNX_SALOBJ_H #define INCLUDED_VCL_INC_UNX_SALOBJ_H +#include <X11/Xlib.h> + #include <salobj.hxx> #include <vcl/sysdata.hxx> #include <vclpluginapi.h> diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h index 8ad94eb6ee7d..b9874a3eb084 100644 --- a/vcl/inc/unx/salvd.h +++ b/vcl/inc/unx/salvd.h @@ -21,11 +21,13 @@ #define INCLUDED_VCL_INC_UNX_SALVD_H #include <X11/Xlib.h> -#include <X11/Xutil.h> +#include <unx/saldisp.hxx> #include <unx/saltype.h> #include <salvd.hxx> +#include <memory> + class SalDisplay; class X11SalGraphics; diff --git a/vcl/unx/generic/app/gendisp.cxx b/vcl/unx/generic/app/gendisp.cxx index c83283a7b0e0..b1dbef3f5faf 100644 --- a/vcl/unx/generic/app/gendisp.cxx +++ b/vcl/unx/generic/app/gendisp.cxx @@ -19,7 +19,6 @@ #include <salframe.hxx> #include <unx/gendisp.hxx> -#include <unx/geninst.h> SalGenericDisplay::SalGenericDisplay() { diff --git a/vcl/unx/generic/app/geninst.cxx b/vcl/unx/generic/app/geninst.cxx index dff6ff0ff379..b6611631b50d 100644 --- a/vcl/unx/generic/app/geninst.cxx +++ b/vcl/unx/generic/app/geninst.cxx @@ -19,16 +19,10 @@ #include <sal/config.h> -#include <cassert> -#include <string.h> -#include <stdlib.h> - #if defined(LINUX) # include <stdio.h> #endif -#include <osl/module.hxx> -#include <comphelper/solarmutex.hxx> #include <config_features.h> #if HAVE_FEATURE_OPENGL #include <vcl/opengl/OpenGLContext.hxx> diff --git a/vcl/unx/generic/app/gensys.cxx b/vcl/unx/generic/app/gensys.cxx index 1e4ae1b7aba4..98371c5484d1 100644 --- a/vcl/unx/generic/app/gensys.cxx +++ b/vcl/unx/generic/app/gensys.cxx @@ -21,22 +21,14 @@ #include <unx/gensys.h> -#include <vcl/button.hxx> - #include <svdata.hxx> -#include <rtl/ustrbuf.hxx> #include <rtl/strbuf.hxx> #include <rtl/bootstrap.hxx> #include <osl/process.h> #include <osl/thread.h> #include <unotools/configmgr.hxx> -#include <vcl/unohelp.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> - using namespace com::sun::star; SalGenericSystem::SalGenericSystem() diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index 2e8f22d8cc3b..e9861dca51d8 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -20,16 +20,11 @@ #include <stdio.h> #include <string.h> -#include <sal/alloca.h> #include <osl/thread.h> #include <X11/Xlib.h> -#include <X11/Xutil.h> -#include <X11/Xlocale.h> #include <vcl/commandevent.hxx> -#include <unx/salunx.h> -#include <unx/XIM.h> #include <unx/i18n_cb.hxx> #include <unx/i18n_ic.hxx> #include <unx/i18n_im.hxx> diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index 0456606c2566..63dbdbd9c0ab 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -17,16 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <stdio.h> - -#include <osl/thread.h> - #include <X11/Xlib.h> -#include <X11/Xutil.h> -#include <X11/Xlocale.h> -#include <unx/salunx.h> -#include <unx/XIM.h> #include <unx/i18n_ic.hxx> #include <unx/i18n_im.hxx> diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx index 8be7bb793fc0..56a0d3f3e82a 100644 --- a/vcl/unx/generic/app/i18n_im.cxx +++ b/vcl/unx/generic/app/i18n_im.cxx @@ -25,15 +25,9 @@ # define __USE_XOPEN # endif #endif -#include <poll.h> #include <X11/Xlib.h> -#include <X11/Xutil.h> -#include <X11/Xlocale.h> -#include <unx/XIM.h> -#include <unx/salunx.h> -#include <unx/saldisp.hxx> #include <unx/i18n_im.hxx> #include <osl/thread.h> diff --git a/vcl/unx/generic/app/i18n_xkb.cxx b/vcl/unx/generic/app/i18n_xkb.cxx index ddb8414ba106..8fe7808e3a96 100644 --- a/vcl/unx/generic/app/i18n_xkb.cxx +++ b/vcl/unx/generic/app/i18n_xkb.cxx @@ -17,12 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <stdio.h> +#include <stdlib.h> #include <X11/Xlib.h> #include <X11/XKBlib.h> -#include <unx/saldisp.hxx> #include <unx/i18n_xkb.hxx> SalI18N_KeyboardExtension::SalI18N_KeyboardExtension( Display* pDisplay ) diff --git a/vcl/unx/generic/app/randrwrapper.cxx b/vcl/unx/generic/app/randrwrapper.cxx index 6a1af4c11b3f..eaa7108a1efe 100644 --- a/vcl/unx/generic/app/randrwrapper.cxx +++ b/vcl/unx/generic/app/randrwrapper.cxx @@ -20,12 +20,8 @@ #ifdef USE_RANDR #include <X11/Xlib.h> -#include <X11/Xutil.h> #include <X11/extensions/Xrandr.h> -#include <osl/module.h> -#include <rtl/ustring.hxx> - namespace { diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx index e0ee680251ad..48cfd1ae4d1f 100644 --- a/vcl/unx/generic/app/saldata.cxx +++ b/vcl/unx/generic/app/saldata.cxx @@ -21,13 +21,8 @@ #include <fcntl.h> #include <cstdio> -#include <cstring> #include <cstdlib> -#include <stdio.h> -#include <limits.h> #include <errno.h> -#include <pthread.h> -#include <sys/resource.h> #ifdef SUN #include <sys/systeminfo.h> #endif @@ -46,10 +41,8 @@ #include <unx/salunxtime.h> #include <unx/sm.hxx> #include <unx/i18n_im.hxx> -#include <unx/i18n_xkb.hxx> #include <X11/Xlib.h> -#include <X11/Xutil.h> #include <X11/Xproto.h> #include <salinst.hxx> @@ -58,11 +51,8 @@ #include <osl/diagnose.h> #include <osl/signal.h> #include <osl/thread.h> -#include <rtl/strbuf.hxx> -#include <rtl/bootstrap.hxx> #include <sal/log.hxx> -#include <tools/debug.hxx> #include <vcl/svapp.hxx> X11SalData* GetX11SalData() diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index e214674d1e12..a9047abd49ed 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -21,8 +21,6 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <sys/time.h> -#include <pthread.h> #include <unistd.h> #if defined(__sun) || defined(AIX) @@ -48,11 +46,11 @@ #include <opengl/zone.hxx> +#include <i18nlangtag/languagetag.hxx> #include <tools/debug.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -#include <unx/salunx.h> #include <sal/log.hxx> #include <sal/types.h> #include <unx/i18n_im.hxx> @@ -60,12 +58,10 @@ #include <unx/saldisp.hxx> #include <unx/saldata.hxx> #include <salinst.hxx> -#include <unx/salgdi.h> #include <unx/salframe.h> #include <vcl/keycodes.hxx> #include <unx/salbmp.h> #include <osl/diagnose.h> -#include <osl/mutex.h> #include <unx/salobj.h> #include <unx/sm.hxx> #include <unx/wmadaptor.hxx> @@ -74,13 +70,10 @@ #include <vcl/opengl/OpenGLHelper.hxx> -#include <osl/socket.h> #include <poll.h> #include <memory> #include <vector> -#include <officecfg/Office/Common.hxx> - /* From <X11/Intrinsic.h> */ typedef unsigned long Pixel; diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx index 13219e28fbe3..8a076e762f4a 100644 --- a/vcl/unx/generic/app/salinst.cxx +++ b/vcl/unx/generic/app/salinst.cxx @@ -17,28 +17,20 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <string.h> -#include <stdio.h> #include <stdlib.h> -#include <osl/module.hxx> - -#include <unx/salunx.h> #include <unx/saldata.hxx> #include <unx/saldisp.hxx> #include <unx/salinst.h> #include <unx/geninst.h> #include <unx/genpspgraphics.h> #include <unx/salframe.h> -#include <unx/genprn.h> #include <unx/sm.hxx> #include <unx/i18n_im.hxx> -#include <unx/helper.hxx> #include <vcl/inputtypes.hxx> #include <salwtype.hxx> -#include <sal/macros.h> // plugin factory function extern "C" diff --git a/vcl/unx/generic/app/saltimer.cxx b/vcl/unx/generic/app/saltimer.cxx index df5e32aa2d2e..dc7a61dfe058 100644 --- a/vcl/unx/generic/app/saltimer.cxx +++ b/vcl/unx/generic/app/saltimer.cxx @@ -18,11 +18,7 @@ */ #include <sys/time.h> -#include <sys/times.h> -#include <time.h> -#include <unistd.h> -#include <unx/salunx.h> #include <unx/salunxtime.h> #include <unx/saldisp.hxx> #include <unx/saltimer.h> diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx index b750845a0eb7..30ff437a263a 100644 --- a/vcl/unx/generic/app/sm.cxx +++ b/vcl/unx/generic/app/sm.cxx @@ -24,7 +24,7 @@ #include <string.h> #include <unistd.h> -#include <sys/poll.h> +#include <poll.h> #include <fcntl.h> #include <rtl/strbuf.hxx> @@ -32,20 +32,18 @@ #include <rtl/process.h> #include <osl/security.h> -#include <osl/conditn.h> #include <X11/Xlib.h> -#include <X11/Xutil.h> #include <X11/Xatom.h> #include <unx/sm.hxx> #include <unx/saldisp.hxx> -#include <unx/salframe.h> #include <unx/salinst.h> #include <vcl/svapp.hxx> #include <vcl/window.hxx> +#include <salframe.hxx> #include <salsession.hxx> namespace { diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index 5cdc914a5bff..8bd45098ef3c 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -18,10 +18,9 @@ */ #include <string.h> -#include <stdio.h> #include <stdlib.h> -#include <sal/alloca.h> +#include <i18nlangtag/languagetag.hxx> #include <rtl/locale.h> #include <osl/thread.h> @@ -31,15 +30,11 @@ #include <unx/wmadaptor.hxx> #include <unx/saldisp.hxx> -#include <unx/salinst.h> #include <unx/salframe.h> -#include <salgdi.hxx> - #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/Xatom.h> -#include <X11/Xresource.h> namespace vcl_sal { diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx index 1ae3bc91595f..bad134fbdafd 100644 --- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx +++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx @@ -18,20 +18,15 @@ */ #include <X11/Xlib.h> -#include <X11/Xutil.h> -#include <X11/Xatom.h> #include <unx/desktops.hxx> #include <rtl/bootstrap.hxx> #include <rtl/process.h> -#include <rtl/ustrbuf.hxx> -#include <osl/module.h> #include <osl/thread.h> #include <vclpluginapi.h> -#include <unistd.h> #include <string.h> #include <comphelper/string.hxx> diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx index c91f3248dd95..43e281610d8c 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.cxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx @@ -20,17 +20,10 @@ #include <X11/Xatom.h> #include "X11_clipboard.hxx" #include "X11_transferable.hxx" -#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/datatransfer/clipboard/RenderingCapabilities.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/registry/XRegistryKey.hpp> -#include <uno/dispatcher.h> -#include <uno/mapping.hxx> -#include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> #include <rtl/ref.hxx> -#include <rtl/tencinfo.h> #if OSL_DEBUG_LEVEL > 1 #include <stdio.h> diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx index 061bc32f6f59..4827c2e4cb41 100644 --- a/vcl/unx/generic/dtrans/X11_clipboard.hxx +++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx @@ -22,8 +22,6 @@ #include "X11_selection.hxx" -#include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp> -#include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp> #include <com/sun/star/datatransfer/clipboard/XSystemClipboard.hpp> #include <cppuhelper/compbase.hxx> diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.hxx b/vcl/unx/generic/dtrans/X11_dndcontext.hxx index 2be3c99fe77c..ec4412488a9d 100644 --- a/vcl/unx/generic/dtrans/X11_dndcontext.hxx +++ b/vcl/unx/generic/dtrans/X11_dndcontext.hxx @@ -26,8 +26,7 @@ #include <cppuhelper/implbase.hxx> #include <rtl/ref.hxx> -#include <X11/Xlib.h> -#include <X11/Xutil.h> +#include <X11/X.h> namespace x11 { diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 7a4c21042edd..e9c00d0174fb 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -25,7 +25,6 @@ #include <unx/saldisp.hxx> #include <unistd.h> -#include <stdio.h> #include <string.h> #include <sys/time.h> @@ -35,12 +34,12 @@ #include <X11/Xatom.h> #include <X11/keysym.h> -#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD) || defined(OPENBSD) +#if defined(NETBSD) || defined (FREEBSD) || defined(OPENBSD) #include <sys/poll.h> #else #include <poll.h> #endif -#include <sal/alloca.h> + #include <sal/macros.h> #include "X11_selection.hxx" @@ -65,7 +64,6 @@ #include <com/sun/star/awt/MouseButton.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <rtl/tencinfo.h> -#include <osl/process.h> #include <comphelper/processfactory.hxx> #include <comphelper/solarmutex.hxx> diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx index dc08d85e6099..2b9c1299be45 100644 --- a/vcl/unx/generic/dtrans/X11_service.cxx +++ b/vcl/unx/generic/dtrans/X11_service.cxx @@ -21,12 +21,6 @@ #include "X11_clipboard.hxx" #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/registry/XRegistryKey.hpp> -#include <uno/dispatcher.h> -#include <uno/mapping.hxx> -#include <cppuhelper/factory.hxx> using namespace cppu; using namespace com::sun::star::uno; diff --git a/vcl/unx/generic/dtrans/X11_transferable.hxx b/vcl/unx/generic/dtrans/X11_transferable.hxx index f2a5b67b665c..a0a896b6bd91 100644 --- a/vcl/unx/generic/dtrans/X11_transferable.hxx +++ b/vcl/unx/generic/dtrans/X11_transferable.hxx @@ -23,7 +23,6 @@ #include "X11_selection.hxx" #include <com/sun/star/datatransfer/XTransferable.hpp> -#include <com/sun/star/lang/XEventListener.hpp> #include <cppuhelper/implbase.hxx> namespace x11 { diff --git a/vcl/unx/generic/dtrans/bmp.cxx b/vcl/unx/generic/dtrans/bmp.cxx index 68818549fab4..d7e7d4dc6c0c 100644 --- a/vcl/unx/generic/dtrans/bmp.cxx +++ b/vcl/unx/generic/dtrans/bmp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sal/macros.h> #include <tools/stream.hxx> #include <vcl/dibtools.hxx> @@ -29,11 +28,6 @@ #include <unx/x11/xlimits.hxx> #include "bmp.hxx" -#include "X11_selection.hxx" - -#include <unistd.h> -#include <cstdio> -#include <cstring> using namespace x11; diff --git a/vcl/unx/generic/dtrans/bmp.hxx b/vcl/unx/generic/dtrans/bmp.hxx index 853fc0b53716..8d24ff41d92b 100644 --- a/vcl/unx/generic/dtrans/bmp.hxx +++ b/vcl/unx/generic/dtrans/bmp.hxx @@ -22,8 +22,6 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> -#include <X11/Xatom.h> -#include <X11/keysym.h> #include <com/sun/star/uno/Sequence.hxx> #include <sal/types.h> diff --git a/vcl/unx/generic/dtrans/config.cxx b/vcl/unx/generic/dtrans/config.cxx index f2926ef9ec78..5a8266c804e8 100644 --- a/vcl/unx/generic/dtrans/config.cxx +++ b/vcl/unx/generic/dtrans/config.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <cstdio> #include <o3tl/any.hxx> #include <unotools/configitem.hxx> diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index bfa487153321..8979459cb1ee 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -20,14 +20,10 @@ #include <memory> #include <unx/fontmanager.hxx> #include <unx/helper.hxx> -#include <impfont.hxx> #include <comphelper/sequence.hxx> #include <vcl/svapp.hxx> -#include <vcl/sysdata.hxx> #include <vcl/vclenum.hxx> -#include <vcl/wrkwin.hxx> -#include <fontinstance.hxx> -#include <sallayout.hxx> +#include <fontselect.hxx> #include <i18nlangtag/languagetag.hxx> #include <i18nutil/unicode.hxx> #include <rtl/strbuf.hxx> @@ -41,20 +37,13 @@ using namespace psp; #include <fontconfig/fontconfig.h> -#include <ft2build.h> -#include <fontconfig/fcfreetype.h> #include <cstdio> -#include <cstdarg> #include <unotools/configmgr.hxx> -#include <osl/module.h> -#include <osl/thread.h> #include <osl/process.h> -#include <rtl/ustrbuf.hxx> - #include <utility> #include <algorithm> diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index a4d07ec3bdbe..36f049432114 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -19,31 +19,19 @@ #include <memory> #include <unistd.h> -#include <sys/stat.h> -#include <dirent.h> -#include <stdlib.h> #include <osl/thread.h> -#include <config_gio.h> #include <unx/fontmanager.hxx> #include <fontsubset.hxx> #include <impfontcharmap.hxx> -#include <svdata.hxx> -#include <unx/geninst.h> #include <unx/gendata.hxx> #include <unx/helper.hxx> -#include <vcl/strhelper.hxx> -#include <vcl/ppdparser.hxx> -#include <vcl/embeddedfontshelper.hxx> #include <vcl/fontcharmap.hxx> #include <tools/urlobj.hxx> -#include <tools/stream.hxx> #include <osl/file.hxx> -#include <osl/process.h> -#include <rtl/tencinfo.h> #include <rtl/ustrbuf.hxx> #include <rtl/strbuf.hxx> @@ -51,7 +39,6 @@ #include <sal/log.hxx> #include <i18nlangtag/applelangid.hxx> -#include <i18nlangtag/mslangid.hxx> #include <sft.hxx> @@ -68,7 +55,6 @@ #endif #include <com/sun/star/beans/XMaterialHolder.hpp> -#include <com/sun/star/beans/NamedValue.hpp> using namespace vcl; using namespace utl; diff --git a/vcl/unx/generic/fontmanager/fontsubst.cxx b/vcl/unx/generic/fontmanager/fontsubst.cxx index dc0df7ac9721..a8adb6cf89fd 100644 --- a/vcl/unx/generic/fontmanager/fontsubst.cxx +++ b/vcl/unx/generic/fontmanager/fontsubst.cxx @@ -18,8 +18,8 @@ */ #include <unx/geninst.h> -#include <unx/genpspgraphics.h> #include <outdev.h> +#include <unx/fontmanager.hxx> #include <PhysicalFontCollection.hxx> // platform specific font substitution hooks diff --git a/vcl/unx/generic/fontmanager/helper.cxx b/vcl/unx/generic/fontmanager/helper.cxx index 7fa11915ed80..bd34d34a5b83 100644 --- a/vcl/unx/generic/fontmanager/helper.cxx +++ b/vcl/unx/generic/fontmanager/helper.cxx @@ -19,11 +19,8 @@ #include <config_folders.h> -#include <cstring> #include <sys/stat.h> -#include <unistd.h> #include <limits.h> -#include <osl/file.hxx> #include <osl/process.h> #include <osl/thread.h> #include <rtl/bootstrap.hxx> @@ -31,8 +28,6 @@ #include <sal/log.hxx> #include <tools/urlobj.hxx> #include <unx/helper.hxx> -#include <vcl/ppdparser.hxx> -#include <memory> using ::rtl::Bootstrap; diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx index c2cd8496d168..1ec6f2b67fb4 100644 --- a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx +++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx @@ -17,10 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <utility> - #include <X11/Xlib.h> -#include <X11/Xutil.h> #include <X11/extensions/Xrender.h> #include "cairo_xlib_cairo.hxx" @@ -28,8 +25,6 @@ #include <vcl/sysdata.hxx> #include <vcl/bitmap.hxx> #include <vcl/virdev.hxx> -#include <vcl/window.hxx> -#include <basegfx/vector/b2isize.hxx> #include <sal/log.hxx> #include <cairo-xlib.h> diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx index edac964b8336..60300ba634ce 100644 --- a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx +++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx @@ -21,7 +21,6 @@ #define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_XLIB_CAIRO_HXX #include <sal/config.h> -#include <sal/types.h> #include <vcl/cairo.hxx> #include <vcl/salgtype.hxx> diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index 0b24cbf32d63..3b1c7f24f01a 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -19,7 +19,6 @@ #include <unx/cairotextrender.hxx> -#include <basegfx/polygon/b2dpolypolygon.hxx> #include <unotools/configmgr.hxx> #include <vcl/settings.hxx> #include <vcl/sysdata.hxx> @@ -27,14 +26,12 @@ #include <vcl/fontcharmap.hxx> #include <sal/log.hxx> -#include <unx/printergfx.hxx> #include <unx/genpspgraphics.h> #include <unx/geninst.h> #include <unx/glyphcache.hxx> #include <unx/fc_fontoptions.hxx> #include <unx/freetype_glyphcache.hxx> #include <PhysicalFontFace.hxx> -#include <impfont.hxx> #include <impfontmetricdata.hxx> #include <cairo.h> diff --git a/vcl/unx/generic/gdi/font.cxx b/vcl/unx/generic/gdi/font.cxx index 29b0f4daa715..2efac7717edf 100644 --- a/vcl/unx/generic/gdi/font.cxx +++ b/vcl/unx/generic/gdi/font.cxx @@ -20,9 +20,7 @@ #include <vcl/sysdata.hxx> #include <vcl/fontcharmap.hxx> -#include <unx/saldisp.hxx> #include <unx/salgdi.h> -#include <unx/salvd.h> #include <textrender.hxx> #include <sallayout.hxx> diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx index 350f585b05c7..a511488e53a1 100644 --- a/vcl/unx/generic/gdi/gdiimpl.cxx +++ b/vcl/unx/generic/gdi/gdiimpl.cxx @@ -28,7 +28,6 @@ #include <vcl/gradient.hxx> #include <sal/log.hxx> -#include <unx/salunx.h> #include <unx/saldisp.hxx> #include <unx/salbmp.h> #include <unx/salgdi.h> @@ -37,8 +36,6 @@ #include <salframe.hxx> #include <unx/x11/xrender_peer.hxx> -#include <outdata.hxx> - #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> @@ -47,7 +44,6 @@ #include <basegfx/polygon/b2dlinegeometry.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> -#include <basegfx/polygon/b2dpolypolygoncutter.hxx> #include <basegfx/polygon/b2dtrapezoid.hxx> #include <basegfx/utils/systemdependentdata.hxx> #include <ControlCacheKey.hxx> diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx index 8a65787f052c..40f52f337170 100644 --- a/vcl/unx/generic/gdi/gdiimpl.hxx +++ b/vcl/unx/generic/gdi/gdiimpl.hxx @@ -21,10 +21,7 @@ #define INCLUDED_VCL_GENERIC_GDI_GDIIMPL_HXX #include <X11/Xlib.h> -#include <X11/Xutil.h> -#include <X11/extensions/Xrender.h> -#include <unx/saltype.h> #include <unx/x11/x11gdiimpl.h> #include <salgdiimpl.hxx> diff --git a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx index b5173aae242f..4175634348b7 100644 --- a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx +++ b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx @@ -10,7 +10,6 @@ #include "openglx11cairotextrender.hxx" #include <openglgdiimpl.hxx> -#include <salbmp.hxx> #include <cairo.h> diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index 745f2469f146..4881e27e5b29 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -18,7 +18,6 @@ */ #include <string.h> -#include <errno.h> #ifdef FREEBSD #include <sys/types.h> @@ -26,7 +25,6 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> -#include <X11/Xproto.h> #include <osl/endian.h> #include <sal/log.hxx> @@ -36,9 +34,7 @@ #include <vcl/bitmap.hxx> #include <com/sun/star/beans/XFastPropertySet.hpp> -#include <unx/salunx.h> #include <unx/saldisp.hxx> -#include <unx/salgdi.h> #include <unx/salbmp.h> #include <unx/salinst.h> #include <unx/x11/xlimits.hxx> @@ -48,7 +44,7 @@ #include <vcl/opengl/OpenGLHelper.hxx> #if defined HAVE_VALGRIND_HEADERS -#include <valgrind/memcheck.h> +#include <valgrind/valgrind.h> #endif #include <memory> diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index 2cfe4058a224..38dfebb2b836 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -17,31 +17,19 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vector> -#include <queue> -#include <set> - #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/extensions/Xrender.h> -#include <X11/Xproto.h> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <basegfx/polygon/b2dpolygontools.hxx> -#include <basegfx/polygon/b2dpolygonclipper.hxx> -#include <basegfx/polygon/b2dlinegeometry.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/matrix/b2dhommatrixtools.hxx> -#include <basegfx/polygon/b2dpolypolygoncutter.hxx> -#include <basegfx/polygon/b2dtrapezoid.hxx> #include <basegfx/curve/b2dcubicbezier.hxx> #include <headless/svpgdi.hxx> -#include <vcl/jobdata.hxx> #include <vcl/sysdata.hxx> #include <vcl/virdev.hxx> #include <sal/log.hxx> @@ -49,19 +37,17 @@ #include <unx/salunx.h> #include <unx/saldisp.hxx> #include <unx/salgdi.h> -#include <unx/salvd.h> -#include <unx/x11/x11gdiimpl.h> #include <unx/x11/xlimits.hxx> +#include <salframe.hxx> #include <salgdiimpl.hxx> -#include <unx/nativewindowhandleprovider.hxx> #include <textrender.hxx> +#include <salvd.hxx> #include "gdiimpl.hxx" #include <opengl/x11/gdiimpl.hxx> #include "x11cairotextrender.hxx" #include "openglx11cairotextrender.hxx" -#include <unx/printergfx.hxx> #include <unx/x11/xrender_peer.hxx> #include "cairo_xlib_cairo.hxx" #include <cairo-xlib.h> diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx index 63b952e6930a..75b742eb4285 100644 --- a/vcl/unx/generic/gdi/salgdi2.cxx +++ b/vcl/unx/generic/gdi/salgdi2.cxx @@ -17,27 +17,19 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <poll.h> #include <salgdiimpl.hxx> #include <vcl/sysdata.hxx> #include <sal/log.hxx> #include <unx/pixmap.hxx> -#include <unx/salunx.h> #include <unx/saldisp.hxx> #include <unx/salbmp.h> #include <unx/salgdi.h> -#include <unx/salvd.h> #include <unx/x11/x11gdiimpl.h> -#include <unx/x11/xlimits.hxx> #include <unx/x11/xrender_peer.hxx> #include <salframe.hxx> -#include <unx/printergfx.hxx> - -#include <vcl/bitmapaccess.hxx> -#include <outdata.hxx> #include <ControlCacheKey.hxx> void X11SalGraphics::CopyScreenArea( Display* pDisplay, diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx index 5d422b6433ed..156e2e342483 100644 --- a/vcl/unx/generic/gdi/salvd.cxx +++ b/vcl/unx/generic/gdi/salvd.cxx @@ -20,18 +20,14 @@ #include <vcl/sysdata.hxx> #include <X11/Xlib.h> -#include <X11/Xutil.h> #include <X11/extensions/Xrender.h> #include <unx/saldisp.hxx> #include <unx/salinst.h> #include <unx/salgdi.h> -#include <unx/salunx.h> #include <unx/salvd.h> #include <unx/x11/xlimits.hxx> -#include <salinst.hxx> - #include <vcl/opengl/OpenGLHelper.hxx> #include <opengl/x11/salvd.hxx> diff --git a/vcl/unx/generic/gdi/x11cairotextrender.cxx b/vcl/unx/generic/gdi/x11cairotextrender.cxx index 88d5b49a1823..81af057a06ac 100644 --- a/vcl/unx/generic/gdi/x11cairotextrender.cxx +++ b/vcl/unx/generic/gdi/x11cairotextrender.cxx @@ -18,11 +18,11 @@ */ #include "x11cairotextrender.hxx" -#include <unx/saldisp.hxx> -#include <unx/salvd.h> #include <unx/glyphcache.hxx> #include <X11/Xregion.h> #include <cairo.h> +#include <salframe.hxx> +#include <salvd.hxx> X11CairoTextRender::X11CairoTextRender(X11SalGraphics& rParent) : mrParent(rParent) diff --git a/vcl/unx/generic/gdi/x11cairotextrender.hxx b/vcl/unx/generic/gdi/x11cairotextrender.hxx index 4b90586edf12..3eaf220f3eb6 100644 --- a/vcl/unx/generic/gdi/x11cairotextrender.hxx +++ b/vcl/unx/generic/gdi/x11cairotextrender.hxx @@ -21,9 +21,7 @@ #define INCLUDED_VCL_UNX_GENERIC_GDI_X11CAIROTEXTRENDER_HXX #include <unx/cairotextrender.hxx> -#include <unx/saldisp.hxx> #include <unx/salgdi.h> -#include <salframe.hxx> class X11CairoTextRender : public CairoTextRender { diff --git a/vcl/unx/generic/gdi/xrender_peer.cxx b/vcl/unx/generic/gdi/xrender_peer.cxx index f8794beb3c39..961f4cd3aefc 100644 --- a/vcl/unx/generic/gdi/xrender_peer.cxx +++ b/vcl/unx/generic/gdi/xrender_peer.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <rtl/ustring.hxx> -#include <unx/salunx.h> #include <unx/saldisp.hxx> #include <unx/x11/xrender_peer.hxx> diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index d58c5bedc097..96a6a9563435 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -22,22 +22,15 @@ #include <unx/freetype_glyphcache.hxx> -#include <vcl/svapp.hxx> #include <fontinstance.hxx> -#include <impglyphitem.hxx> -#include <impfont.hxx> #include <fontattributes.hxx> -#include <config_features.h> #include <unotools/fontdefs.hxx> #include <tools/poly.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -#include <osl/file.hxx> -#include <osl/thread.hxx> #include <sal/log.hxx> #include <langboost.hxx> @@ -52,8 +45,6 @@ #include FT_SIZES_H #include FT_SYNTHESIS_H #include FT_TRUETYPE_TABLES_H -#include FT_TRUETYPE_TAGS_H -#include FT_TRUETYPE_IDS_H #include <rtl/instance.hxx> @@ -67,7 +58,6 @@ #include <sys/mman.h> #include <unx/fontmanager.hxx> #include <impfontcharmap.hxx> -#include <impfontcache.hxx> static FT_Library aLibFT = nullptr; diff --git a/vcl/unx/generic/glyphs/glyphcache.cxx b/vcl/unx/generic/glyphs/glyphcache.cxx index 558e3d8c3323..46be26d38971 100644 --- a/vcl/unx/generic/glyphs/glyphcache.cxx +++ b/vcl/unx/generic/glyphs/glyphcache.cxx @@ -18,17 +18,12 @@ */ #include <stdlib.h> -#include <math.h> #include <unx/freetype_glyphcache.hxx> #include <unx/gendata.hxx> -#include <vcl/svapp.hxx> -#include <vcl/bitmap.hxx> #include <fontinstance.hxx> -#include <fontattributes.hxx> #include <rtl/ustring.hxx> -#include <osl/file.hxx> #include <sal/log.hxx> GlyphCache::GlyphCache() diff --git a/vcl/unx/generic/print/bitmap_gfx.cxx b/vcl/unx/generic/print/bitmap_gfx.cxx index b52b892b3462..f58e77d0ecae 100644 --- a/vcl/unx/generic/print/bitmap_gfx.cxx +++ b/vcl/unx/generic/print/bitmap_gfx.cxx @@ -22,7 +22,6 @@ #include "psputil.hxx" #include <unx/printergfx.hxx> -#include <vcl/strhelper.hxx> namespace psp { diff --git a/vcl/unx/generic/print/common_gfx.cxx b/vcl/unx/generic/print/common_gfx.cxx index 39d5e0ceb38c..0d33c76393ff 100644 --- a/vcl/unx/generic/print/common_gfx.cxx +++ b/vcl/unx/generic/print/common_gfx.cxx @@ -19,8 +19,6 @@ #include <sal/config.h> -#include <cstdlib> - #include "psputil.hxx" #include "glyphset.hxx" @@ -33,7 +31,6 @@ #include <tools/color.hxx> #include <tools/poly.hxx> #include <tools/stream.hxx> -#include <tools/debug.hxx> using namespace psp ; diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index 7e1d1a33c8ba..0c1fb28bf7e1 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -55,7 +55,6 @@ #include <jobset.h> #include <print.h> #include "prtsetup.hxx" -#include <salframe.hxx> #include <salptype.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx index 26c4163893e4..942b7ea9e522 100644 --- a/vcl/unx/generic/print/genpspgraphics.cxx +++ b/vcl/unx/generic/print/genpspgraphics.cxx @@ -28,12 +28,10 @@ #include <fcntl.h> #include <sys/mman.h> #include <sys/stat.h> -#include <sys/types.h> #include <i18nlangtag/mslangid.hxx> #include <vcl/bitmapaccess.hxx> #include <vcl/jobdata.hxx> -#include <printerinfomanager.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/sysdata.hxx> @@ -45,7 +43,6 @@ #include <unx/geninst.h> #include <unx/genpspgraphics.h> #include <unx/printergfx.hxx> -#include <impfont.hxx> #include <langboost.hxx> #include <fontinstance.hxx> #include <fontattributes.hxx> @@ -53,7 +50,6 @@ #include <PhysicalFontCollection.hxx> #include <PhysicalFontFace.hxx> #include <salbmp.hxx> -#include <salprn.hxx> #include <sallayout.hxx> using namespace psp; diff --git a/vcl/unx/generic/print/glyphset.cxx b/vcl/unx/generic/print/glyphset.cxx index 17555d7baf07..9f8105fda2ca 100644 --- a/vcl/unx/generic/print/glyphset.cxx +++ b/vcl/unx/generic/print/glyphset.cxx @@ -18,7 +18,6 @@ */ #include "glyphset.hxx" -#include "psputil.hxx" #include <sft.hxx> @@ -30,15 +29,11 @@ #include <osl/thread.h> -#include <sal/alloca.h> - #include <rtl/ustring.hxx> #include <rtl/strbuf.hxx> #include <unotools/tempfile.hxx> -#include <set> -#include <map> #include <algorithm> using namespace vcl; diff --git a/vcl/unx/generic/print/glyphset.hxx b/vcl/unx/generic/print/glyphset.hxx index f3599a4e8a89..4d5a06101743 100644 --- a/vcl/unx/generic/print/glyphset.hxx +++ b/vcl/unx/generic/print/glyphset.hxx @@ -20,11 +20,10 @@ #ifndef INCLUDED_VCL_GENERIC_PRINT_GLYPHSET_HXX #define INCLUDED_VCL_GENERIC_PRINT_GLYPHSET_HXX -#include <unx/fontmanager.hxx> - #include <osl/file.hxx> #include <rtl/string.hxx> +#include <vcl/glyphitem.hxx> #include <vector> #include <unordered_map> diff --git a/vcl/unx/generic/print/printerjob.cxx b/vcl/unx/generic/print/printerjob.cxx index c0abcf3e9814..5bf85101869d 100644 --- a/vcl/unx/generic/print/printerjob.cxx +++ b/vcl/unx/generic/print/printerjob.cxx @@ -18,13 +18,11 @@ */ #include <stdio.h> -#include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> #include <unistd.h> #include "psputil.hxx" -#include "glyphset.hxx" #include <unx/printerjob.hxx> #include <unx/printergfx.hxx> @@ -38,7 +36,6 @@ #include <osl/thread.h> #include <osl/security.hxx> -#include <sal/macros.h> #include <algorithm> #include <deque> diff --git a/vcl/unx/generic/print/prtsetup.cxx b/vcl/unx/generic/print/prtsetup.cxx index 72d550f11844..0bbbc75ad759 100644 --- a/vcl/unx/generic/print/prtsetup.cxx +++ b/vcl/unx/generic/print/prtsetup.cxx @@ -21,8 +21,6 @@ #include <svdata.hxx> #include <strings.hrc> -#include <osl/thread.h> - #include <officecfg/Office/Common.hxx> using namespace psp; diff --git a/vcl/unx/generic/print/psputil.cxx b/vcl/unx/generic/print/psputil.cxx index 4658865ed028..eefbc23d4353 100644 --- a/vcl/unx/generic/print/psputil.cxx +++ b/vcl/unx/generic/print/psputil.cxx @@ -18,7 +18,6 @@ */ #include <string.h> -#include <rtl/instance.hxx> #include "psputil.hxx" namespace psp { diff --git a/vcl/unx/generic/print/psputil.hxx b/vcl/unx/generic/print/psputil.hxx index ae3d78a730de..5195c50440cf 100644 --- a/vcl/unx/generic/print/psputil.hxx +++ b/vcl/unx/generic/print/psputil.hxx @@ -26,10 +26,6 @@ #include <rtl/ustring.hxx> #include <rtl/strbuf.hxx> #include <rtl/string.hxx> -#include <rtl/tencinfo.h> -#include <rtl/textcvt.h> - -#include <map> namespace psp { diff --git a/vcl/unx/generic/print/text_gfx.cxx b/vcl/unx/generic/print/text_gfx.cxx index e7ced7a83c97..d3153952b0a6 100644 --- a/vcl/unx/generic/print/text_gfx.cxx +++ b/vcl/unx/generic/print/text_gfx.cxx @@ -17,18 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <math.h> - #include "psputil.hxx" #include "glyphset.hxx" #include <unx/printergfx.hxx> #include <unx/fontmanager.hxx> -#include <unx/helper.hxx> - -#include <osl/thread.h> - -#include <sal/alloca.h> using namespace psp ; diff --git a/vcl/unx/generic/printer/cpdmgr.cxx b/vcl/unx/generic/printer/cpdmgr.cxx index 26e2eacd67fe..5a2e1b01d271 100644 --- a/vcl/unx/generic/printer/cpdmgr.cxx +++ b/vcl/unx/generic/printer/cpdmgr.cxx @@ -21,8 +21,7 @@ #include <unx/cpdmgr.hxx> -#include <osl/diagnose.h> -#include <osl/file.hxx> +#include <osl/file.h> #include <osl/thread.h> #include <rtl/ustrbuf.hxx> @@ -31,8 +30,6 @@ #include <config_dbus.h> #include <config_gio.h> -#include <algorithm> - using namespace psp; using namespace osl; diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index 8d0c6528dbcd..ea4dd308d58e 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -27,8 +27,7 @@ #include <unx/cupsmgr.hxx> #include <osl/thread.h> -#include <osl/diagnose.h> -#include <osl/file.hxx> +#include <osl/file.h> #include <osl/conditn.hxx> #include <rtl/ustrbuf.hxx> diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 1ad69f0726ac..68cf1ca9e12d 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -40,7 +40,6 @@ #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/instance.hxx> -#include <sal/macros.h> #include <sal/log.hxx> #include <salhelper/linkhelper.hxx> diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 21cad665bf25..333ba10b987e 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -17,30 +17,22 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <unistd.h> -#include <sys/wait.h> -#include <signal.h> - #include <unx/cpdmgr.hxx> #include <unx/cupsmgr.hxx> #include <unx/helper.hxx> -#include <vcl/strhelper.hxx> #include <saldatabasic.hxx> #include <tools/urlobj.hxx> -#include <tools/stream.hxx> #include <tools/config.hxx> #include <i18nutil/paper.hxx> #include <rtl/strbuf.hxx> -#include <sal/macros.h> #include <sal/log.hxx> #include <osl/file.hxx> #include <osl/thread.hxx> #include <osl/mutex.hxx> -#include <osl/process.h> // filename of configuration files #define PRINT_FILENAME "psprint.conf" diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 62c3fa9ddfe6..f5a3d872f7a5 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -17,21 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <signal.h> #include <string.h> #include <stdio.h> #include <stdlib.h> -#include <unistd.h> #include <tools/debug.hxx> -#include <sal/alloca.h> - +#include <vcl/event.hxx> #include <vcl/floatwin.hxx> -#include <vcl/svapp.hxx> #include <vcl/keycodes.hxx> -#include <vcl/layout.hxx> -#include <printerinfomanager.hxx> #include <vcl/settings.hxx> #include <vcl/bitmapaccess.hxx> #include <vcl/opengl/OpenGLContext.hxx> @@ -43,22 +37,17 @@ #include <X11/keysym.h> #include <X11/extensions/shape.h> -#include <unx/salunx.h> #include <saldatabasic.hxx> #include <unx/saldisp.hxx> #include <unx/salgdi.h> #include <unx/salframe.h> -#include <unx/sm.hxx> #include <unx/wmadaptor.hxx> -#include <unx/genprn.h> #include <unx/salbmp.h> #include <unx/i18n_ic.hxx> #include <unx/i18n_keysym.hxx> -#include <unx/x11/xlimits.hxx> #include <opengl/zone.hxx> #include <unx/gensys.h> -#include <sallayout.hxx> #include <window.h> #include <sal/macros.h> @@ -66,7 +55,6 @@ #include <com/sun/star/uno/Exception.hpp> #include <svdata.hxx> -#include <strings.hrc> #include <bitmaps.hlst> #include <boost/optional.hpp> diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx index d253d08ce5ba..9fe34d4528b9 100644 --- a/vcl/unx/generic/window/salobj.cxx +++ b/vcl/unx/generic/window/salobj.cxx @@ -30,12 +30,11 @@ #include <vcl/event.hxx> #include <sal/log.hxx> -#include <unx/salunx.h> #include <unx/salinst.h> #include <unx/saldisp.hxx> -#include <unx/salframe.h> #include <unx/salobj.h> +#include <salframe.hxx> #include <salwtype.hxx> // SalInstance member to create and destroy a SalObject diff --git a/vcl/unx/generic/window/screensaverinhibitor.cxx b/vcl/unx/generic/window/screensaverinhibitor.cxx index d597cdb619ff..cc291c5e725b 100644 --- a/vcl/unx/generic/window/screensaverinhibitor.cxx +++ b/vcl/unx/generic/window/screensaverinhibitor.cxx @@ -11,7 +11,6 @@ #include <unx/screensaverinhibitor.hxx> #include <X11/Xlib.h> -#include <X11/Xutil.h> #include <X11/Xatom.h> #if !defined(__sun) && !defined(AIX) |