diff options
36 files changed, 66 insertions, 68 deletions
diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx b/canvas/source/cairo/cairo_xlib_cairo.cxx index 3086fd562096..8b262926bebb 100644 --- a/canvas/source/cairo/cairo_xlib_cairo.cxx +++ b/canvas/source/cairo/cairo_xlib_cairo.cxx @@ -19,10 +19,10 @@ #include <utility> -#include <tools/prex.h> +#include <prex.h> #include <X11/extensions/Xrender.h> #include <X11/Xlib.h> -#include <tools/postx.h> +#include <postx.h> #include "cairo_xlib_cairo.hxx" diff --git a/tools/inc/tools/postx.h b/include/postx.h index 7bce135d5a4f..7bce135d5a4f 100644 --- a/tools/inc/tools/postx.h +++ b/include/postx.h diff --git a/tools/inc/tools/prex.h b/include/prex.h index e513880b0523..e513880b0523 100644 --- a/tools/inc/tools/prex.h +++ b/include/prex.h diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk index 6d6f402d3358..edecc9965d7b 100644 --- a/tools/Package_inc.mk +++ b/tools/Package_inc.mk @@ -52,9 +52,7 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/multisel.hxx,tools/multise $(eval $(call gb_Package_add_file,tools_inc,inc/tools/pathutils.hxx,tools/pathutils.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/poly.hxx,tools/poly.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/postsys.h,tools/postsys.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/postx.h,tools/postx.h)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/presys.h,tools/presys.h)) -$(eval $(call gb_Package_add_file,tools_inc,inc/tools/prex.h,tools/prex.h)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/pstm.hxx,tools/pstm.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/rc.h,tools/rc.h)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/rc.hxx,tools/rc.hxx)) diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index 2326f8f767d2..d306a3cd06df 100644 --- a/vcl/inc/unx/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -20,11 +20,11 @@ #ifndef _VCL_GTKDATA_HXX #define _VCL_GTKDATA_HXX -#include <tools/prex.h> +#include <prex.h> #include <gdk/gdk.h> #include <gdk/gdkx.h> #include <gtk/gtk.h> -#include <tools/postx.h> +#include <postx.h> #include <generic/gendata.hxx> #include <unx/saldisp.hxx> diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 210053883ecb..c3ea91939ae1 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -20,7 +20,7 @@ #ifndef _VCL_GTKFRAME_HXX #define _VCL_GTKFRAME_HXX -#include <tools/prex.h> +#include <prex.h> #include <cairo.h> #include <gdk/gdk.h> #include <gdk/gdkx.h> @@ -29,7 +29,7 @@ # include <gtk/gtkx.h> #endif #include <gdk/gdkkeysyms.h> -#include <tools/postx.h> +#include <postx.h> #include <salframe.hxx> #include <vcl/sysdata.hxx> diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index 0edab313bd6a..d41713afdaf2 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -20,11 +20,11 @@ #ifndef _VCL_GTKGDI_HXX #define _VCL_GTKGDI_HXX -#include <tools/prex.h> +#include <prex.h> #include <gtk/gtk.h> #include <gdk/gdkx.h> #include <gdk/gdkkeysyms.h> -#include <tools/postx.h> +#include <postx.h> #include <unx/salgdi.h> diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h index 0056776ce96c..0fc98843bc7f 100644 --- a/vcl/inc/unx/salbmp.h +++ b/vcl/inc/unx/salbmp.h @@ -20,8 +20,8 @@ #ifndef _SV_SALBMP_H #define _SV_SALBMP_H -#include <tools/prex.h> -#include <tools/postx.h> +#include <prex.h> +#include <postx.h> #ifndef _SV_SALGTYPE #include <vcl/salgtype.hxx> #endif diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx index ef825f1e6516..f0e0bb6eef39 100644 --- a/vcl/inc/unx/saldata.hxx +++ b/vcl/inc/unx/saldata.hxx @@ -20,8 +20,8 @@ #ifndef _SV_SALDATA_HXX #define _SV_SALDATA_HXX -#include <tools/prex.h> -#include <tools/postx.h> +#include <prex.h> +#include <postx.h> #include <unx/salunx.h> #include <vcl/salgtype.hxx> diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index e0ac0431d07a..1a58b904b00a 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -19,8 +19,8 @@ #ifndef _SV_SALFRAME_H #define _SV_SALFRAME_H -#include <tools/prex.h> -#include <tools/postx.h> +#include <prex.h> +#include <postx.h> #include <unx/salunx.h> #include <unx/saltype.h> diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 4b2fc3b3f7d2..84834e39b3d7 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -20,8 +20,8 @@ #ifndef _SV_SALGDI_H #define _SV_SALGDI_H -#include <tools/prex.h> -#include <tools/postx.h> +#include <prex.h> +#include <postx.h> #include <tools/fract.hxx> #include "vcl/salgtype.hxx" diff --git a/vcl/inc/unx/salunx.h b/vcl/inc/unx/salunx.h index 819f4f7b139a..0606736c170b 100644 --- a/vcl/inc/unx/salunx.h +++ b/vcl/inc/unx/salunx.h @@ -20,8 +20,8 @@ #ifndef _SALUNX_H #define _SALUNX_H -#include <tools/prex.h> -#include <tools/postx.h> +#include <prex.h> +#include <postx.h> #include "unx/salunxtime.h" diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h index 4f333746b46c..f50cdd1516d1 100644 --- a/vcl/inc/unx/salvd.h +++ b/vcl/inc/unx/salvd.h @@ -20,8 +20,8 @@ #ifndef _SV_SALVD_H #define _SV_SALVD_H -#include <tools/prex.h> -#include <tools/postx.h> +#include <prex.h> +#include <postx.h> #include <unx/saltype.h> #include <salvd.hxx> diff --git a/vcl/inc/unx/svsys.h b/vcl/inc/unx/svsys.h index 7bee8296cc0b..40ad3e04e3d6 100644 --- a/vcl/inc/unx/svsys.h +++ b/vcl/inc/unx/svsys.h @@ -19,8 +19,8 @@ #ifndef _SV_SVSYS_H #define _SV_SVSYS_H -#include <tools/prex.h> -#include <tools/postx.h> +#include <prex.h> +#include <postx.h> #endif // _SV_SVSYS_H diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx index 99c4335dfde9..29755806d9ce 100644 --- a/vcl/inc/unx/wmadaptor.hxx +++ b/vcl/inc/unx/wmadaptor.hxx @@ -23,9 +23,9 @@ #include <tools/string.hxx> #include <tools/gen.hxx> #ifndef _PREX_H -#include <tools/prex.h> +#include <prex.h> #include <X11/Xlib.h> -#include <tools/postx.h> +#include <postx.h> #endif #include <vclpluginapi.h> #include <vector> diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index d29b43dd74d8..1d1a7f6d596b 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -24,10 +24,10 @@ #include <sal/alloca.h> #include <osl/thread.h> -#include <tools/prex.h> +#include <prex.h> #include <X11/Xlocale.h> #include <X11/Xlib.h> -#include <tools/postx.h> +#include <postx.h> #include "vcl/cmdevt.hxx" #include "unx/salunx.h" diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index 54a0ae670258..7fa4e0392963 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -23,10 +23,10 @@ #include <sal/alloca.h> #include <osl/thread.h> -#include <tools/prex.h> +#include <prex.h> #include <X11/Xlocale.h> #include <X11/Xlib.h> -#include <tools/postx.h> +#include <postx.h> #include <unx/salunx.h> #include <unx/XIM.h> diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx index 0ba5fc14b54e..d8377b9e5c32 100644 --- a/vcl/unx/generic/app/i18n_im.cxx +++ b/vcl/unx/generic/app/i18n_im.cxx @@ -28,11 +28,11 @@ #endif #include <poll.h> -#include <tools/prex.h> +#include <prex.h> #include <X11/Xlocale.h> #include <X11/Xlib.h> #include <unx/XIM.h> -#include <tools/postx.h> +#include <postx.h> #include "unx/salunx.h" #include "unx/saldisp.hxx" diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index 5d7e7f20ea4b..2b2725e6ab39 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -23,10 +23,10 @@ #endif #include <sal/alloca.h> -#include <tools/prex.h> +#include <prex.h> #include <X11/Xlib.h> #include <unx/XIM.h> -#include <tools/postx.h> +#include <postx.h> #include <unx/salunx.h> #include <unx/i18n_status.hxx> diff --git a/vcl/unx/generic/app/randrwrapper.cxx b/vcl/unx/generic/app/randrwrapper.cxx index d6667a608007..0c703a612c91 100644 --- a/vcl/unx/generic/app/randrwrapper.cxx +++ b/vcl/unx/generic/app/randrwrapper.cxx @@ -19,9 +19,9 @@ #ifdef USE_RANDR -#include <tools/prex.h> +#include <prex.h> #include <X11/extensions/Xrandr.h> -#include <tools/postx.h> +#include <postx.h> #include "osl/module.h" #include "rtl/ustring.hxx" diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx index 541621106f8c..3d91586726f4 100644 --- a/vcl/unx/generic/app/saldata.cxx +++ b/vcl/unx/generic/app/saldata.cxx @@ -39,9 +39,9 @@ #include <sys/time.h> #endif -#include <tools/prex.h> +#include <prex.h> #include <X11/Xproto.h> -#include <tools/postx.h> +#include <postx.h> #include <osl/process.h> #include <osl/mutex.hxx> diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 6867f4da1730..90935aacfc19 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -31,7 +31,7 @@ #include <osl/module.h> #endif -#include <tools/prex.h> +#include <prex.h> #include <X11/cursorfont.h> #include "unx/x11_cursors/salcursors.h" #include "unx/x11_cursors/invert50.h" @@ -54,7 +54,7 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*); #endif #endif -#include <tools/postx.h> +#include <postx.h> #include <vcl/svapp.hxx> #include <unx/salunx.h> diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx index cfa587ec7f57..bc5c0e70368e 100644 --- a/vcl/unx/generic/app/sm.cxx +++ b/vcl/unx/generic/app/sm.cxx @@ -34,9 +34,9 @@ #include <osl/security.h> #include <osl/conditn.h> -#include <tools/prex.h> +#include <prex.h> #include <X11/Xatom.h> -#include <tools/postx.h> +#include <postx.h> #include <unx/sm.hxx> #include <unx/saldata.hxx> diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index c5fa4bc0540c..86dcf8d7ef66 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -37,11 +37,11 @@ #include "salgdi.hxx" -#include "tools/prex.h" +#include <prex.h> #include <X11/X.h> #include <X11/Xatom.h> #include <X11/Xresource.h> -#include "tools/postx.h" +#include <postx.h> namespace vcl_sal { diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx index c4a774fd987e..f1d6c2626caf 100644 --- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx +++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx @@ -18,9 +18,9 @@ */ -#include <tools/prex.h> +#include <prex.h> #include <X11/Xatom.h> -#include <tools/postx.h> +#include <postx.h> #include <unx/desktops.hxx> diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.hxx b/vcl/unx/generic/dtrans/X11_dndcontext.hxx index ae57524dd13e..09a7d200e4b8 100644 --- a/vcl/unx/generic/dtrans/X11_dndcontext.hxx +++ b/vcl/unx/generic/dtrans/X11_dndcontext.hxx @@ -25,9 +25,9 @@ #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp> #include <cppuhelper/implbase1.hxx> -#include "tools/prex.h" +#include <prex.h> #include <X11/Xlib.h> -#include "tools/postx.h" +#include <postx.h> using namespace com::sun::star::uno; diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 90e14923b31f..db951bb7d0aa 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -26,11 +26,11 @@ #include <string.h> #include <sys/time.h> -#include "tools/prex.h" +#include <prex.h> #include <X11/Xatom.h> #include <X11/keysym.h> #include <X11/Xutil.h> -#include "tools/postx.h" +#include <postx.h> #if defined(LINUX) || defined(NETBSD) || defined (FREEBSD) || defined(OPENBSD) #include <sys/poll.h> #else diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index 5e6d45e1342c..f6982e7f510c 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -37,9 +37,9 @@ #include <boost/unordered_map.hpp> #include <list> -#include "tools/prex.h" +#include <prex.h> #include <X11/Xlib.h> -#include "tools/postx.h" +#include <postx.h> #define XDND_IMPLEMENTATION_NAME "com.sun.star.datatransfer.dnd.XdndSupport" #define XDND_DROPTARGET_IMPLEMENTATION_NAME "com.sun.star.datatransfer.dnd.XdndDropTarget" diff --git a/vcl/unx/generic/dtrans/bmp.hxx b/vcl/unx/generic/dtrans/bmp.hxx index cc474ec550c9..13d159ee37f3 100644 --- a/vcl/unx/generic/dtrans/bmp.hxx +++ b/vcl/unx/generic/dtrans/bmp.hxx @@ -20,12 +20,12 @@ #ifndef _DTRANS_BMP_HXX_ #define _DTRANS_BMP_HXX_ -#include "tools/prex.h" +#include <prex.h> #include <X11/Xatom.h> #include <X11/keysym.h> #include <X11/Xlib.h> #include <X11/Xutil.h> -#include "tools/postx.h" +#include <postx.h> #include <sal/types.h> #include <com/sun/star/awt/XBitmap.hpp> diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index 43a8b3efaa76..9c9bdd164fb2 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -26,9 +26,9 @@ #include <sys/types.h> #endif -#include <tools/prex.h> +#include <prex.h> #include <X11/Xproto.h> -#include <tools/postx.h> +#include <postx.h> #include <osl/endian.h> diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index 64df691c733c..2098457b9e1e 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -23,9 +23,9 @@ #include <queue> #include <set> -#include <tools/prex.h> +#include <prex.h> #include <X11/Xproto.h> -#include <tools/postx.h> +#include <postx.h> #include "tools/debug.hxx" diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx index 6304ca673a67..96d8ed6db943 100644 --- a/vcl/unx/generic/gdi/salvd.cxx +++ b/vcl/unx/generic/gdi/salvd.cxx @@ -20,9 +20,9 @@ #include <vcl/sysdata.hxx> -#include <tools/prex.h> +#include <prex.h> #include <X11/extensions/Xrender.h> -#include <tools/postx.h> +#include <postx.h> #include <unx/salunx.h> #include <unx/saldata.hxx> diff --git a/vcl/unx/generic/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx index 51e5267faa00..e1fb1c231f46 100644 --- a/vcl/unx/generic/gdi/xrender_peer.hxx +++ b/vcl/unx/generic/gdi/xrender_peer.hxx @@ -20,10 +20,10 @@ #ifndef _SV_XRENDER_PEER_HXX #define _SV_XRENDER_PEER_HXX -#include <tools/prex.h> +#include <prex.h> struct _XTrap; // on some older systems this is not declared within Xrender.h #include <X11/extensions/Xrender.h> -#include <tools/postx.h> +#include <postx.h> #include <vcl/salgtype.hxx> #include <osl/module.h> diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 294a39258f1e..374fce0301ec 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -35,7 +35,7 @@ #include "vcl/printerinfomanager.hxx" #include "vcl/settings.hxx" -#include <tools/prex.h> +#include <prex.h> #include <X11/Xatom.h> #include <X11/keysym.h> #include "FWS.hxx" @@ -43,7 +43,7 @@ #if !defined(SOLARIS) && !defined(AIX) #include <X11/extensions/dpms.h> #endif -#include <tools/postx.h> +#include <postx.h> #include "unx/salunx.h" #include "unx/saldata.hxx" diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx index 983292984684..3026c5c8aae9 100644 --- a/vcl/unx/generic/window/salobj.cxx +++ b/vcl/unx/generic/window/salobj.cxx @@ -22,9 +22,9 @@ #include <stdio.h> #endif -#include <tools/prex.h> +#include <prex.h> #include <X11/extensions/shape.h> -#include <tools/postx.h> +#include <postx.h> #include <tools/debug.hxx> #include <vcl/keycodes.hxx> diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 5b039ffb0069..edb37a39388c 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -43,10 +43,10 @@ #endif #include <gtk/gtk.h> -#include <tools/prex.h> +#include <prex.h> #include <X11/Xatom.h> #include <gdk/gdkx.h> -#include <tools/postx.h> +#include <postx.h> #include <dlfcn.h> #include <vcl/salbtype.hxx> |