fixincludeguards.sh: basic

Change-Id: Id797a8969e42876092da347d8e1bba6195b697dc

basic/inc/basrid.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BASRID_HXX
-#define _BASRID_HXX
+#ifndef INCLUDED_BASIC_INC_BASRID_HXX
+#define INCLUDED_BASIC_INC_BASRID_HXX
 
 #include <tools/resid.hxx>
 
@@ -28,6 +28,6 @@ class BasResId : public ResId
     BasResId( sal_uInt32 nId );
 };
 
-#endif //_BASRID_HXX
+#endif // INCLUDED_BASIC_INC_BASRID_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

basic/inc/sb.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SB_HXX
-#define _SB_HXX
+#ifndef INCLUDED_BASIC_INC_SB_HXX
+#define INCLUDED_BASIC_INC_SB_HXX
 
 #include <basic/sberrors.hxx>
 #include <basic/sbdef.hxx>

basic/qa/cppunit/basictest.hxx

@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef _BASICTEST_HXX
-#define _BASICTEST_HXX
+#ifndef INCLUDED_BASIC_QA_CPPUNIT_BASICTEST_HXX
+#define INCLUDED_BASIC_QA_CPPUNIT_BASICTEST_HXX
 
 #include <sal/types.h>
 #include "cppunit/TestFixture.h"

basic/source/inc/basiccharclass.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BASIC_BASICCHARCLASS_HXX
-#define _BASIC_BASICCHARCLASS_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_BASICCHARCLASS_HXX
+#define INCLUDED_BASIC_SOURCE_INC_BASICCHARCLASS_HXX
 
 #include <unotools/charclass.hxx>
 #include <rtl/instance.hxx>

basic/source/inc/buffer.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BUFFER_HXX
-#define _BUFFER_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_BUFFER_HXX
+#define INCLUDED_BASIC_SOURCE_INC_BUFFER_HXX
 #include <rtl/ustring.hxx>
 #include <tools/solar.h>
 

basic/source/inc/codegen.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CODEGEN_HXX
-#define _CODEGEN_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_CODEGEN_HXX
+#define INCLUDED_BASIC_SOURCE_INC_CODEGEN_HXX
 
 class SbiParser;
 class SbModule;

basic/source/inc/date.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBDATE_HXX
-#define _SBDATE_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_DATE_HXX
+#define INCLUDED_BASIC_SOURCE_INC_DATE_HXX
 
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/Time.hpp>

basic/source/inc/dlgcont.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef BASIC_DIALOGCONTAINER_HXX
-#define BASIC_DIALOGCONTAINER_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_DLGCONT_HXX
+#define INCLUDED_BASIC_SOURCE_INC_DLGCONT_HXX
 
 #include "namecont.hxx"
 

basic/source/inc/errobject.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef ERROBJECT_HXX
-#define ERROBJECT_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_ERROBJECT_HXX
+#define INCLUDED_BASIC_SOURCE_INC_ERROBJECT_HXX
 #include "sbunoobj.hxx"
 #include <ooo/vba/XErrObject.hpp>
 

basic/source/inc/expr.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXPR_HXX
-#define _EXPR_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_EXPR_HXX
+#define INCLUDED_BASIC_SOURCE_INC_EXPR_HXX
 
 #include "opcodes.hxx"
 #include "token.hxx"

basic/source/inc/filefmt.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SB_FILEFMT_HXX
-#define _SB_FILEFMT_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_FILEFMT_HXX
+#define INCLUDED_BASIC_SOURCE_INC_FILEFMT_HXX
 
 #include <tools/solar.h>
 

basic/source/inc/image.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBIMAGE_HXX
-#define _SBIMAGE_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_IMAGE_HXX
+#define INCLUDED_BASIC_SOURCE_INC_IMAGE_HXX
 
 #include "sbintern.hxx"
 #include <rtl/ustring.hxx>

basic/source/inc/iosys.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBIOSYS_HXX
-#define _SBIOSYS_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_IOSYS_HXX
+#define INCLUDED_BASIC_SOURCE_INC_IOSYS_HXX
 
 #include <tools/stream.hxx>
 #include <basic/sberrors.hxx>

basic/source/inc/namecont.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef BASIC_NAMECONTAINER_HXX
-#define BASIC_NAMECONTAINER_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_NAMECONT_HXX
+#define INCLUDED_BASIC_SOURCE_INC_NAMECONT_HXX
 
 #include <boost/unordered_map.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>

basic/source/inc/opcodes.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OPCODES_HXX
-#define _OPCODES_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_OPCODES_HXX
+#define INCLUDED_BASIC_SOURCE_INC_OPCODES_HXX
 
 #include "sbintern.hxx"
 

basic/source/inc/parser.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PARSER_HXX
-#define _PARSER_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_PARSER_HXX
+#define INCLUDED_BASIC_SOURCE_INC_PARSER_HXX
 
 #include "expr.hxx"
 #include "codegen.hxx"

basic/source/inc/propacc.hxx

@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SFX_PROPBAG_HXX
-#define _SFX_PROPBAG_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_PROPACC_HXX
+#define INCLUDED_BASIC_SOURCE_INC_PROPACC_HXX
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>

basic/source/inc/runtime.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBRUNTIME_HXX
-#define _SBRUNTIME_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_RUNTIME_HXX
+#define INCLUDED_BASIC_SOURCE_INC_RUNTIME_HXX
 
 #include <basic/sbx.hxx>
 

basic/source/inc/sbcomp.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBCOMP_HXX
-#define _SBCOMP_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_SBCOMP_HXX
+#define INCLUDED_BASIC_SOURCE_INC_SBCOMP_HXX
 
 // I've taken the following from the new file by MD! (MT)
 #include "sbintern.hxx"

basic/source/inc/sbdiagnose.hxx

@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef BASIC_SBDIAGNOSE_HXX
-#define BASIC_SBDIAGNOSE_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_SBDIAGNOSE_HXX
+#define INCLUDED_BASIC_SOURCE_INC_SBDIAGNOSE_HXX
 
 #ifdef DBG_UTIL
 void    ResetCapturedAssertions();
 #endif
 
-#endif // BASIC_SBDIAGNOSE_HXX
+#endif // INCLUDED_BASIC_SOURCE_INC_SBDIAGNOSE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

basic/source/inc/sbintern.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SB_INTERN_HXX
-#define _SB_INTERN_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_SBINTERN_HXX
+#define INCLUDED_BASIC_SOURCE_INC_SBINTERN_HXX
 
 #include <basic/basicdllapi.h>
 #include <basic/sbxfac.hxx>

basic/source/inc/sbjsmeth.hxx

@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _SB_SBJSMETH_HXX
-#define _SB_SBJSMETH_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_SBJSMETH_HXX
+#define INCLUDED_BASIC_SOURCE_INC_SBJSMETH_HXX
 
 #include <basic/sbmeth.hxx>
 

basic/source/inc/sbjsmod.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SB_SBJSMOD_HXX
-#define _SB_SBJSMOD_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_SBJSMOD_HXX
+#define INCLUDED_BASIC_SOURCE_INC_SBJSMOD_HXX
 
 #include <basic/sbmod.hxx>
 

basic/source/inc/sbtrace.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBTRACE_HXX
-#define _SBTRACE_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_SBTRACE_HXX
+#define INCLUDED_BASIC_SOURCE_INC_SBTRACE_HXX
 
 //#define DBG_TRACE_BASIC
 

basic/source/inc/scanner.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SCANNER_HXX
-#define _SCANNER_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_SCANNER_HXX
+#define INCLUDED_BASIC_SOURCE_INC_SCANNER_HXX
 
 #include <basic/sberrors.hxx>
 

basic/source/inc/scriptcont.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef BASIC_SCRIPTCONTAINER_HXX
-#define BASIC_SCRIPTCONTAINER_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_SCRIPTCONT_HXX
+#define INCLUDED_BASIC_SOURCE_INC_SCRIPTCONT_HXX
 
 #include "namecont.hxx"
 #include <basic/basmgr.hxx>

basic/source/inc/stdobj.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBSTDOBJ_HXX
-#define _SBSTDOBJ_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_STDOBJ_HXX
+#define INCLUDED_BASIC_SOURCE_INC_STDOBJ_HXX
 
 #include <basic/sbxobj.hxx>
 

basic/source/inc/symtbl.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SYMTBL_HXX
-#define _SYMTBL_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_SYMTBL_HXX
+#define INCLUDED_BASIC_SOURCE_INC_SYMTBL_HXX
 
 #include <vector>
 

basic/source/inc/token.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOKEN_HXX
-#define _TOKEN_HXX
+#ifndef INCLUDED_BASIC_SOURCE_INC_TOKEN_HXX
+#define INCLUDED_BASIC_SOURCE_INC_TOKEN_HXX
 
 #include "scanner.hxx"
 #include <basic/sbdef.hxx>

basic/source/runtime/comenumwrapper.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMENUMWRAPPER_HXX
-#define _COMENUMWRAPPER_HXX
+#ifndef INCLUDED_BASIC_SOURCE_RUNTIME_COMENUMWRAPPER_HXX
+#define INCLUDED_BASIC_SOURCE_RUNTIME_COMENUMWRAPPER_HXX
 
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/script/XInvocation.hpp>
@@ -42,6 +42,6 @@ public:
     virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 };
 
-#endif // _COMENUMWRAPPER_HXX
+#endif // INCLUDED_BASIC_SOURCE_RUNTIME_COMENUMWRAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

basic/source/runtime/ddectrl.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DDECTRL_HXX
-#define _DDECTRL_HXX
+#ifndef INCLUDED_BASIC_SOURCE_RUNTIME_DDECTRL_HXX
+#define INCLUDED_BASIC_SOURCE_RUNTIME_DDECTRL_HXX
 
 #include <tools/link.hxx>
 #include <basic/sberrors.hxx>

basic/source/runtime/rtlproto.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _INCLUDED_BASIC_RTLPROTO_HXX_
-#define _INCLUDED_BASIC_RTLPROTO_HXX_
+#ifndef INCLUDED_BASIC_SOURCE_RUNTIME_RTLPROTO_HXX
+#define INCLUDED_BASIC_SOURCE_RUNTIME_RTLPROTO_HXX
 
 #include <basic/sbstar.hxx>
 #include "sbtrace.hxx"

basic/source/sbx/sbxconv.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBXCONV_HXX
-#define _SBXCONV_HXX
+#ifndef INCLUDED_BASIC_SOURCE_SBX_SBXCONV_HXX
+#define INCLUDED_BASIC_SOURCE_SBX_SBXCONV_HXX
 
 #include "sbxdec.hxx"
 

basic/source/sbx/sbxdec.hxx

@@ -18,8 +18,8 @@
  */
 
 
-#ifndef __SBX_SBX_DEC_HXX
-#define __SBX_SBX_DEC_HXX
+#ifndef INCLUDED_BASIC_SOURCE_SBX_SBXDEC_HXX
+#define INCLUDED_BASIC_SOURCE_SBX_SBXDEC_HXX
 
 #ifdef WIN32
 

basic/source/sbx/sbxres.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBXRES_HXX
-#define _SBXRES_HXX
+#ifndef INCLUDED_BASIC_SOURCE_SBX_SBXRES_HXX
+#define INCLUDED_BASIC_SOURCE_SBX_SBXRES_HXX
 
 #include <rtl/ustring.hxx>
 

basic/source/uno/sbmodule.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SBMODULE_HXX
-#define SBMODULE_HXX
+#ifndef INCLUDED_BASIC_SOURCE_UNO_SBMODULE_HXX
+#define INCLUDED_BASIC_SOURCE_UNO_SBMODULE_HXX
 
 #include <comphelper/componentmodule.hxx>
 
@@ -81,6 +81,6 @@ namespace basic
 } // namespace basic
 //........................................................................
 
-#endif // SBMODULE_HXX
+#endif // INCLUDED_BASIC_SOURCE_UNO_SBMODULE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */