vcl/inc/unx/Xproto.h seems pointless

Change-Id: I22405b5d3416be28e677d7a383e8101bd6f15559

4 files changed, 18 insertions, 54 deletions

diff --git a/vcl/inc/unx/Xproto.h b/vcl/inc/unx/Xproto.h
deleted file mode 100644
index 11e3ac736859..000000000000
--- a/vcl/inc/unx/Xproto.h
+++ /dev/null
@@ -1,43 +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_UNX_INC_XPROTO_H
-#define INCLUDED_VCL_UNX_INC_XPROTO_H
-
-#include "sal/config.h"
-
-#include <tools/prex.h>
-
-#if defined __GNUC__
-#pragma GCC system_header
-#elif defined __SUNPRO_CC
-#pragma disable_warn
-#endif
-
-#include <X11/Xproto.h>
-
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#endif
-
-#include <tools/postx.h>
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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