Use our header guard convention

Using identifiers starting with underscores is questionable even if they don't
happen to clash with anything used by the language implementation.

Change-Id: I0af605d40d85ea7e47e1047572fbe180270e08ac

8 files changed, 24 insertions, 24 deletions

diff --git a/winaccessibility/source/UAccCOM/AccAction.h b/winaccessibility/source/UAccCOM/AccAction.h
index 51a60f1fb99c..7a31fcb4cb12 100644
--- a/winaccessibility/source/UAccCOM/AccAction.h
+++ b/winaccessibility/source/UAccCOM/AccAction.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCACTION_H_
-#define __ACCACTION_H_
+#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCACTION_H
+#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCACTION_H
 
 #include "resource.h"       // main symbols
 #include "AccActionBase.h"
@@ -100,6 +100,6 @@ public:
 
 };
 
-#endif //__ACCACTION_H_
+#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCACTION_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/UAccCOM/AccRelation.h b/winaccessibility/source/UAccCOM/AccRelation.h
index 7783ba504936..10aa825bae7e 100644
--- a/winaccessibility/source/UAccCOM/AccRelation.h
+++ b/winaccessibility/source/UAccCOM/AccRelation.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCRELATION_H_
-#define __ACCRELATION_H_
+#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCRELATION_H
+#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCRELATION_H
 
 #include "resource.h"       // main symbols
 
@@ -83,6 +83,6 @@ private:
     com::sun::star::accessibility::AccessibleRelation relation;
 };
 
-#endif //__ACCRELATION_H_
+#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCRELATION_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/UAccCOM/AccTable.h b/winaccessibility/source/UAccCOM/AccTable.h
index ce956f62a541..689347a0a6fd 100644
--- a/winaccessibility/source/UAccCOM/AccTable.h
+++ b/winaccessibility/source/UAccCOM/AccTable.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCTABLE_H_
-#define __ACCTABLE_H_
+#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCTABLE_H
+#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCTABLE_H
 
 #include "resource.h"       // main symbols
 
@@ -169,6 +169,6 @@ private:
     }
 };
 
-#endif //__ACCTABLE_H_
+#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCTABLE_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/UAccCOM/AccessibleKeyStroke.h b/winaccessibility/source/UAccCOM/AccessibleKeyStroke.h
index e2cb07e6372a..1f32629b06d6 100644
--- a/winaccessibility/source/UAccCOM/AccessibleKeyStroke.h
+++ b/winaccessibility/source/UAccCOM/AccessibleKeyStroke.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ACCESSIBLEKEYSTROKE_H_
-#define __ACCESSIBLEKEYSTROKE_H_
+#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCESSIBLEKEYSTROKE_H
+#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCESSIBLEKEYSTROKE_H
 
 #pragma once
 
@@ -152,6 +152,6 @@ const short PROPERTIES = 17;
 const short FRONT = 18;
 
 
-#endif //#define __ACCESSIBLEKEYSTROKE_H_
+#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ACCESSIBLEKEYSTROKE_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/UAccCOM/CheckEnableAccessible.h b/winaccessibility/source/UAccCOM/CheckEnableAccessible.h
index 90099ace2138..8d324eed4073 100644
--- a/winaccessibility/source/UAccCOM/CheckEnableAccessible.h
+++ b/winaccessibility/source/UAccCOM/CheckEnableAccessible.h
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CHECKENABLEACCESSIBLE_HXX
-#define _CHECKENABLEACCESSIBLE_HXX
+#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_CHECKENABLEACCESSIBLE_H
+#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_CHECKENABLEACCESSIBLE_H
 
 inline bool IsEnableAccessibleInterface() { return true; }
 
 #define CHECK_ENABLE_INF if(!IsEnableAccessibleInterface()){ return S_FALSE; }
 #define CHECK_ENABLE_INF_ZERO if(!IsEnableAccessibleInterface()){ return 0; }
 
-#endif //_CHECKENABLEACCESSIBLE_HXX
+#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_CHECKENABLEACCESSIBLE_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/UAccCOM/EnumVariant.h b/winaccessibility/source/UAccCOM/EnumVariant.h
index 30c9e0a62738..c2c0f6b5234e 100644
--- a/winaccessibility/source/UAccCOM/EnumVariant.h
+++ b/winaccessibility/source/UAccCOM/EnumVariant.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __ENUMVARIANT_H_
-#define __ENUMVARIANT_H_
+#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ENUMVARIANT_H
+#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ENUMVARIANT_H
 
 #include "resource.h"       // main symbols
 #include <com/sun/star/accessibility/XAccessible.hpp>
@@ -94,6 +94,6 @@ private:
         m_pXAccessibleSelection;
 };
 
-#endif //__ENUMVARIANT_H_
+#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_ENUMVARIANT_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/UAccCOM/MAccessible.h b/winaccessibility/source/UAccCOM/MAccessible.h
index 7262cb39b7af..cdeee228cab4 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.h
+++ b/winaccessibility/source/UAccCOM/MAccessible.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __MACCESSIBLE_H_
-#define __MACCESSIBLE_H_
+#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_MACCESSIBLE_H
+#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_MACCESSIBLE_H
 
 #include <windows.h>
 #include "resource.h"       // main symbols
@@ -294,6 +294,6 @@ public:
 
 
 
-#endif //__MACCESSIBLE_H_
+#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_MACCESSIBLE_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/UAccCOM/UNOXWrapper.h b/winaccessibility/source/UAccCOM/UNOXWrapper.h
index 4dd7a07c2dbc..6d22b31de5c4 100644
--- a/winaccessibility/source/UAccCOM/UNOXWrapper.h
+++ b/winaccessibility/source/UAccCOM/UNOXWrapper.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __UNOXWRAPPER_H_
-#define __UNOXWRAPPER_H_
+#ifndef INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_UNOXWRAPPER_H
+#define INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_UNOXWRAPPER_H
 
 #include "resource.h"       // main symbols
 
@@ -65,6 +65,6 @@ protected:
     com::sun::star::accessibility::XAccessible* pUNOInterface;
 };
 
-#endif //__UNOXWRAPPER_H_
+#endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_UNOXWRAPPER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */