[ooo-build-commit] .: 2 commits - soldep/inc soltools/mkdepend soltools/testSHL

Petr Mladek pmladek at kemper.freedesktop.org
Tue Oct 5 10:12:00 PDT 2010


 soldep/inc/prodmap.hxx           |    2 --
 soldep/inc/soldep/connctr.hxx    |    2 --
 soldep/inc/soldep/depwin.hxx     |    2 --
 soldep/inc/soldep/objwin.hxx     |    2 --
 soldep/inc/soldep/prj.hxx        |    2 --
 soltools/testSHL/inc/tlog.hxx    |    2 --
 soltools/testSHL/testshl.cxx     |    4 ----
 soltools/testSHL/util/tstMgr.cxx |    4 ----
 8 files changed, 20 deletions(-)

New commits:
commit 9534d3b0399c7e7c543077e4f2b935e54b983253
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Oct 5 15:53:39 2010 +0200

    more removed include guards using fixguard.py

diff --git a/soldep/inc/prodmap.hxx b/soldep/inc/prodmap.hxx
index c7bdef7..ad54d8b 100644
--- a/soldep/inc/prodmap.hxx
+++ b/soldep/inc/prodmap.hxx
@@ -28,9 +28,7 @@
 #ifndef PRODUCT_MAPPER_HXX
 #define PRODUCT_MAPPER_HXX
 
-#ifndef _SSTRING_HXX
 #include <bootstrp/sstring.hxx>
-#endif
 
 class GenericInformation;
 class GenericInformationList;
diff --git a/soldep/inc/soldep/connctr.hxx b/soldep/inc/soldep/connctr.hxx
index 85c7c6d..f2e1d51 100644
--- a/soldep/inc/soldep/connctr.hxx
+++ b/soldep/inc/soldep/connctr.hxx
@@ -30,9 +30,7 @@
 #define _FMRWRK_CONNCTR_HXX
 
 
-#ifndef _SV_WINDOW_HXX
 #include <vcl/window.hxx>
-#endif
 #include <bootstrp/listmacr.hxx>
 #include <tools/stream.hxx>
 
diff --git a/soldep/inc/soldep/depwin.hxx b/soldep/inc/soldep/depwin.hxx
index e0d4594..77ec4bd 100644
--- a/soldep/inc/soldep/depwin.hxx
+++ b/soldep/inc/soldep/depwin.hxx
@@ -28,9 +28,7 @@
 #ifndef _FMRWRK_DEPWIN_HXX
 #define _FMRWRK_DEPWIN_HXX
 
-#ifndef _SV_WRKWIN_HXX
 #include <vcl/wrkwin.hxx>
-#endif
 #include <vcl/menu.hxx>
 #include <svtools/scrwin.hxx>
 #include <soldep/connctr.hxx>
diff --git a/soldep/inc/soldep/objwin.hxx b/soldep/inc/soldep/objwin.hxx
index 4e6b440..af25d15 100644
--- a/soldep/inc/soldep/objwin.hxx
+++ b/soldep/inc/soldep/objwin.hxx
@@ -28,9 +28,7 @@
 #ifndef _FMRWRK_OBJWIN_HXX
 #define _FMRWRK_OBJWIN_HXX
 
-#ifndef _SV_WINDOW_HXX
 #include <vcl/window.hxx>
-#endif
 #include <vcl/menu.hxx>
 #include <vcl/timer.hxx>
 #include <bootstrp/listmacr.hxx>
diff --git a/soldep/inc/soldep/prj.hxx b/soldep/inc/soldep/prj.hxx
index 3b372aa..d9c2508 100644
--- a/soldep/inc/soldep/prj.hxx
+++ b/soldep/inc/soldep/prj.hxx
@@ -30,9 +30,7 @@
 
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
-#ifndef _LISTMACR_HXX
 #include <bootstrp/listmacr.hxx>
-#endif
 #include <vos/mutex.hxx>
 #include <tools/string.hxx>
 
diff --git a/soltools/testSHL/inc/tlog.hxx b/soltools/testSHL/inc/tlog.hxx
index d78f957..02a580e 100644
--- a/soltools/testSHL/inc/tlog.hxx
+++ b/soltools/testSHL/inc/tlog.hxx
@@ -30,9 +30,7 @@
 #include    <osl/file.hxx>
 #include <rtl/tres.hxx>
 
-#ifndef _SOLTOOLS_TESTSHL_TUTIL_HXX_
 #include "tutil.hxx"
-#endif
 
 #include <iostream>
 
commit 7b3099f6e86313903b0850c8a496eca6f3d57df4
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Oct 4 16:58:10 2010 +0200

    remove include guards using fixguard.py

diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx
old mode 100755
new mode 100644
diff --git a/soltools/testSHL/testshl.cxx b/soltools/testSHL/testshl.cxx
index 868f2d6..8c2a642 100644
--- a/soltools/testSHL/testshl.cxx
+++ b/soltools/testSHL/testshl.cxx
@@ -30,13 +30,9 @@
 
 #include <stdio.h>
 
-#ifndef _SOLTOOLS_TESTSHL_TLOG_HXX_
 #include "inc/tlog.hxx"
-#endif
 
-#ifndef _SOLTOOLS_TESTSHL_TSTMGR_HXX_
 #include "inc/tstMgr.hxx"
-#endif
 
 using namespace tstutl;
 
diff --git a/soltools/testSHL/util/tstMgr.cxx b/soltools/testSHL/util/tstMgr.cxx
index b074a5f..f67b3a1 100644
--- a/soltools/testSHL/util/tstMgr.cxx
+++ b/soltools/testSHL/util/tstMgr.cxx
@@ -31,13 +31,9 @@
 #include <osl/module.hxx>
 #include <rtl/tres.hxx>
 
-#ifndef _SOLTOOLS_TESTSHL_TLOG_HXX_
 #include "tlog.hxx"
-#endif
 
-#ifndef _SOLTOOLS_TESTSHL_TUTIL_HXX_
 #include "tutil.hxx"
-#endif
 
 using namespace rtl;
 


More information about the ooo-build-commit mailing list