Resolves fdo#70681: fixincludeguards.pl: all that's left

Change-Id: I3e51a62710bb46c8255fd228d41d9300c90a1fb5
Reviewed-on: https://gerrit.libreoffice.org/9360
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

10 files changed, 27 insertions, 27 deletions

diff --git a/sal/qa/OStringBuffer/rtl_String_Const.h b/sal/qa/OStringBuffer/rtl_String_Const.h
index 7cc383701954..b6b25113e797 100644
--- a/sal/qa/OStringBuffer/rtl_String_Const.h
+++ b/sal/qa/OStringBuffer/rtl_String_Const.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_STRING_CONST_H_
-#define _RTL_STRING_CONST_H_
+#ifndef INCLUDED_SAL_QA_OSTRINGBUFFER_RTL_STRING_CONST_H
+#define INCLUDED_SAL_QA_OSTRINGBUFFER_RTL_STRING_CONST_H
 
 #include <limits.h>
 #include <sal/types.h>
@@ -463,6 +463,6 @@ static const sal_Int32 kNonSInt16Max = SHRT_MIN;
 }
 #endif
 
-#endif /* _RTL_STRING_CONST_H_ */
+#endif // INCLUDED_SAL_QA_OSTRINGBUFFER_RTL_STRING_CONST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils_Const.h b/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
index 301c8a9f9b3c..fc258ead340f 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
+++ b/sal/qa/OStringBuffer/rtl_String_Utils_Const.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_STRING_UTILS_CONST_H_
-#define _RTL_STRING_UTILS_CONST_H_
+#ifndef INCLUDED_SAL_QA_OSTRINGBUFFER_RTL_STRING_UTILS_CONST_H
+#define INCLUDED_SAL_QA_OSTRINGBUFFER_RTL_STRING_UTILS_CONST_H
 
 #include <sal/types.h>
 
@@ -40,6 +40,6 @@ static const sal_Int32 kErrCompareNAStringToString     = -9;
 }
 #endif
 
-#endif /* _RTL_STRING_UTILS_CONST_H_ */
+#endif // INCLUDED_SAL_QA_OSTRINGBUFFER_RTL_STRING_UTILS_CONST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/inc/stringhelper.hxx b/sal/qa/inc/stringhelper.hxx
index 84eae3798bf1..cb7a0ab70c06 100644
--- a/sal/qa/inc/stringhelper.hxx
+++ b/sal/qa/inc/stringhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef STRINGHELPER_HXX
-#define STRINGHELPER_HXX
+#ifndef INCLUDED_SAL_QA_INC_STRINGHELPER_HXX
+#define INCLUDED_SAL_QA_INC_STRINGHELPER_HXX
 
 #include <rtl/ustring.hxx>
 #include <rtl/string.hxx>
diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h
index 88df6384f362..614d906023cc 100644
--- a/sal/qa/osl/condition/osl_Condition_Const.h
+++ b/sal/qa/osl/condition/osl_Condition_Const.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_CONDITION_CONST_H_
-#define _OSL_CONDITION_CONST_H_
+#ifndef INCLUDED_SAL_QA_OSL_CONDITION_OSL_CONDITION_CONST_H
+#define INCLUDED_SAL_QA_OSL_CONDITION_OSL_CONDITION_CONST_H
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
@@ -45,6 +45,6 @@ OSLTEST_DECLARE_USTRING( TestCon,  "testcondition" );
 
 const char pTestString[17] = "Sun Microsystems";
 
-#endif /* _OSL_CONDITION_CONST_H_ */
+#endif // INCLUDED_SAL_QA_OSL_CONDITION_OSL_CONDITION_CONST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h
index 6a27c86246b8..97db12bdd446 100644
--- a/sal/qa/osl/file/osl_File_Const.h
+++ b/sal/qa/osl/file/osl_File_Const.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_FILE_CONST_H_
-#define _OSL_FILE_CONST_H_
+#ifndef INCLUDED_SAL_QA_OSL_FILE_OSL_FILE_CONST_H
+#define INCLUDED_SAL_QA_OSL_FILE_OSL_FILE_CONST_H
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -197,6 +197,6 @@ OSLTEST_DECLARE( VolURL6,  FILE_PREFIX  "e:/" );
 }
 #endif
 
-#endif /* _OSL_FILE_CONST_H_ */
+#endif // INCLUDED_SAL_QA_OSL_FILE_OSL_FILE_CONST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/module/osl_Module_Const.h b/sal/qa/osl/module/osl_Module_Const.h
index f5417023b2a7..40b33218d047 100644
--- a/sal/qa/osl/module/osl_Module_Const.h
+++ b/sal/qa/osl/module/osl_Module_Const.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_MODULE_CONST_H_
-#define _OSL_MODULE_CONST_H_
+#ifndef INCLUDED_SAL_QA_OSL_MODULE_OSL_MODULE_CONST_H
+#define INCLUDED_SAL_QA_OSL_MODULE_OSL_MODULE_CONST_H
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
@@ -42,6 +42,6 @@
 
 typedef sal_Bool (* FuncPtr )( sal_Bool );
 
-#endif /* _OSL_MODULE_CONST_H_ */
+#endif // INCLUDED_SAL_QA_OSL_MODULE_OSL_MODULE_CONST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/mutex/osl_Mutex_Const.h b/sal/qa/osl/mutex/osl_Mutex_Const.h
index fb6bfaa5f1eb..a5ac53ed4564 100644
--- a/sal/qa/osl/mutex/osl_Mutex_Const.h
+++ b/sal/qa/osl/mutex/osl_Mutex_Const.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_MUTEX_CONST_H_
-#define _OSL_MUTEX_CONST_H_
+#ifndef INCLUDED_SAL_QA_OSL_MUTEX_OSL_MUTEX_CONST_H
+#define INCLUDED_SAL_QA_OSL_MUTEX_OSL_MUTEX_CONST_H
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
@@ -32,6 +32,6 @@
 
 #define BUFFER_SIZE 16
 
-#endif /* _OSL_MUTEX_CONST_H_ */
+#endif // INCLUDED_SAL_QA_OSL_MUTEX_OSL_MUTEX_CONST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h
index 17e8c1a33df7..1dfa2422e7cb 100644
--- a/sal/qa/osl/security/osl_Security_Const.h
+++ b/sal/qa/osl/security/osl_Security_Const.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OSL_SECURITY_CONST_H_
-#define _OSL_SECURITY_CONST_H_
+#ifndef INCLUDED_SAL_QA_OSL_SECURITY_OSL_SECURITY_CONST_H
+#define INCLUDED_SAL_QA_OSL_SECURITY_OSL_SECURITY_CONST_H
 
 #if ( defined WNT )                     // Windows
 #include <io.h>
@@ -53,6 +53,6 @@ const char pTestString[17] = "Sun Microsystems";
 
 bool isAdmin = sal_False;
 
-#endif /* _OSL_SECURITY_CONST_H_ */
+#endif // INCLUDED_SAL_QA_OSL_SECURITY_OSL_SECURITY_CONST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/socket/sockethelper.hxx b/sal/qa/osl/socket/sockethelper.hxx
index 1c43eaaf8a0f..4debc78d87f4 100644
--- a/sal/qa/osl/socket/sockethelper.hxx
+++ b/sal/qa/osl/socket/sockethelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SOCKETHELPER_HXX_
-#define _SOCKETHELPER_HXX_
+#ifndef INCLUDED_SAL_QA_OSL_SOCKET_SOCKETHELPER_HXX
+#define INCLUDED_SAL_QA_OSL_SOCKET_SOCKETHELPER_HXX
 
 #include <sal/types.h>
 #include <rtl/textenc.h>
diff --git a/sal/qa/rtl/process/rtl_Process_Const.h b/sal/qa/rtl/process/rtl_Process_Const.h
index 8abffb2d7a96..132cd567519b 100644
--- a/sal/qa/rtl/process/rtl_Process_Const.h
+++ b/sal/qa/rtl/process/rtl_Process_Const.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RTL_PROCESS_CONST_H_
-#define _RTL_PROCESS_CONST_H_
+#ifndef INCLUDED_SAL_QA_RTL_PROCESS_RTL_PROCESS_CONST_H
+#define INCLUDED_SAL_QA_RTL_PROCESS_RTL_PROCESS_CONST_H
 
 #include <rtl/ustring.hxx>