summaryrefslogtreecommitdiff
path: root/vcl/unx/generic
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-04-10 21:00:13 +0300
committerTor Lillqvist <tml@iki.fi>2013-04-10 21:00:44 +0300
commitd91b76bcc47a28825ae7e8fc3c1c5a93af20782b (patch)
tree7a37ae4e78d6d57fb558b0cec17630bb0204b5a6 /vcl/unx/generic
parent1382dad9d244bf437cd9cd181eb708bdaaca3539 (diff)
vcl/inc/unx/Xproto.h seems pointless
Change-Id: I22405b5d3416be28e677d7a383e8101bd6f15559
Diffstat (limited to 'vcl/unx/generic')
-rw-r--r--vcl/unx/generic/app/saldata.cxx5
-rw-r--r--vcl/unx/generic/gdi/salbmp.cxx7
-rw-r--r--vcl/unx/generic/gdi/salgdi.cxx17
3 files changed, 18 insertions, 11 deletions
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index 6202b34c077f..541621106f8c 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -39,10 +39,13 @@
#include <sys/time.h>
#endif
+#include <tools/prex.h>
+#include <X11/Xproto.h>
+#include <tools/postx.h>
+
#include <osl/process.h>
#include <osl/mutex.hxx>
-#include "unx/Xproto.h"
#include "unx/saldisp.hxx"
#include "unx/saldata.hxx"
#include "unx/salframe.h"
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index bf9a703d1beb..43a8b3efaa76 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -26,15 +26,16 @@
#include <sys/types.h>
#endif
+#include <tools/prex.h>
+#include <X11/Xproto.h>
+#include <tools/postx.h>
+
#include <osl/endian.h>
#include <vcl/bitmap.hxx>
#include <vcl/salbtype.hxx>
#include <com/sun/star/beans/XFastPropertySet.hpp>
-#include <tools/prex.h>
-#include "unx/Xproto.h"
-#include <tools/postx.h>
#include <unx/salunx.h>
#include <unx/saldata.hxx>
#include <unx/saldisp.hxx>
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 2464dd442207..64df691c733c 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -17,6 +17,16 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_graphite.h>
+
+#include <vector>
+#include <queue>
+#include <set>
+
+#include <tools/prex.h>
+#include <X11/Xproto.h>
+#include <tools/postx.h>
+
#include "tools/debug.hxx"
#include "basegfx/polygon/b2dpolygon.hxx"
@@ -32,7 +42,6 @@
#include "vcl/jobdata.hxx"
-#include "unx/Xproto.h"
#include "unx/salunx.h"
#include "unx/saldata.hxx"
#include "unx/saldisp.hxx"
@@ -45,12 +54,6 @@
#include "xrender_peer.hxx"
#include "region.h"
-#include <vector>
-#include <queue>
-#include <set>
-
-#include <config_graphite.h>
-
#define STATIC_POINTS 64
class SalPolyLine