fixincludeguards.sh: connectivity

15 files changed, 43 insertions, 43 deletions

diff --git a/connectivity/source/drivers/kab/KCatalog.hxx b/connectivity/source/drivers/kab/KCatalog.hxx
index 9ef3b240be2f..9afa09c85dce 100644
--- a/connectivity/source/drivers/kab/KCatalog.hxx
+++ b/connectivity/source/drivers/kab/KCatalog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_KAB_CATALOG_HXX_
-#define _CONNECTIVITY_KAB_CATALOG_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KCATALOG_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KCATALOG_HXX
 
 #include "connectivity/sdbcx/VCatalog.hxx"
 
@@ -51,6 +51,6 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_KAB_CATALOG_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KCATALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/kab/KColumns.hxx b/connectivity/source/drivers/kab/KColumns.hxx
index 8879ba8fae0b..6e09b4b48093 100644
--- a/connectivity/source/drivers/kab/KColumns.hxx
+++ b/connectivity/source/drivers/kab/KColumns.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_KAB_COLUMNS_HXX_
-#define _CONNECTIVITY_KAB_COLUMNS_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KCOLUMNS_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KCOLUMNS_HXX
 
 #include "KTable.hxx"
 #include "connectivity/sdbcx/VCollection.hxx"
@@ -43,6 +43,6 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_KAB_COLUMNS_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KCOLUMNS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx
index 024c72eb95bc..cae5d3397a4b 100644
--- a/connectivity/source/drivers/kab/KConnection.hxx
+++ b/connectivity/source/drivers/kab/KConnection.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_KAB_CONNECTION_HXX_
-#define _CONNECTIVITY_KAB_CONNECTION_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KCONNECTION_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KCONNECTION_HXX
 
 #include <map>
 #include "connectivity/OSubComponent.hxx"
@@ -127,6 +127,6 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_KAB_CONNECTION_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KCONNECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/kab/KDEInit.h b/connectivity/source/drivers/kab/KDEInit.h
index 9be69bbfd774..d14447b34306 100644
--- a/connectivity/source/drivers/kab/KDEInit.h
+++ b/connectivity/source/drivers/kab/KDEInit.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_KAB_KDEINIT_H
-#define CONNECTIVITY_KAB_KDEINIT_H
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KDEINIT_H
+#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KDEINIT_H
 
 // the address book driver's version
 #define KAB_DRIVER_VERSION      "0.2"
@@ -48,6 +48,6 @@
 #endif // ENABLE_TDE
 
 
-#endif // CONNECTIVITY_KAB_KDEINIT_H
+#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KDEINIT_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
index fad3f827284e..33cad87d0c31 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_KAB_DATABASEMETADATA_HXX_
-#define _CONNECTIVITY_KAB_DATABASEMETADATA_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KDATABASEMETADATA_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KDATABASEMETADATA_HXX
 
 #include "KConnection.hxx"
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
@@ -200,6 +200,6 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_KAB_DATABASEMETADATA_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KDATABASEMETADATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx
index 249d8ff5c44b..4987ef7bc33d 100644
--- a/connectivity/source/drivers/kab/KDriver.hxx
+++ b/connectivity/source/drivers/kab/KDriver.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_KAB_DRIVER_HXX_
-#define _CONNECTIVITY_KAB_DRIVER_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KDRIVER_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KDRIVER_HXX
 
 #include <com/sun/star/sdbc/XDriver.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -211,6 +211,6 @@ namespace connectivity
 
 }
 
-#endif // _CONNECTIVITY_KAB_DRIVER_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KDRIVER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/kab/KPreparedStatement.hxx b/connectivity/source/drivers/kab/KPreparedStatement.hxx
index ee7427d37c3a..f55454fff06b 100644
--- a/connectivity/source/drivers/kab/KPreparedStatement.hxx
+++ b/connectivity/source/drivers/kab/KPreparedStatement.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_KAB_PREPAREDSTATEMENT_HXX_
-#define _CONNECTIVITY_KAB_PREPAREDSTATEMENT_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KPREPAREDSTATEMENT_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KPREPAREDSTATEMENT_HXX
 
 #include "KStatement.hxx"
 #include "KResultSetMetaData.hxx"
@@ -109,6 +109,6 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_KAB_PREPAREDSTATEMENT_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KPREPAREDSTATEMENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx
index 53cb50f93db7..6a41a30902d9 100644
--- a/connectivity/source/drivers/kab/KResultSet.hxx
+++ b/connectivity/source/drivers/kab/KResultSet.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_KAB_RESULTSET_HXX_
-#define _CONNECTIVITY_KAB_RESULTSET_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KRESULTSET_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KRESULTSET_HXX
 
 #include "KStatement.hxx"
 #include "KResultSetMetaData.hxx"
@@ -217,6 +217,6 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_KAB_RESULTSET_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KRESULTSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.hxx b/connectivity/source/drivers/kab/KResultSetMetaData.hxx
index f494fdf501e6..f1755d3dba54 100644
--- a/connectivity/source/drivers/kab/KResultSetMetaData.hxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_KAB_RESULTSETMETADATA_HXX_
-#define _CONNECTIVITY_KAB_RESULTSETMETADATA_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KRESULTSETMETADATA_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KRESULTSETMETADATA_HXX
 
 #include <connectivity/CommonTools.hxx>
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
@@ -79,6 +79,6 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_KAB_RESULTSETMETADATA_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KRESULTSETMETADATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx
index afc02518d401..b56c62720a2a 100644
--- a/connectivity/source/drivers/kab/KStatement.hxx
+++ b/connectivity/source/drivers/kab/KStatement.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_KAB_STATEMENT_HXX_
-#define _CONNECTIVITY_KAB_STATEMENT_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KSTATEMENT_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KSTATEMENT_HXX
 
 #include "KConnection.hxx"
 #include <list>
@@ -157,6 +157,6 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_KAB_STATEMENT_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KSTATEMENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/kab/KTable.hxx b/connectivity/source/drivers/kab/KTable.hxx
index 8864a2c1ec1d..2d0c64d4b61e 100644
--- a/connectivity/source/drivers/kab/KTable.hxx
+++ b/connectivity/source/drivers/kab/KTable.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_KAB_TABLE_HXX_
-#define _CONNECTIVITY_KAB_TABLE_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KTABLE_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KTABLE_HXX
 
 #include "KConnection.hxx"
 #include "connectivity/sdbcx/VTable.hxx"
@@ -56,6 +56,6 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_KAB_TABLE_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KTABLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/kab/KTables.hxx b/connectivity/source/drivers/kab/KTables.hxx
index ed9465971844..5dba33726a2a 100644
--- a/connectivity/source/drivers/kab/KTables.hxx
+++ b/connectivity/source/drivers/kab/KTables.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_KAB_TABLES_HXX_
-#define _CONNECTIVITY_KAB_TABLES_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KTABLES_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KTABLES_HXX
 
 #include "connectivity/sdbcx/VCollection.hxx"
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
@@ -50,6 +50,6 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_KAB_TABLES_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KTABLES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx
index 5b35bbc3d626..4bed162305d8 100644
--- a/connectivity/source/drivers/kab/kcondition.hxx
+++ b/connectivity/source/drivers/kab/kcondition.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_KAB_CONDITION_HXX_
-#define _CONNECTIVITY_KAB_CONDITION_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KCONDITION_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KCONDITION_HXX
 
 #include <comphelper/types.hxx>
 #include <shell/kde_headers.h>
@@ -149,6 +149,6 @@ class KabConditionAnd : public KabConditionBoolean
     }
 }
 
-#endif // _CONNECTIVITY_KAB_CONDITION_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KCONDITION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/kab/kfields.hxx b/connectivity/source/drivers/kab/kfields.hxx
index c50537959145..996c2a109e25 100644
--- a/connectivity/source/drivers/kab/kfields.hxx
+++ b/connectivity/source/drivers/kab/kfields.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_KAB_FIELDS_HXX_
-#define _CONNECTIVITY_KAB_FIELDS_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KFIELDS_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KFIELDS_HXX
 
 #include <shell/kde_headers.h>
 #include <connectivity/dbexception.hxx>
diff --git a/connectivity/source/drivers/kab/korder.hxx b/connectivity/source/drivers/kab/korder.hxx
index ba67d905b2e8..380c10bffee1 100644
--- a/connectivity/source/drivers/kab/korder.hxx
+++ b/connectivity/source/drivers/kab/korder.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_KAB_ORDER_HXX_
-#define _CONNECTIVITY_KAB_ORDER_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KORDER_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KORDER_HXX
 
 #include "rtl/ustring.hxx"
 #include <shell/kde_headers.h>