From 028b4003986f9cff3274707eebd14ee9099bf87b Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.cz>
Date: Mon, 4 Oct 2010 16:59:51 +0200
Subject: remove include guards using fixguard.py

---
 vcl/unx/kde/kdedata.cxx              | 2 --
 vcl/unx/kde/salnativewidgets-kde.cxx | 4 ----
 vcl/unx/source/app/i18n_cb.cxx       | 2 --
 vcl/unx/source/app/i18n_ic.cxx       | 4 ----
 vcl/unx/source/app/saldata.cxx       | 4 ----
 vcl/unx/source/app/saldisp.cxx       | 2 --
 vcl/unx/source/app/soicon.cxx        | 2 --
 vcl/unx/source/gdi/xlfd_extd.cxx     | 2 --
 vcl/unx/source/window/salobj.cxx     | 4 ----
 9 files changed, 26 deletions(-)

(limited to 'vcl/unx')

diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index 34b0ff652cde..56e3d505296c 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -54,9 +54,7 @@
 #include "i18n_im.hxx"
 #include "i18n_xkb.hxx"
 #include <vos/process.hxx>
-#ifndef _VOS_MUTEX_HXX
 #include <vos/mutex.hxx>
-#endif
 
 /* #i59042# override KApplications method for session management
  * since it will interfere badly with our own.
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 7e07ca6e8d4d..e2494d2c55ce 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -35,13 +35,9 @@
 #include <saldata.hxx>
 #include <saldisp.hxx>
 
-#ifndef _SV_SALGDI_HXX
 #include <salgdi.h>
-#endif
 
-#ifndef _SV_SALGDI_HXX
 #include <salframe.h>
-#endif
 #include <vcl/settings.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <plugins/kde/kdedata.hxx>
diff --git a/vcl/unx/source/app/i18n_cb.cxx b/vcl/unx/source/app/i18n_cb.cxx
index d3a4f2b819ae..ca2de1da8ecf 100644
--- a/vcl/unx/source/app/i18n_cb.cxx
+++ b/vcl/unx/source/app/i18n_cb.cxx
@@ -42,9 +42,7 @@
 #include <i18n_status.hxx>
 #include "i18n_ic.hxx"
 #include "i18n_im.hxx"
-#ifndef _OSL_THREAD_H
 #include <osl/thread.h>
-#endif
 #include <vcl/salframe.hxx>
 
 // -------------------------------------------------------------------------
diff --git a/vcl/unx/source/app/i18n_ic.cxx b/vcl/unx/source/app/i18n_ic.cxx
index 3064be9367e1..ef71e6520940 100644
--- a/vcl/unx/source/app/i18n_ic.cxx
+++ b/vcl/unx/source/app/i18n_ic.cxx
@@ -43,15 +43,11 @@
 #include <i18n_im.hxx>
 #include <i18n_status.hxx>
 
-#ifndef _SV_SALFRAME_HXX
 #include <salframe.h>
-#endif
 #include <saldata.hxx>
 #include <saldisp.hxx>
 
-#ifndef _OSL_THREAD_H
 #include <osl/thread.h>
-#endif
 
 using namespace vcl;
 
diff --git a/vcl/unx/source/app/saldata.cxx b/vcl/unx/source/app/saldata.cxx
index 50ef71df8619..8202a8804b68 100644
--- a/vcl/unx/source/app/saldata.cxx
+++ b/vcl/unx/source/app/saldata.cxx
@@ -57,9 +57,7 @@
 #include <unistd.h>
 #endif
 #include <vos/process.hxx>
-#ifndef _VOS_MUTEX_HXX
 #include <vos/mutex.hxx>
-#endif
 
 #include "Xproto.h"
 #include <saldisp.hxx>
@@ -70,9 +68,7 @@
 #include <osl/thread.h>
 #include <osl/process.h>
 #include <rtl/strbuf.hxx>
-#ifndef _RTL_BOOTSTRAP_HXX
 #include <rtl/bootstrap.hxx>
-#endif
 
 #include <tools/debug.hxx>
 #include <sm.hxx>
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx
index 19417c83cb91..f81f25673995 100644
--- a/vcl/unx/source/app/saldisp.cxx
+++ b/vcl/unx/source/app/saldisp.cxx
@@ -87,9 +87,7 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*);
 #include <vcl/keycodes.hxx>
 #include <vcl/salbtype.hxx>
 #include <salbmp.h>
-#ifndef _OSL_THREADMUTEX_H_
 #include <osl/mutex.h>
-#endif
 #include <salobj.h>
 #include <sm.hxx>
 #include <wmadaptor.hxx>
diff --git a/vcl/unx/source/app/soicon.cxx b/vcl/unx/source/app/soicon.cxx
index 2bf9e55731d1..b6dbb0db0252 100644
--- a/vcl/unx/source/app/soicon.cxx
+++ b/vcl/unx/source/app/soicon.cxx
@@ -34,9 +34,7 @@
 #include <vcl/salbtype.hxx>
 #include <vcl/impbmp.hxx>
 #include <vcl/bitmap.hxx>
-#ifndef _SV_BITMAP_HXX
 #include <vcl/bitmapex.hxx>
-#endif
 #include <vcl/graph.hxx>
 #include <soicon.hxx>
 #include <vcl/svdata.hxx>
diff --git a/vcl/unx/source/gdi/xlfd_extd.cxx b/vcl/unx/source/gdi/xlfd_extd.cxx
index 73731eddf115..f0af21a4c42d 100644
--- a/vcl/unx/source/gdi/xlfd_extd.cxx
+++ b/vcl/unx/source/gdi/xlfd_extd.cxx
@@ -36,9 +36,7 @@
 #include <vcl/outfont.hxx>
 #include <rtl/alloc.h>
 
-#ifndef _RTL_TENCINFO_H_
 #include <rtl/tencinfo.h>
-#endif
 
 #include <set>
 
diff --git a/vcl/unx/source/window/salobj.cxx b/vcl/unx/source/window/salobj.cxx
index 647b95ae032c..7cae2d3b7d34 100644
--- a/vcl/unx/source/window/salobj.cxx
+++ b/vcl/unx/source/window/salobj.cxx
@@ -36,13 +36,9 @@
 #include <salunx.h>
 #include <salstd.hxx>
 #include <saldata.hxx>
-#ifndef _SV_SALINST_HXX
 #include <salinst.h>
-#endif
 #include <saldisp.hxx>
-#ifndef _SV_SALFRAME_HXX
 #include <salframe.h>
-#endif
 #include <salobj.h>
 #include <vcl/salwtype.hxx>
 #include <vcl/keycodes.hxx>
-- 
cgit