[Libreoffice-commits] core.git: canvas/source include/postx.h include/prex.h tools/inc tools/Package_inc.mk vcl/inc vcl/unx
Tor Lillqvist
tml at iki.fi
Tue Apr 16 13:13:12 PDT 2013
canvas/source/cairo/cairo_xlib_cairo.cxx | 4 -
include/postx.h | 65 ++++++++++++++++++++++
include/prex.h | 60 ++++++++++++++++++++
tools/Package_inc.mk | 2
tools/inc/tools/postx.h | 65 ----------------------
tools/inc/tools/prex.h | 60 --------------------
vcl/inc/unx/gtk/gtkdata.hxx | 4 -
vcl/inc/unx/gtk/gtkframe.hxx | 4 -
vcl/inc/unx/gtk/gtkgdi.hxx | 4 -
vcl/inc/unx/salbmp.h | 4 -
vcl/inc/unx/saldata.hxx | 4 -
vcl/inc/unx/salframe.h | 4 -
vcl/inc/unx/salgdi.h | 4 -
vcl/inc/unx/salunx.h | 4 -
vcl/inc/unx/salvd.h | 4 -
vcl/inc/unx/svsys.h | 4 -
vcl/inc/unx/wmadaptor.hxx | 4 -
vcl/unx/generic/app/i18n_cb.cxx | 4 -
vcl/unx/generic/app/i18n_ic.cxx | 4 -
vcl/unx/generic/app/i18n_im.cxx | 4 -
vcl/unx/generic/app/i18n_status.cxx | 4 -
vcl/unx/generic/app/randrwrapper.cxx | 4 -
vcl/unx/generic/app/saldata.cxx | 4 -
vcl/unx/generic/app/saldisp.cxx | 4 -
vcl/unx/generic/app/sm.cxx | 4 -
vcl/unx/generic/app/wmadaptor.cxx | 4 -
vcl/unx/generic/desktopdetect/desktopdetector.cxx | 4 -
vcl/unx/generic/dtrans/X11_dndcontext.hxx | 4 -
vcl/unx/generic/dtrans/X11_selection.cxx | 4 -
vcl/unx/generic/dtrans/X11_selection.hxx | 4 -
vcl/unx/generic/dtrans/bmp.hxx | 4 -
vcl/unx/generic/gdi/salbmp.cxx | 4 -
vcl/unx/generic/gdi/salgdi.cxx | 4 -
vcl/unx/generic/gdi/salvd.cxx | 4 -
vcl/unx/generic/gdi/xrender_peer.hxx | 4 -
vcl/unx/generic/window/salframe.cxx | 4 -
vcl/unx/generic/window/salobj.cxx | 4 -
vcl/unx/gtk/window/gtkframe.cxx | 4 -
38 files changed, 191 insertions(+), 193 deletions(-)
New commits:
commit 70b45b2f55174bbdbf254f3efa755ffddb3d2721
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Apr 16 23:11:22 2013 +0300
Move {pre,post}x.h to where {pre,post}mac.h and {pre,post}win.h are
Change-Id: I561aa6cc1de7ed6128d25c82cd493d5d5718e052
diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx b/canvas/source/cairo/cairo_xlib_cairo.cxx
index 3086fd5..8b26292 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/include/postx.h b/include/postx.h
new file mode 100644
index 0000000..7bce135
--- /dev/null
+++ b/include/postx.h
@@ -0,0 +1,65 @@
+/* -*- 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 _POSTX_H
+#define _POSTX_H
+
+#if defined __cplusplus
+}
+#endif
+
+/* X Types */
+#undef Window
+#undef BYTE
+#undef INT8
+#undef INT64
+#undef BOOL
+#undef Font
+#undef Cursor
+#undef String
+#undef KeyCode
+#undef Region
+#undef Icon
+#undef Time
+#undef Boolean
+
+#undef Min
+#undef Max
+#undef DestroyAll
+#undef Success
+
+#undef Printer
+#undef Orientation
+
+#undef GetToken
+#undef ReleaseToken
+#undef InitializeToken
+#undef NextRequest
+
+#ifdef KeyPress
+#if KeyPress != 2
+Error KeyPress must be Equal 2
+#endif
+#undef KeyPress
+#endif
+#define XLIB_KeyPress 2
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/prex.h b/include/prex.h
new file mode 100644
index 0000000..e513880
--- /dev/null
+++ b/include/prex.h
@@ -0,0 +1,60 @@
+/* -*- 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 _PREX_H
+#define _PREX_H
+
+/* Types from <X11/X.h> that clash with LO's identifiers
+ * and we don't need.
+ */
+#define Boolean HIDE_XLIB_Boolean
+#define Font HIDE_XLIB_Font
+#define Icon HIDE_XLIB_Icon
+#define String HIDE_XLIB_String
+
+/* Types from <X11/X.h> that clash, but we do use. */
+#define Cursor XLIB_Cursor
+#define KeyCode XLIB_KeyCode
+#define Region XLIB_Region
+#define Time XLIB_Time
+#define Window XLIB_Window
+
+#if defined __cplusplus
+extern "C" {
+#endif
+
+#include <X11/X.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/StringDefs.h>
+#include <X11/extensions/Xrender.h>
+#include <X11/XKBlib.h>
+
+/* From <X11/Intrinsic.h> */
+typedef unsigned long Pixel;
+
+#undef String
+#define String XLIB_String
+
+#undef KeyCode
+#define KeyCode XLIB_KeyCode //undef in intrinsics
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk
index 6d6f402..edecc99 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/tools/inc/tools/postx.h b/tools/inc/tools/postx.h
deleted file mode 100644
index 7bce135..0000000
--- a/tools/inc/tools/postx.h
+++ /dev/null
@@ -1,65 +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 _POSTX_H
-#define _POSTX_H
-
-#if defined __cplusplus
-}
-#endif
-
-/* X Types */
-#undef Window
-#undef BYTE
-#undef INT8
-#undef INT64
-#undef BOOL
-#undef Font
-#undef Cursor
-#undef String
-#undef KeyCode
-#undef Region
-#undef Icon
-#undef Time
-#undef Boolean
-
-#undef Min
-#undef Max
-#undef DestroyAll
-#undef Success
-
-#undef Printer
-#undef Orientation
-
-#undef GetToken
-#undef ReleaseToken
-#undef InitializeToken
-#undef NextRequest
-
-#ifdef KeyPress
-#if KeyPress != 2
-Error KeyPress must be Equal 2
-#endif
-#undef KeyPress
-#endif
-#define XLIB_KeyPress 2
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/inc/tools/prex.h b/tools/inc/tools/prex.h
deleted file mode 100644
index e513880..0000000
--- a/tools/inc/tools/prex.h
+++ /dev/null
@@ -1,60 +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 _PREX_H
-#define _PREX_H
-
-/* Types from <X11/X.h> that clash with LO's identifiers
- * and we don't need.
- */
-#define Boolean HIDE_XLIB_Boolean
-#define Font HIDE_XLIB_Font
-#define Icon HIDE_XLIB_Icon
-#define String HIDE_XLIB_String
-
-/* Types from <X11/X.h> that clash, but we do use. */
-#define Cursor XLIB_Cursor
-#define KeyCode XLIB_KeyCode
-#define Region XLIB_Region
-#define Time XLIB_Time
-#define Window XLIB_Window
-
-#if defined __cplusplus
-extern "C" {
-#endif
-
-#include <X11/X.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/StringDefs.h>
-#include <X11/extensions/Xrender.h>
-#include <X11/XKBlib.h>
-
-/* From <X11/Intrinsic.h> */
-typedef unsigned long Pixel;
-
-#undef String
-#define String XLIB_String
-
-#undef KeyCode
-#define KeyCode XLIB_KeyCode //undef in intrinsics
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 2326f8f..d306a3c 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 2100538..c3ea919 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 0edab31..d41713a 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 0056776..0fc9884 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 ef825f1..f0e0bb6 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 e0ac043..1a58b904 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 4b2fc3b..84834e3 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 819f4f7..0606736 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 4f33374..f50cdd1 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 7bee829..40ad3e0 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 99c4335..2975580 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 d29b43d..1d1a7f6 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 54a0ae6..7fa4e03 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 0ba5fc14..d8377b9 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 5d7e7f2..2b2725e 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 d6667a6..0c703a6 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 5416211..3d91586 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 6867f4d..90935aa 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 cfa587e..bc5c0e7 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 c5fa4bc..86dcf8d 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 c4a774f..f1d6c26 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 ae57524..09a7d20 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 90e1492..db951bb 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 5e6d45e..f6982e7 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 cc474ec..13d159e 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 43a8b3e..9c9bdd1 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 64df691..2098457 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 6304ca6..96d8ed6 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 51e5267..e1fb1c2 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 294a392..374fce0 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 9832929..3026c5c 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 5b039ff..edb37a3 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>
More information about the Libreoffice-commits
mailing list